Merge pull request #6936 from jlmitch5/defaultsInQS

add defaults to qs instead of passing as additional params to api requests

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul

awx/ui_next/src/components/JobList/JobList.jsx

@@ -23,17 +23,19 @@ import {
   WorkflowJobsAPI,
 } from '@api';
 
-const QS_CONFIG = getQSConfig(
-  'job',
-  {
-    page: 1,
-    page_size: 20,
-    order_by: '-finished',
-  },
-  ['page', 'page_size']
-);
-
 function JobList({ i18n, defaultParams, showTypeColumn = false }) {
+  const QS_CONFIG = getQSConfig(
+    'job',
+    {
+      page: 1,
+      page_size: 20,
+      order_by: '-finished',
+      not__launch_type: 'sync',
+      ...defaultParams,
+    },
+    ['page', 'page_size']
+  );
+
   const [selected, setSelected] = useState([]);
   const location = useLocation();
 
@@ -48,7 +50,7 @@ function JobList({ i18n, defaultParams, showTypeColumn = false }) {
 
       const {
         data: { count, results },
-      } = await UnifiedJobsAPI.read({ ...params, ...defaultParams });
+      } = await UnifiedJobsAPI.read({ ...params });
 
       return {
         itemCount: count,

awx/ui_next/src/screens/Job/Jobs.jsx

@@ -53,10 +53,7 @@ function Jobs({ i18n }) {
       <Switch>
         <Route exact path={match.path}>
           <PageSection>
-            <JobList
+            <JobList showTypeColumn />
-              showTypeColumn
-              defaultParams={{ not__launch_type: 'sync' }}
-            />
           </PageSection>
         </Route>
         <Route path={`${match.path}/:id/details`}>