From 78d6e2125661d8e3ee1f4dea2420127e590a3be7 Mon Sep 17 00:00:00 2001
From: "Keith J. Grant" <barkeep@keithjgrant.com>
Date: Wed, 7 Jul 2021 15:10:55 -0700
Subject: [PATCH] fix final logged errors in tests

---
 .../src/components/AppContainer/NavExpandableGroup.jsx    | 8 ++++----
 .../WorkflowJobTemplateAdd.test.jsx                       | 2 +-
 .../screens/Template/shared/WorkflowJobTemplateForm.jsx   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/awx/ui_next/src/components/AppContainer/NavExpandableGroup.jsx b/awx/ui_next/src/components/AppContainer/NavExpandableGroup.jsx
index bfd5636b33..10a59fcd60 100644
--- a/awx/ui_next/src/components/AppContainer/NavExpandableGroup.jsx
+++ b/awx/ui_next/src/components/AppContainer/NavExpandableGroup.jsx
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import PropTypes from 'prop-types';
+import PropTypes, { oneOfType, string, arrayOf } from 'prop-types';
 import { matchPath, Link, withRouter } from 'react-router-dom';
 import { NavExpandable, NavItem } from '@patternfly/react-core';
 
@@ -58,9 +58,9 @@ class NavExpandableGroup extends Component {
 }
 
 NavExpandableGroup.propTypes = {
-  groupId: PropTypes.string.isRequired,
-  groupTitle: PropTypes.element.isRequired,
-  routes: PropTypes.arrayOf(PropTypes.object).isRequired,
+  groupId: string.isRequired,
+  groupTitle: oneOfType([PropTypes.element, string]).isRequired,
+  routes: arrayOf(PropTypes.object).isRequired,
 };
 
 export default withRouter(NavExpandableGroup);
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateAdd/WorkflowJobTemplateAdd.test.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateAdd/WorkflowJobTemplateAdd.test.jsx
index 0788c74431..33673e7a6c 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateAdd/WorkflowJobTemplateAdd.test.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateAdd/WorkflowJobTemplateAdd.test.jsx
@@ -116,7 +116,7 @@ describe('<WorkflowJobTemplateAdd/>', () => {
       description: '',
       extra_vars: '---',
       inventory: undefined,
-      limit: null,
+      limit: '',
       organization: undefined,
       scm_branch: '',
       webhook_credential: undefined,
diff --git a/awx/ui_next/src/screens/Template/shared/WorkflowJobTemplateForm.jsx b/awx/ui_next/src/screens/Template/shared/WorkflowJobTemplateForm.jsx
index a89638eecd..21deab65de 100644
--- a/awx/ui_next/src/screens/Template/shared/WorkflowJobTemplateForm.jsx
+++ b/awx/ui_next/src/screens/Template/shared/WorkflowJobTemplateForm.jsx
@@ -290,7 +290,7 @@ const FormikApp = withFormik({
       organization: template?.summary_fields?.organization || null,
       labels: template.summary_fields?.labels?.results || [],
       extra_vars: template.extra_vars || '---',
-      limit: template.limit || null,
+      limit: template.limit || '',
       scm_branch: template.scm_branch || '',
       allow_simultaneous: template.allow_simultaneous || false,
       webhook_credential: template?.summary_fields?.webhook_credential || null,