External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-16 05:47:38 -02:30
Code Issues Packages Projects Releases Wiki Activity

Adds elements and identifiers for cypress tests

Browse Source 
Properly display instance groups and labels on node details view
This commit is contained in:
mabashian
2022-09-13 14:42:58 -04:00
committed by Alan Rominger
parent d63c940e2f
commit ead56bfa1b
8 changed files with 195 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/src/components/LaunchPrompt/steps/CredentialsStep.js
View File

@@ -132,7 +132,7 @@ function CredentialsStep({
); );
return ( return (
<> <div data-cy="credentials-prompt">
{meta.error && ( {meta.error && (
<CredentialErrorAlert variant="danger" isInline title={meta.error} /> <CredentialErrorAlert variant="danger" isInline title={meta.error} />
)} )}
@@ -208,7 +208,7 @@ function CredentialsStep({
}} }}
renderItemChip={renderChip} renderItemChip={renderChip}
/> />
</> </div>
); );
} }

2
awx/ui/src/components/LaunchPrompt/steps/ExecutionEnvironmentStep.js
View File

@@ -66,6 +66,7 @@ function ExecutionEnvironmentStep() {
} }
return ( return (
<div data-cy="execution-environment-prompt">
<OptionsList <OptionsList
value={field.value ? [field.value] : []} value={field.value ? [field.value] : []}
options={execution_environments} options={execution_environments}
@@ -110,6 +111,7 @@ function ExecutionEnvironmentStep() {
selectItem={helpers.setValue} selectItem={helpers.setValue}
deselectItem={() => helpers.setValue(null)} deselectItem={() => helpers.setValue(null)}
/> />
</div>
); );
} }

2
awx/ui/src/components/LaunchPrompt/steps/InstanceGroupsStep.js
View File

@@ -68,6 +68,7 @@ function InstanceGroupsStep() {
} }
return ( return (
<div data-cy="instance-groups-prompt">
<OptionsList <OptionsList
value={selected} value={selected}
options={instance_groups} options={instance_groups}
@@ -100,6 +101,7 @@ function InstanceGroupsStep() {
sortSelectedItems={(selectedItems) => setSelected(selectedItems)} sortSelectedItems={(selectedItems) => setSelected(selectedItems)}
isSelectedDraggable isSelectedDraggable
/> />
</div>
); );
} }

4
awx/ui/src/components/LaunchPrompt/steps/InventoryStep.js
View File

@@ -70,7 +70,7 @@ function InventoryStep({ warningMessage = null }) {
} }
return ( return (
<> <div data-cy="inventory-prompt">
{meta.touched && meta.error && ( {meta.touched && meta.error && (
<InventoryErrorAlert variant="danger" isInline title={meta.error} /> <InventoryErrorAlert variant="danger" isInline title={meta.error} />
)} )}
@@ -109,7 +109,7 @@ function InventoryStep({ warningMessage = null }) {
selectItem={helpers.setValue} selectItem={helpers.setValue}
deselectItem={() => field.onChange(null)} deselectItem={() => field.onChange(null)}
/> />
</> </div>
); );
} }

2
awx/ui/src/components/LaunchPrompt/steps/OtherPromptsStep.js
View File

@@ -28,6 +28,7 @@ function OtherPromptsStep({ launchConfig, variablesMode, onVarModeChange }) {
? jobHelpText ? jobHelpText
: workflowHelpText; : workflowHelpText;
return ( return (
<div data-cy="other-prompts">
<Form <Form
onSubmit={(e) => { onSubmit={(e) => {
e.preventDefault(); e.preventDefault();
@@ -117,6 +118,7 @@ function OtherPromptsStep({ launchConfig, variablesMode, onVarModeChange }) {
/> />
)} )}
</Form> </Form>
</div>
); );
} }

4
awx/ui/src/components/LaunchPrompt/steps/PreviewStep.js
View File

@@ -52,7 +52,7 @@ function PreviewStep({ resource, launchConfig, surveyConfig, formErrors }) {
} }
return ( return (
<> <div data-cy="prompt-preview">
{formErrors && ( {formErrors && (
<ErrorMessageWrapper> <ErrorMessageWrapper>
{t`Some of the previous step(s) have errors`} {t`Some of the previous step(s) have errors`}
@@ -70,7 +70,7 @@ function PreviewStep({ resource, launchConfig, surveyConfig, formErrors }) {
launchConfig={launchConfig} launchConfig={launchConfig}
overrides={overrides} overrides={overrides}
/> />
</> </div>
); );
} }

2
awx/ui/src/components/LaunchPrompt/steps/SurveyStep.js
View File

@@ -31,6 +31,7 @@ function SurveyStep({ surveyConfig }) {
float: NumberField, float: NumberField,
}; };
return ( return (
<div data-cy="survey-prompts">
<Form <Form
onSubmit={(e) => { onSubmit={(e) => {
e.preventDefault(); e.preventDefault();
@@ -41,6 +42,7 @@ function SurveyStep({ surveyConfig }) {
return <Field key={question.variable} question={question} />; return <Field key={question.variable} question={question} />;
})} })}
</Form> </Form>
</div>
); );
} }
SurveyStep.propTypes = { SurveyStep.propTypes = {

7
awx/ui/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeViewModal.js
View File

@@ -19,6 +19,8 @@ function NodeViewModal({ readOnly }) {
const { const {
fullUnifiedJobTemplate, fullUnifiedJobTemplate,
originalNodeCredentials, originalNodeCredentials,
originalNodeInstanceGroups,
originalNodeLabels,
originalNodeObject, originalNodeObject,
promptValues, promptValues,
} = nodeToView; } = nodeToView;
@@ -160,7 +162,7 @@ function NodeViewModal({ readOnly }) {
originalNodeObject.summary_fields.execution_environment; originalNodeObject.summary_fields.execution_environment;
} }
if (launchConfig.ask_labels_on_launch) { if (launchConfig.ask_labels_on_launch) {
overrides.labels = originalNodeObject.labels; overrides.labels = originalNodeLabels || [];
} }
if (launchConfig.ask_forks_on_launch) { if (launchConfig.ask_forks_on_launch) {
overrides.forks = originalNodeObject.forks; overrides.forks = originalNodeObject.forks;
@@ -204,6 +206,9 @@ function NodeViewModal({ readOnly }) {
if (launchConfig.ask_credential_on_launch) { if (launchConfig.ask_credential_on_launch) {
overrides.credentials = originalNodeCredentials || []; overrides.credentials = originalNodeCredentials || [];
} }
if (launchConfig.ask_instance_groups_on_launch) {
overrides.instance_groups = originalNodeInstanceGroups || [];
}
} }
let nodeUpdatedConvergence = {}; let nodeUpdatedConvergence = {};