From e927680cc2fd427c95f0e29fb7b1051463e4a674 Mon Sep 17 00:00:00 2001 From: mabashian Date: Fri, 22 May 2020 11:22:26 -0400 Subject: [PATCH] Fix linting errors --- .../src/components/FormField/PasswordField.jsx | 2 +- .../Credential/CredentialAdd/CredentialAdd.jsx | 11 +++++------ .../Credential/CredentialEdit/CredentialEdit.jsx | 11 +++++------ .../CredentialPlugins/CredentialPluginField.jsx | 2 +- .../CredentialPluginPrompt.jsx | 5 +++-- .../CredentialPluginPrompt/MetadataStep.jsx | 16 +++++++--------- 6 files changed, 22 insertions(+), 25 deletions(-) diff --git a/awx/ui_next/src/components/FormField/PasswordField.jsx b/awx/ui_next/src/components/FormField/PasswordField.jsx index c813ca29c1..f65aa6d3c4 100644 --- a/awx/ui_next/src/components/FormField/PasswordField.jsx +++ b/awx/ui_next/src/components/FormField/PasswordField.jsx @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { useField } from 'formik'; import { FormGroup, InputGroup } from '@patternfly/react-core'; -import { PasswordInput } from '.'; +import PasswordInput from './PasswordInput'; function PasswordField(props) { const { id, name, label, validate, isRequired } = props; diff --git a/awx/ui_next/src/screens/Credential/CredentialAdd/CredentialAdd.jsx b/awx/ui_next/src/screens/Credential/CredentialAdd/CredentialAdd.jsx index e75581e463..cd45400fdf 100644 --- a/awx/ui_next/src/screens/Credential/CredentialAdd/CredentialAdd.jsx +++ b/awx/ui_next/src/screens/Credential/CredentialAdd/CredentialAdd.jsx @@ -43,14 +43,13 @@ function CredentialAdd({ me }) { const handleSubmit = async values => { const { inputs, organization, ...remainingValues } = values; - let pluginInputs = []; - const inputEntries = Object.entries(inputs); - for (const [key, value] of inputEntries) { + const pluginInputs = []; + Object.entries(inputs).forEach(([key, value]) => { if (value.credential && value.inputs) { pluginInputs.push([key, value]); delete inputs[key]; } - } + }); setFormSubmitError(null); @@ -64,7 +63,7 @@ function CredentialAdd({ me }) { ...remainingValues, }); const inputSourceRequests = []; - for (const [key, value] of pluginInputs) { + pluginInputs.forEach(([key, value]) => { if (value.credential && value.inputs) { inputSourceRequests.push( CredentialInputSourcesAPI.create({ @@ -75,7 +74,7 @@ function CredentialAdd({ me }) { }) ); } - } + }); await Promise.all(inputSourceRequests); const url = `/credentials/${credentialId}/details`; history.push(`${url}`); diff --git a/awx/ui_next/src/screens/Credential/CredentialEdit/CredentialEdit.jsx b/awx/ui_next/src/screens/Credential/CredentialEdit/CredentialEdit.jsx index 05980f4ec6..09efb36790 100644 --- a/awx/ui_next/src/screens/Credential/CredentialEdit/CredentialEdit.jsx +++ b/awx/ui_next/src/screens/Credential/CredentialEdit/CredentialEdit.jsx @@ -66,7 +66,8 @@ function CredentialEdit({ credential, me }) { source_credential: fieldValue.credential.id, target_credential: credential.id, }); - } else if (fieldValue.touched) { + } + if (fieldValue.touched) { return CredentialInputSourcesAPI.update(inputSources[fieldName].id, { metadata: fieldValue.inputs, source_credential: fieldValue.credential.id, @@ -89,14 +90,13 @@ function CredentialEdit({ credential, me }) { const handleSubmit = async values => { const { inputs, organization, ...remainingValues } = values; - let pluginInputs = {}; - const inputEntries = Object.entries(inputs); - for (const [key, value] of inputEntries) { + const pluginInputs = {}; + Object.entries(inputs).forEach(([key, value]) => { if (value.credential && value.inputs) { pluginInputs[key] = value; delete inputs[key]; } - } + }); setFormSubmitError(null); try { await Promise.all([ @@ -112,7 +112,6 @@ function CredentialEdit({ credential, me }) { const url = `/credentials/${credential.id}/details`; history.push(`${url}`); } catch (err) { - console.log(err); setFormSubmitError(err); } }; diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginField.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginField.jsx index 096827fde7..beaedb9d9f 100644 --- a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginField.jsx +++ b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginField.jsx @@ -12,7 +12,7 @@ import { } from '@patternfly/react-core'; import { KeyIcon } from '@patternfly/react-icons'; import { CredentialPluginPrompt } from './CredentialPluginPrompt'; -import { CredentialPluginSelected } from '.'; +import CredentialPluginSelected from './CredentialPluginSelected'; function CredentialPluginField(props) { const { diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.jsx index d132c58997..c2cd65f212 100644 --- a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.jsx +++ b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.jsx @@ -3,7 +3,8 @@ import { Formik, useField } from 'formik'; import { withI18n } from '@lingui/react'; import { t } from '@lingui/macro'; import { Wizard } from '@patternfly/react-core'; -import { CredentialsStep, MetadataStep } from './'; +import CredentialsStep from './CredentialsStep'; +import MetadataStep from './MetadataStep'; function CredentialPluginWizard({ i18n, handleSubmit, onClose }) { const [selectedCredential] = useField('credential'); @@ -29,7 +30,7 @@ function CredentialPluginWizard({ i18n, handleSubmit, onClose }) { title={i18n._(t`External Secret Management System`)} steps={steps} onSave={handleSubmit} - > + /> ); } diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/MetadataStep.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/MetadataStep.jsx index 2114904ef2..114f3136f6 100644 --- a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/MetadataStep.jsx +++ b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/MetadataStep.jsx @@ -36,7 +36,7 @@ function MetadataStep({ i18n }) { useCallback(async () => { const { data: { - inputs: { required, metadata }, + inputs: { required: requiredFields, metadata }, }, } = await CredentialTypesAPI.readDetail( selectedCredential.value.credential_type || @@ -45,15 +45,13 @@ function MetadataStep({ i18n }) { metadata.forEach(field => { if (inputValues.value[field.id]) { form.initialValues.inputs[field.id] = inputValues.value[field.id]; + } else if (field.type === 'string' && field.choices) { + form.initialValues.inputs[field.id] = + field.default || field.choices[0]; } else { - if (field.type === 'string' && field.choices) { - form.initialValues.inputs[field.id] = - field.default || field.choices[0]; - } else { - form.initialValues.inputs[field.id] = ''; - } + form.initialValues.inputs[field.id] = ''; } - if (required && required.includes(field.id)) { + if (requiredFields && requiredFields.includes(field.id)) { field.required = true; } }); @@ -68,7 +66,7 @@ function MetadataStep({ i18n }) { }, [fetchMetadataOptions]); const testMetadata = () => { - alert('not implemented'); + // todo: implement }; if (isLoading) {