External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-16 12:20:45 -03:30
Code Issues Packages Projects Releases Wiki Activity

adds edit functionality

Browse Source
This commit is contained in:
Alex Corey 2020-10-15 15:29:58 -04:00 committed by mabashian
parent 2545f14a93
commit 60751dfa16
7 changed files with 72 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
awx/ui_next/src/components/LaunchPrompt/steps/PreviewStep.jsx
View File

@ -6,6 +6,7 @@ import { t } from '@lingui/macro';
import { useFormikContext } from 'formik';
import { withI18n } from '@lingui/react';
import yaml from 'js-yaml';
import { parseVariableField } from '../../../util/yaml';
import mergeExtraVars, { maskPasswords } from '../mergeExtraVars';
import getSurveyValues from '../getSurveyValues';
import PromptDetail from '../../PromptDetail';
@ -27,11 +28,12 @@ function PreviewStep({ resource, config, survey, formErrors, i18n }) {
const { values } = useFormikContext();
const surveyValues = getSurveyValues(values);
const overrides = { ...values };
const overrides = {
...values,
};
if (config.ask_variables_on_launch || config.survey_enabled) {
const initialExtraVars = config.ask_variables_on_launch
? overrides.extra_vars || '---'
: resource.extra_vars;
const initialExtraVars =
config.ask_variables_on_launch && (overrides.extra_vars || '---');
if (survey && survey.spec) {
const passwordFields = survey.spec
.filter(q => q.type === 'password')
@ -47,8 +49,8 @@ function PreviewStep({ resource, config, survey, formErrors, i18n }) {
// Api expects extra vars to be merged with the survey data.
// We put the extra_data key/value pair on the values object here
// so that we don't have to do this loop again inside of the NodeAddModal.jsx
values.extra_data = overrides.extra_vars;
values.extra_data =
overrides.extra_vars && parseVariableField(overrides?.extra_vars);
return (
<Fragment>
{formErrors && (

18
awx/ui_next/src/components/LaunchPrompt/steps/useSurveyStep.jsx
View File

@ -8,7 +8,13 @@ import StepName from './StepName';
const STEP_ID = 'survey';
export default function useSurveyStep(config, i18n, visitedSteps, resource) {
export default function useSurveyStep(
config,
i18n,
visitedSteps,
resource,
nodeToEdit
) {
const { values } = useFormikContext();
const { result: survey, request: fetchSurvey, isLoading, error } = useRequest(
useCallback(async () => {
@ -48,7 +54,7 @@ export default function useSurveyStep(config, i18n, visitedSteps, resource) {
const formError = Object.keys(validate()).length > 0;
return {
step: getStep(config, survey, validate, i18n, visitedSteps),
initialValues: getInitialValues(config, survey, resource),
initialValues: getInitialValues(config, survey, nodeToEdit),
validate,
survey,
isReady: !isLoading && !!survey,
@ -113,7 +119,7 @@ function getStep(config, survey, validate, i18n, visitedSteps) {
};
}
function getInitialValues(config, survey, resource) {
function getInitialValues(config, survey, nodeToEdit) {
if (!config.survey_enabled || !survey) {
return {};
}
@ -126,11 +132,11 @@ function getInitialValues(config, survey, resource) {
} else {
values[`survey_${question.variable}`] = question.default;
}
if (resource?.extra_data) {
Object.entries(resource?.extra_data).forEach(([key, value]) => {
if (nodeToEdit?.extra_data) {
Object.entries(nodeToEdit?.extra_data).forEach(([key, value]) => {
if (key === question.variable) {
if (question.type === 'multiselect') {
values[`survey_${question.variable}`] = value.split('\n');
values[`survey_${question.variable}`] = value;
} else {
values[`survey_${question.variable}`] = value;
}

2
awx/ui_next/src/components/PromptDetail/PromptDetail.jsx
View File

@ -143,7 +143,7 @@ function PromptDetail({ i18n, resource, launchConfig = {}, overrides = {} }) {
value={toTitleCase(overrides.job_type)}
/>
)}
{overrides?.credentials && (
{overrides?.credentials?.length > 0 && (
<Detail
fullWidth
label={i18n._(t`Credentials`)}

28
awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeEditModal.jsx
View File

@ -2,17 +2,37 @@ import React, { useContext } from 'react';
import { withI18n } from '@lingui/react';
import { t } from '@lingui/macro';
import { WorkflowDispatchContext } from '../../../../../contexts/Workflow';
import { getAddedAndRemoved } from '../../../../../util/lists';
import NodeModal from './NodeModal';
function NodeEditModal({ i18n }) {
const dispatch = useContext(WorkflowDispatchContext);
const updateNode = resource => {
const updateNode = (values, linkType, config) => {
const { added, removed } = getAddedAndRemoved(
config?.defaults?.credentials,
values?.credentials
);
if (added?.length > 0) {
values.addedCredentals = added;
}
if (removed?.length > 0) {
values.removedCredentals = removed;
}
values.inventory = values?.inventory?.id;
delete values.linkType;
const node = {
nodeResource: values.nodeResource,
};
if (
values?.nodeType === 'job_template' ||
values?.nodeType === 'workflow_job_template'
) {
node.promptValues = values;
}
dispatch({
type: 'UPDATE_NODE',
node: {
nodeResource: resource,
},
node,
});
};

28
awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeModal.jsx
View File

@ -49,11 +49,7 @@ function NodeModalForm({ askLinkType, i18n, onSave, title, credentialError }) {
const history = useHistory();
const dispatch = useContext(WorkflowDispatchContext);
const { nodeToEdit } = useContext(WorkflowStateContext);
const {
values,
setTouched,
validateForm,
} = useFormikContext();
const { values, setTouched, validateForm } = useFormikContext();
const [triggerNext, setTriggerNext] = useState(0);
@ -149,7 +145,11 @@ function NodeModalForm({ askLinkType, i18n, onSave, title, credentialError }) {
},
]),
];
const nextButtonText = activeStep =>
activeStep.id === steps[steps?.length - 1]?.id ||
activeStep.name === 'Preview'
? i18n._(t`Save`)
: i18n._(t`Next`);
const CustomFooter = (
<WizardFooter>
<WizardContextConsumer>
@ -158,23 +158,25 @@ function NodeModalForm({ askLinkType, i18n, onSave, title, credentialError }) {
<NodeNextButton
triggerNext={triggerNext}
activeStep={activeStep}
aria-label={nextButtonText(activeStep)}
onNext={onNext}
onClick={() => setTriggerNext(triggerNext + 1)}
buttonText={
activeStep.id === steps[steps?.length - 1]?.id ||
activeStep.name === 'Preview'
? i18n._(t`Save`)
: i18n._(t`Next`)
}
buttonText={nextButtonText(activeStep)}
/>
{activeStep && activeStep.id !== steps[0]?.id && (
<Button id="back-node-modal" variant="secondary" onClick={onBack}>
<Button
id="back-node-modal"
variant="secondary"
aria-label={i18n._(t`Back`)}
onClick={onBack}
>
{i18n._(t`Back`)}
</Button>
)}
<Button
id="cancel-node-modal"
variant="link"
aria-label={i18n._(t`Cancel`)}
onClick={handleCancel}
>
{i18n._(t`Cancel`)}

16
awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/useNodeTypeStep.jsx
View File

@ -5,19 +5,14 @@ import NodeTypeStep from './NodeTypeStep';
const STEP_ID = 'nodeType';
export default function useNodeTypeStep(i18n, resource, nodeToEdit) {
export default function useNodeTypeStep(i18n, nodeToEdit) {
const [, meta] = useField('nodeType');
const [approvalNameField] = useField('approvalName');
const [nodeTypeField, ,] = useField('nodeType');
const [nodeResouceField] = useField('nodeResource');
return {
step: getStep(
i18n,
nodeTypeField,
approvalNameField,
nodeResouceField
),
step: getStep(i18n, nodeTypeField, approvalNameField, nodeResouceField),
initialValues: getInitialValues(nodeToEdit),
isReady: true,
contentError: null,
@ -29,12 +24,7 @@ export default function useNodeTypeStep(i18n, resource, nodeToEdit) {
},
};
}
function getStep(
i18n,
nodeTypeField,
approvalNameField,
nodeResouceField
) {
function getStep(i18n, nodeTypeField, approvalNameField, nodeResouceField) {
const isEnabled = () => {
if (
(nodeTypeField.value !== 'approval' && nodeResouceField.value === null) ||

14
awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/useWorkflowNodeSteps.js
View File

@ -29,8 +29,15 @@ export default function useWorkflowNodeSteps(
),
useCredentialsStep(config, i18n, resource, nodeToEdit?.originalNodeObject),
useOtherPromptsStep(config, i18n, resource, nodeToEdit?.originalNodeObject),
useSurveyStep(config, i18n, visited, resource),
useSurveyStep(
config,
i18n,
visited,
resource,
nodeToEdit?.originalNodeObject
),
];
const { resetForm, values: formikValues } = useFormikContext();
const hasErrors = steps.some(step => step.formError);
const surveyStepIndex = steps.findIndex(step => step.survey);
@ -66,10 +73,7 @@ export default function useWorkflowNodeSteps(
});
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [
config,
isReady,
]);
}, [config, isReady]);
const stepWithError = steps.find(s => s.contentError);
const contentError = stepWithError ? stepWithError.contentError : null;