fix persistent filter on wfjt detail; cleanup

ansible · May 19, 2022 · ddbe1d0 · ddbe1d0
1 parent e33564f
commit ddbe1d0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/awx/ui/src/components/PersistentFilters/PersistentFilters.js b/awx/ui/src/components/PersistentFilters/PersistentFilters.js
@@ -1,7 +1,6 @@
 import { useEffect } from 'react';
 import { useLocation, useHistory } from 'react-router';
-
-const STORAGE_KEY = 'persistentFilter';
+import { PERSISTENT_FILTER_KEY } from '../../constants';
 
 export default function PersistentFilters({ pageKey, children }) {
   const location = useLocation();
@@ -12,7 +11,7 @@ export default function PersistentFilters({ pageKey, children }) {
       return;
     }
 
-    const filterString = sessionStorage.getItem(STORAGE_KEY);
+    const filterString = sessionStorage.getItem(PERSISTENT_FILTER_KEY);
     const filter = filterString ? JSON.parse(filterString) : { qs: '' };
 
     if (filter.pageKey === pageKey) {
@@ -27,7 +26,7 @@ export default function PersistentFilters({ pageKey, children }) {
       pageKey,
       qs: location.search,
     };
-    sessionStorage.setItem(STORAGE_KEY, JSON.stringify(filter));
+    sessionStorage.setItem(PERSISTENT_FILTER_KEY, JSON.stringify(filter));
   }, [location.search, pageKey]);
 
   return children;

diff --git a/awx/ui/src/components/PersistentFilters/PersistentFilters.test.js b/awx/ui/src/components/PersistentFilters/PersistentFilters.test.js
@@ -4,7 +4,7 @@ import { Router, Route } from 'react-router-dom';
 import { createMemoryHistory } from 'history';
 import PersistentFilters from './PersistentFilters';
 
-const KEY = 'persistentFilter';
+const KEY = 'awx-persistent-filter';
 
 describe('PersistentFilters', () => {
   test('should initialize filter in sessionStorage', () => {

diff --git a/awx/ui/src/constants.js b/awx/ui/src/constants.js
@@ -10,3 +10,4 @@ export const JOB_TYPE_URL_SEGMENTS = {
 
 export const SESSION_TIMEOUT_KEY = 'awx-session-timeout';
 export const SESSION_REDIRECT_URL = 'awx-redirect-url';
+export const PERSISTENT_FILTER_KEY = 'awx-persistent-filter';
diff --git a/awx/ui/src/screens/Template/WorkflowJobTemplate.js b/awx/ui/src/screens/Template/WorkflowJobTemplate.js
@@ -111,6 +111,7 @@ function WorkflowJobTemplate({ setBreadcrumb }) {
         </>
       ),
       link: `/templates`,
+      isBackButton: true,
       id: 99,
     },
     { name: t`Details`, link: `${match.url}/details` },