From 996818238d7113edf6c7eab521a8d75a6ae89caa Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Fri, 3 Feb 2023 07:03:23 -0700
Subject: [PATCH] Fixed tests

---
 ui/package.json                               |  1 -
 .../app/core/components/ProtectRoute.test.js  | 20 +++++++------------
 ui/src/app/core/hooks/usePrompt.js            |  2 --
 .../component/fields/FilterTargetField.js     |  6 +++---
 ui/src/app/metadata/view/MetadataHistory.js   |  7 +++----
 5 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/ui/package.json b/ui/package.json
index d4dcb645e..46d5fed28 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -18,7 +18,6 @@
         "file-saver": "^2.0.5",
         "lodash": "^4.17.21",
         "prop-types": "^15.8.1",
-        "query-string": "^8.1.0",
         "react": "^18.2.0",
         "react-bootstrap": "^2.7.0",
         "react-bootstrap-typeahead": "^6.0.0",
diff --git a/ui/src/app/core/components/ProtectRoute.test.js b/ui/src/app/core/components/ProtectRoute.test.js
index 58cc8cc5c..9041acdae 100644
--- a/ui/src/app/core/components/ProtectRoute.test.js
+++ b/ui/src/app/core/components/ProtectRoute.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
-import { BrowserRouter, MemoryRouter, Route, Routes, useNavigate } from 'react-router-dom';
+import { BrowserRouter, Navigate, Route, Routes } from 'react-router-dom';
 import { ProtectRoute } from './ProtectRoute';
 
 const mockIsAdmin = jest.fn();
@@ -10,21 +10,13 @@ jest.mock('../user/UserContext', () => ({
     useCurrentUser: () => ({role: 'ROLE_ADMIN'}),
 }));
 
-const renderWithRouter = (ui) => {
-    return render(
-        <MemoryRouter initialEntries={['/dashboard']}>
-            {ui}
-        </MemoryRouter>
-    )
-}
-
 describe('AdminRoute user is admin', () => {
     beforeEach(() => {
         mockIsAdmin.mockReturnValue(true);
     });
 
     it('should render the component if user is an admin', () => {
-        render(<ProtectRoute redirectTo={"/dashboard"}><React.Fragment>hi there</React.Fragment></ProtectRoute>, { wrapper: MemoryRouter });
+        render(<ProtectRoute redirectTo={"/dashboard"}><React.Fragment>hi there</React.Fragment></ProtectRoute>, { wrapper: BrowserRouter });
         expect(screen.getByText('hi there')).toBeInTheDocument();
     });
 });
@@ -35,9 +27,11 @@ describe('AdminRoute user is NOT admin', () => {
     });
 
     it('should redirect the user to the dashboard if not admin', () => {
-        renderWithRouter(<Routes>
-            <Route path="/dashboard" element={ <ProtectRoute redirectTo={'/dashboard'}><React.Fragment>hi there</React.Fragment></ProtectRoute> } />
-        </Routes>, {route: '/foo'});
+        render(<Routes>
+            <Route path="/" element={<Navigate to="/dashboard"/> } />
+            <Route path="/dashboard" element={ <React.Fragment>dashboard</React.Fragment> } />
+            <Route path="/admin" element={ <ProtectRoute redirectTo={'/dashboard'}><React.Fragment>hi there</React.Fragment></ProtectRoute> } />
+        </Routes>, { wrapper: BrowserRouter });
         expect(screen.getByText('dashboard')).toBeInTheDocument();
     });
 });
\ No newline at end of file
diff --git a/ui/src/app/core/hooks/usePrompt.js b/ui/src/app/core/hooks/usePrompt.js
index 804706a53..3220f6a4b 100644
--- a/ui/src/app/core/hooks/usePrompt.js
+++ b/ui/src/app/core/hooks/usePrompt.js
@@ -15,8 +15,6 @@ export function usePrompt(when, message, {
     let blocker = useBlocker(when);
     const [show, setShow] = React.useState(false);
 
-    console.log(blocker);
-
     React.useEffect(() => {
         if (blocker.state === "blocked" && !when) {
             blocker.reset();
diff --git a/ui/src/app/form/component/fields/FilterTargetField.js b/ui/src/app/form/component/fields/FilterTargetField.js
index 9fabd0661..be48a3473 100644
--- a/ui/src/app/form/component/fields/FilterTargetField.js
+++ b/ui/src/app/form/component/fields/FilterTargetField.js
@@ -8,7 +8,6 @@ import { useTranslator } from '../../../i18n/hooks';
 import { InfoIcon } from '../InfoIcon';
 import { AsyncTypeahead } from 'react-bootstrap-typeahead';
 import useFetch from 'use-http';
-import queryString from 'query-string';
 import API_BASE_PATH from '../../../App.constant';
 import isNil from 'lodash/isNil';
 import capitalize from 'lodash/capitalize';
@@ -19,6 +18,7 @@ import Editor from 'react-simple-code-editor';
 
 import { FilterTargetPreview } from '../../../metadata/hoc/FilterTargetPreview';
 import { remove } from 'lodash';
+import { createSearchParams } from 'react-router-dom';
 
 const ToggleButton = ({ isOpen, onClick, disabled }) => (
     <Button
@@ -78,10 +78,10 @@ const FilterTargetField = ({
     });
 
     async function searchIds (query) {
-        const { entityIds } = get(`?${queryString.stringify({
+        const { entityIds } = get(`?${createSearchParams({
             term: query,
             limit: 10
-        })}`)
+        }).toString()}`)
         if (response.ok) {
             setSearchIds(entityIds);
         }
diff --git a/ui/src/app/metadata/view/MetadataHistory.js b/ui/src/app/metadata/view/MetadataHistory.js
index 09cac6981..472a13da7 100644
--- a/ui/src/app/metadata/view/MetadataHistory.js
+++ b/ui/src/app/metadata/view/MetadataHistory.js
@@ -1,7 +1,6 @@
 import React from 'react';
-import { useNavigate, useParams } from 'react-router-dom';
+import { createSearchParams, useNavigate, useParams } from 'react-router-dom';
 import { Link } from 'react-router-dom';
-import queryString from 'query-string';
 import Button from 'react-bootstrap/Button';
 import FormattedDate from '../../core/components/FormattedDate';
 
@@ -39,9 +38,9 @@ export function MetadataHistory () {
     };
     const compare = (versions) => {
         const s = sortVersionsByDate(versions);
-        const path = `/metadata/${type}/${id}/configuration/compare?${queryString.stringify({versions: s.map(s => s.id)}, {
+        const path = `/metadata/${type}/${id}/configuration/compare?${createSearchParams({versions: s.map(s => s.id)}, {
             skipNull: true,
-        })}`;
+        }).toString()}`;
         navigate(path);
     };