From ee6fda9f8aca8954128ef8290be8dd88fa2f0155 Mon Sep 17 00:00:00 2001
From: Alex Corey <alex.swansboro@gmail.com>
Date: Mon, 13 Apr 2020 15:30:35 -0400
Subject: [PATCH] moves validator function

---
 .../ErrorDetail/ErrorDetail.test.jsx          |  1 -
 .../components/ErrorDetail/getErrorMessage.js |  6 +++---
 .../LaunchPrompt/LaunchPrompt.test.jsx        |  8 +++++++-
 .../DeleteRoleConfirmationModal.test.jsx.snap |  2 --
 .../Template/Survey/SurveyQuestionForm.jsx    | 19 ++++++++++++-------
 awx/ui_next/src/util/validators.jsx           | 11 -----------
 6 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/awx/ui_next/src/components/ErrorDetail/ErrorDetail.test.jsx b/awx/ui_next/src/components/ErrorDetail/ErrorDetail.test.jsx
index 409fefc3f8..383c41e4ed 100644
--- a/awx/ui_next/src/components/ErrorDetail/ErrorDetail.test.jsx
+++ b/awx/ui_next/src/components/ErrorDetail/ErrorDetail.test.jsx
@@ -41,6 +41,5 @@ describe('ErrorDetail', () => {
     );
     wrapper.find('Expandable').prop('onToggle')();
     wrapper.update();
-    // console.log(wrapper.find('ErrorDetail').prop('error'));
   });
 });
diff --git a/awx/ui_next/src/components/ErrorDetail/getErrorMessage.js b/awx/ui_next/src/components/ErrorDetail/getErrorMessage.js
index 82783f8f63..ca6fbb23be 100644
--- a/awx/ui_next/src/components/ErrorDetail/getErrorMessage.js
+++ b/awx/ui_next/src/components/ErrorDetail/getErrorMessage.js
@@ -1,10 +1,10 @@
 export default function getErrorMessage(response) {
-  if (typeof response.data === 'string') {
-    return response.data;
-  }
   if (!response.data) {
     return null;
   }
+  if (typeof response.data === 'string') {
+    return response.data;
+  }
   if (response.data.detail) {
     return response.data.detail;
   }
diff --git a/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.test.jsx b/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.test.jsx
index 3a490db6bc..78e8dc5504 100644
--- a/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.test.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.test.jsx
@@ -6,9 +6,11 @@ import InventoryStep from './InventoryStep';
 import CredentialsStep from './CredentialsStep';
 import OtherPromptsStep from './OtherPromptsStep';
 import PreviewStep from './PreviewStep';
-import { InventoriesAPI } from '@api';
+import { InventoriesAPI, CredentialsAPI, CredentialTypesAPI } from '@api';
 
 jest.mock('@api/models/Inventories');
+jest.mock('@api/models/CredentialTypes');
+jest.mock('@api/models/Credentials');
 
 let config;
 const resource = {
@@ -25,6 +27,10 @@ describe('LaunchPrompt', () => {
         count: 1,
       },
     });
+    CredentialsAPI.read.mockResolvedValue({
+      data: { results: [{ id: 1 }], count: 1 },
+    });
+    CredentialTypesAPI.loadAllTypes({ data: { results: [{ type: 'ssh' }] } });
 
     config = {
       can_start_without_user_input: false,
diff --git a/awx/ui_next/src/components/ResourceAccessList/__snapshots__/DeleteRoleConfirmationModal.test.jsx.snap b/awx/ui_next/src/components/ResourceAccessList/__snapshots__/DeleteRoleConfirmationModal.test.jsx.snap
index 795f398ba2..e66d8780df 100644
--- a/awx/ui_next/src/components/ResourceAccessList/__snapshots__/DeleteRoleConfirmationModal.test.jsx.snap
+++ b/awx/ui_next/src/components/ResourceAccessList/__snapshots__/DeleteRoleConfirmationModal.test.jsx.snap
@@ -322,7 +322,6 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
               className="pf-c-backdrop"
             >
               <FocusTrap
-                _createFocusTrap={[Function]}
                 active={true}
                 className="pf-l-bullseye"
                 focusTrapOptions={
@@ -331,7 +330,6 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
                   }
                 }
                 paused={false}
-                tag="div"
               >
                 <div
                   className="pf-l-bullseye"
diff --git a/awx/ui_next/src/screens/Template/Survey/SurveyQuestionForm.jsx b/awx/ui_next/src/screens/Template/Survey/SurveyQuestionForm.jsx
index 1706513d95..78c59d274f 100644
--- a/awx/ui_next/src/screens/Template/Survey/SurveyQuestionForm.jsx
+++ b/awx/ui_next/src/screens/Template/Survey/SurveyQuestionForm.jsx
@@ -13,13 +13,7 @@ import FormField, {
   FieldTooltip,
 } from '@components/FormField';
 import AnsibleSelect from '@components/AnsibleSelect';
-import {
-  required,
-  noWhiteSpace,
-  combine,
-  maxLength,
-  defaultIsNotAvailable,
-} from '@util/validators';
+import { required, noWhiteSpace, combine, maxLength } from '@util/validators';
 
 function AnswerTypeField({ i18n }) {
   const [field] = useField({
@@ -72,6 +66,17 @@ function SurveyQuestionForm({
   submitError,
   i18n,
 }) {
+  const defaultIsNotAvailable = choices => {
+    return defaultValue => {
+      if (!choices.includes(defaultValue)) {
+        return i18n._(
+          t`Default choice must be answered from the choices listed.`
+        );
+      }
+      return undefined;
+    };
+  };
+
   return (
     <Formik
       initialValues={{
diff --git a/awx/ui_next/src/util/validators.jsx b/awx/ui_next/src/util/validators.jsx
index 1a6e3128a7..d21347f3d1 100644
--- a/awx/ui_next/src/util/validators.jsx
+++ b/awx/ui_next/src/util/validators.jsx
@@ -36,17 +36,6 @@ export function minMaxValue(min, max, i18n) {
   };
 }
 
-export function defaultIsNotAvailable(choices, i18n) {
-  return defaultValue => {
-    if (!choices.includes(defaultValue)) {
-      return i18n._(
-        t`Default choice must be answered from the choices listed.`
-      );
-    }
-    return undefined;
-  };
-}
-
 export function requiredEmail(i18n) {
   return value => {
     if (!value) {