From 25903431bc7994e35e50e52944eb4be10a129b29 Mon Sep 17 00:00:00 2001
From: "Keith J. Grant" <barkeep@keithjgrant.com>
Date: Mon, 17 May 2021 15:25:16 -0700
Subject: [PATCH] refactor JobOutput to use replaceNamespacedParams util

---
 .../src/screens/Job/JobOutput/JobOutput.jsx   | 47 ++++++++++++-------
 awx/ui_next/src/util/useRequest.js            |  7 +--
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/awx/ui_next/src/screens/Job/JobOutput/JobOutput.jsx b/awx/ui_next/src/screens/Job/JobOutput/JobOutput.jsx
index 19f1b0f751..e4282e9922 100644
--- a/awx/ui_next/src/screens/Job/JobOutput/JobOutput.jsx
+++ b/awx/ui_next/src/screens/Job/JobOutput/JobOutput.jsx
@@ -39,12 +39,11 @@ import getRowRangePageSize from './shared/jobOutputUtils';
 import { getJobModel, isJobRunning } from '../../../util/jobs';
 import useRequest, { useDismissableError } from '../../../util/useRequest';
 import {
-  encodeNonDefaultQueryString,
   parseQueryString,
   mergeParams,
-  replaceParams,
   removeParams,
   getQSConfig,
+  replaceNamespacedParams,
 } from '../../../util/qs';
 import useIsMounted from '../../../util/useIsMounted';
 
@@ -589,35 +588,47 @@ function JobOutput({ job, eventRelatedSearchableKeys, eventSearchableKeys }) {
   };
 
   const handleSearch = (key, value) => {
-    let params = parseQueryString(QS_CONFIG, location.search);
-    params = mergeParams(params, { [key]: value });
-    pushHistoryState(params);
+    const params = parseQueryString(QS_CONFIG, location.search);
+    const qs = replaceNamespacedParams(
+      QS_CONFIG,
+      location.search,
+      mergeParams(params, { [key]: value })
+    );
+    pushHistoryState(qs);
   };
 
   const handleReplaceSearch = (key, value) => {
-    const oldParams = parseQueryString(QS_CONFIG, location.search);
-    pushHistoryState(replaceParams(oldParams, { [key]: value }));
+    const qs = replaceNamespacedParams(QS_CONFIG, location.search, {
+      [key]: value,
+    });
+    pushHistoryState(qs);
   };
 
   const handleRemoveSearchTerm = (key, value) => {
-    let oldParams = parseQueryString(QS_CONFIG, location.search);
-    if (parseInt(value, 10)) {
-      oldParams = removeParams(QS_CONFIG, oldParams, {
-        [key]: parseInt(value, 10),
-      });
-    }
-    pushHistoryState(removeParams(QS_CONFIG, oldParams, { [key]: value }));
+    const oldParams = parseQueryString(QS_CONFIG, location.search);
+    const updatedParams = removeParams(QS_CONFIG, oldParams, {
+      [key]: value,
+    });
+    const qs = replaceNamespacedParams(
+      QS_CONFIG,
+      location.search,
+      updatedParams
+    );
+    pushHistoryState(qs);
   };
 
   const handleRemoveAllSearchTerms = () => {
     const oldParams = parseQueryString(QS_CONFIG, location.search);
-    pushHistoryState(removeParams(QS_CONFIG, oldParams, { ...oldParams }));
+    Object.keys(oldParams).forEach(key => {
+      oldParams[key] = null;
+    });
+    const qs = replaceNamespacedParams(QS_CONFIG, location.search, oldParams);
+    pushHistoryState(qs);
   };
 
-  const pushHistoryState = params => {
+  const pushHistoryState = qs => {
     const { pathname } = history.location;
-    const encodedParams = encodeNonDefaultQueryString(QS_CONFIG, params);
-    history.push(encodedParams ? `${pathname}?${encodedParams}` : pathname);
+    history.push(qs ? `${pathname}?${qs}` : pathname);
   };
 
   const renderSearchComponent = () => (
diff --git a/awx/ui_next/src/util/useRequest.js b/awx/ui_next/src/util/useRequest.js
index 50be3fc49a..e9392b3238 100644
--- a/awx/ui_next/src/util/useRequest.js
+++ b/awx/ui_next/src/util/useRequest.js
@@ -1,11 +1,6 @@
 import { useEffect, useState, useCallback } from 'react';
 import { useLocation, useHistory } from 'react-router-dom';
-import {
-  parseQueryString,
-  replaceParams,
-  encodeNonDefaultQueryString,
-  replaceNamespacedParams,
-} from './qs';
+import { parseQueryString, replaceNamespacedParams } from './qs';
 import useIsMounted from './useIsMounted';
 
 /*