From 42a7866da932b51c7d8cfcc3e910a832be3b2e6f Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Fri, 2 Sep 2022 13:23:56 -0400
Subject: [PATCH] Cleanup UI linting, tests, and import

Cleans up UI linting errors

Fix broken UI unit tests

Adds missing LabelsMixin import
---
 .../WorkflowJobTemplateAdd.js                 |  2 -
 .../shared/WorkflowJobTemplateForm.js         | 49 ++++++++++---------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/awx/ui/src/screens/Template/WorkflowJobTemplateAdd/WorkflowJobTemplateAdd.js b/awx/ui/src/screens/Template/WorkflowJobTemplateAdd/WorkflowJobTemplateAdd.js
index ab884b2ebb..54e958324a 100644
--- a/awx/ui/src/screens/Template/WorkflowJobTemplateAdd/WorkflowJobTemplateAdd.js
+++ b/awx/ui/src/screens/Template/WorkflowJobTemplateAdd/WorkflowJobTemplateAdd.js
@@ -1,9 +1,7 @@
 import React, { useState, useCallback, useEffect } from 'react';
 import { useHistory } from 'react-router-dom';
-
 import { Card, PageSection } from '@patternfly/react-core';
 import { CardBody } from 'components/Card';
-
 import { WorkflowJobTemplatesAPI, OrganizationsAPI, UsersAPI } from 'api';
 import { useConfig } from 'contexts/Config';
 import useRequest from 'hooks/useRequest';
diff --git a/awx/ui/src/screens/Template/shared/WorkflowJobTemplateForm.js b/awx/ui/src/screens/Template/shared/WorkflowJobTemplateForm.js
index 30e9ac8668..658f075c70 100644
--- a/awx/ui/src/screens/Template/shared/WorkflowJobTemplateForm.js
+++ b/awx/ui/src/screens/Template/shared/WorkflowJobTemplateForm.js
@@ -186,11 +186,14 @@ function WorkflowJobTemplateForm({
             aria-label={t`source control branch`}
           />
         </FieldWithPrompt>
+      </FormColumnLayout>
+      <FormFullWidthLayout>
         <FieldWithPrompt
-          label={t`Labels`}
           fieldId="template-labels"
+          label={t`Labels`}
           promptId="template-ask-labels-on-launch"
           promptName="ask_labels_on_launch"
+          tooltip={helpText.labels}
         >
           <LabelSelect
             value={labelsField.value}
@@ -199,29 +202,29 @@ function WorkflowJobTemplateForm({
             createText={t`Create`}
           />
         </FieldWithPrompt>
-        <FormFullWidthLayout>
-          <VariablesField
-            id="wfjt-variables"
-            name="extra_vars"
-            label={t`Variables`}
-            promptId="template-ask-variables-on-launch"
-            tooltip={helpText.variables}
+      </FormFullWidthLayout>
+      <FormFullWidthLayout>
+        <VariablesField
+          id="wfjt-variables"
+          name="extra_vars"
+          label={t`Variables`}
+          promptId="template-ask-variables-on-launch"
+          tooltip={helpText.variables}
+        />
+      </FormFullWidthLayout>
+      <FormColumnLayout>
+        <FieldWithPrompt
+          fieldId="template-tags"
+          label={t`Job Tags`}
+          promptId="template-ask-tags-on-launch"
+          promptName="ask_tags_on_launch"
+          tooltip={helpText.jobTags}
+        >
+          <TagMultiSelect
+            value={jobTagsField.value}
+            onChange={(value) => jobTagsHelpers.setValue(value)}
           />
-        </FormFullWidthLayout>
-        <FormColumnLayout>
-          <FieldWithPrompt
-            fieldId="template-tags"
-            label={t`Job Tags`}
-            promptId="template-ask-tags-on-launch"
-            promptName="ask_tags_on_launch"
-            tooltip={helpText.jobTags}
-          >
-            <TagMultiSelect
-              value={jobTagsField.value}
-              onChange={(value) => jobTagsHelpers.setValue(value)}
-            />
-          </FieldWithPrompt>
-        </FormColumnLayout>
+        </FieldWithPrompt>
         <FieldWithPrompt
           fieldId="template-skip-tags"
           label={t`Skip Tags`}