1
0
mirror of https://github.com/ansible/awx.git synced 2024-10-27 09:25:10 +03:00

Fix linting errors

This commit is contained in:
mabashian 2020-05-22 11:22:26 -04:00
parent 4b95297bd4
commit e927680cc2
6 changed files with 22 additions and 25 deletions

View File

@ -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;

View File

@ -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}`);

View File

@ -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);
}
};

View File

@ -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 {

View File

@ -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}
></Wizard>
/>
);
}

View File

@ -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) {