From 2ab505191d87877822bdf8d29d62dd3fd5d182ee Mon Sep 17 00:00:00 2001
From: SPT-dev <spt-dev@noreply.dev.sp-tarkov.com>
Date: Thu, 2 Mar 2023 21:13:10 -0500
Subject: [PATCH] fix: Fixing test suite

---
 .../integration/dark-mode-toggle.spec.tsx        | 12 ++++++------
 .../src/cypress/integration/header.spec.tsx      |  2 +-
 .../src/cypress/integration/json-theme.spec.tsx  |  6 +++---
 .../cypress/integration/locale-select.spec.tsx   |  8 ++++----
 .../src/cypress/integration/search.spec.tsx      |  8 ++++++++
 .../src/cypress/integration/url-check.spec.tsx   | 15 ++++++++++++---
 items/frontend/src/dataaccess/ItemBackend.ts     | 16 ++++++++++------
 items/frontend/src/dataaccess/SaveKeys.ts        | 10 +++++-----
 items/frontend/src/pages/MainPage.tsx            |  8 ++++----
 items/frontend/src/state/GlobalState.ts          |  2 +-
 10 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/items/frontend/src/cypress/integration/dark-mode-toggle.spec.tsx b/items/frontend/src/cypress/integration/dark-mode-toggle.spec.tsx
index f010fbc..bcd8300 100644
--- a/items/frontend/src/cypress/integration/dark-mode-toggle.spec.tsx
+++ b/items/frontend/src/cypress/integration/dark-mode-toggle.spec.tsx
@@ -4,7 +4,7 @@ describe('Dark Mode Toggle', () => {
     beforeEach(() => {
         cy.window()
             .its("sessionStorage")
-            .invoke("removeItem", "items.sp-tarkov.com-locales");
+            .invoke("removeItem", "db.sp-tarkov.com-locales");
 
         cy.intercept(
             '**/api/locales',
@@ -35,7 +35,7 @@ describe('Dark Mode Toggle', () => {
             before(() => {
                 cy.visit('/', {
                     onBeforeLoad: function (window) {
-                        window.localStorage.removeItem('items.sp-tarkov.com-prefered-color-scheme')
+                        window.localStorage.removeItem('db.sp-tarkov.com-prefered-color-scheme')
                     }
                 })
             })
@@ -55,7 +55,7 @@ describe('Dark Mode Toggle', () => {
             before(() => {
                 cy.visit('/', {
                     onBeforeLoad: function (window) {
-                        window.localStorage.setItem('items.sp-tarkov.com-prefered-color-scheme', 'light')
+                        window.localStorage.setItem('db.sp-tarkov.com-prefered-color-scheme', 'light')
                     }
                 })
             })
@@ -74,7 +74,7 @@ describe('Dark Mode Toggle', () => {
             before(() => {
                 cy.visit('/', {
                     onBeforeLoad: function (window) {
-                        window.localStorage.setItem('items.sp-tarkov.com-prefered-color-scheme', 'dark')
+                        window.localStorage.setItem('db.sp-tarkov.com-prefered-color-scheme', 'dark')
                     }
                 })
             })
@@ -94,7 +94,7 @@ describe('Dark Mode Toggle', () => {
                 before(() => {
                     cy.visit('/', {
                         onBeforeLoad: function (window) {
-                            window.localStorage.setItem('items.sp-tarkov.com-prefered-color-scheme', 'light')
+                            window.localStorage.setItem('db.sp-tarkov.com-prefered-color-scheme', 'light')
                         }
                     })
                 })
@@ -123,7 +123,7 @@ describe('Dark Mode Toggle', () => {
                 before(() => {
                     cy.visit('/', {
                         onBeforeLoad: function (window) {
-                            window.localStorage.setItem('items.sp-tarkov.com-prefered-color-scheme', 'dark')
+                            window.localStorage.setItem('db.sp-tarkov.com-prefered-color-scheme', 'dark')
                         }
                     })
                 })
diff --git a/items/frontend/src/cypress/integration/header.spec.tsx b/items/frontend/src/cypress/integration/header.spec.tsx
index 55fe679..d28134f 100644
--- a/items/frontend/src/cypress/integration/header.spec.tsx
+++ b/items/frontend/src/cypress/integration/header.spec.tsx
@@ -4,7 +4,7 @@ describe('Header', () => {
     beforeEach(() => {
         cy.window()
             .its("sessionStorage")
-            .invoke("removeItem", "items.sp-tarkov.com-locales");
+            .invoke("removeItem", "db.sp-tarkov.com-locales");
 
         cy.intercept(
             '**/api/locales',
diff --git a/items/frontend/src/cypress/integration/json-theme.spec.tsx b/items/frontend/src/cypress/integration/json-theme.spec.tsx
index e8a6b4d..3512724 100644
--- a/items/frontend/src/cypress/integration/json-theme.spec.tsx
+++ b/items/frontend/src/cypress/integration/json-theme.spec.tsx
@@ -4,7 +4,7 @@ describe('Json Theme', () => {
     beforeEach(() => {
         cy.window()
             .its("sessionStorage")
-            .invoke("removeItem", "items.sp-tarkov.com-locales");
+            .invoke("removeItem", "db.sp-tarkov.com-locales");
 
         cy.intercept(
             '**/api/locales',
@@ -35,7 +35,7 @@ describe('Json Theme', () => {
             before(() => {
                 cy.visit('/', {
                     onBeforeLoad: function (window) {
-                        window.localStorage.removeItem('items.sp-tarkov.com-prefered-json-theme')
+                        window.localStorage.removeItem('db.sp-tarkov.com-prefered-json-theme')
                     }
                 });
             })
@@ -54,7 +54,7 @@ describe('Json Theme', () => {
             before(() => {
                 cy.visit('/', {
                     onBeforeLoad: function (window) {
-                        window.localStorage.setItem('items.sp-tarkov.com-prefered-json-theme', 'eighties')
+                        window.localStorage.setItem('db.sp-tarkov.com-prefered-json-theme', 'eighties')
                     }
                 });
             })
diff --git a/items/frontend/src/cypress/integration/locale-select.spec.tsx b/items/frontend/src/cypress/integration/locale-select.spec.tsx
index 1b892b8..f9301d4 100644
--- a/items/frontend/src/cypress/integration/locale-select.spec.tsx
+++ b/items/frontend/src/cypress/integration/locale-select.spec.tsx
@@ -4,7 +4,7 @@ describe('Locale select', () => {
     beforeEach(() => {
         cy.window()
             .its("sessionStorage")
-            .invoke("removeItem", "items.sp-tarkov.com-locales");
+            .invoke("removeItem", "db.sp-tarkov.com-locales");
 
         cy.intercept(
             '**/api/locales',
@@ -31,7 +31,7 @@ describe('Locale select', () => {
                 []).as('getLocalesWithoutData');
                 cy.visit('/', {
                     onBeforeLoad: function (window) {
-                        window.localStorage.removeItem('items.sp-tarkov.com-prefered-locale')
+                        window.localStorage.removeItem('db.sp-tarkov.com-prefered-locale')
                     }
                 })
             })
@@ -60,7 +60,7 @@ describe('Locale select', () => {
                 before(() => {
                     cy.visit('/', {
                         onBeforeLoad: function (window) {
-                            window.localStorage.removeItem('items.sp-tarkov.com-prefered-locale')
+                            window.localStorage.removeItem('db.sp-tarkov.com-prefered-locale')
                         }
                     })
                 })
@@ -77,7 +77,7 @@ describe('Locale select', () => {
                 before(() => {
                     cy.visit('/', {
                         onBeforeLoad: function (window) {
-                            window.localStorage.setItem('items.sp-tarkov.com-prefered-locale', 'locale2')
+                            window.localStorage.setItem('db.sp-tarkov.com-prefered-locale', 'locale2')
                         }
                     })
                 })
diff --git a/items/frontend/src/cypress/integration/search.spec.tsx b/items/frontend/src/cypress/integration/search.spec.tsx
index 51ee3be..62eceea 100644
--- a/items/frontend/src/cypress/integration/search.spec.tsx
+++ b/items/frontend/src/cypress/integration/search.spec.tsx
@@ -20,6 +20,14 @@ describe('Search area', ()=>{
             body: condensedMilk
         })
 
+        cy.intercept({
+            method: 'POST',
+            url: '**/api/search*'
+        }, {
+            statusCode: 200,
+            body: []
+        })
+
         cy.intercept({
             method: 'GET',
             url: '**/api/item/hierarchy*'
diff --git a/items/frontend/src/cypress/integration/url-check.spec.tsx b/items/frontend/src/cypress/integration/url-check.spec.tsx
index 802a7dd..17dc03e 100644
--- a/items/frontend/src/cypress/integration/url-check.spec.tsx
+++ b/items/frontend/src/cypress/integration/url-check.spec.tsx
@@ -1,12 +1,12 @@
-export {};
-
 import condensedMilk from '../fixtures/condensed_milk.json'
 
+export {};
+
 describe('Url check', () => {
     beforeEach(() => {
         cy.window()
             .its("sessionStorage")
-            .invoke("removeItem", "items.sp-tarkov.com-locales");
+            .invoke("removeItem", "db.sp-tarkov.com-locales");
 
         cy.intercept({
             method: 'GET',
@@ -24,6 +24,15 @@ describe('Url check', () => {
             body: condensedMilk
         })
 
+        cy.intercept({
+            method: 'POST',
+            url: '**/api/search*'
+        }, {
+            statusCode: 200,
+            body: []
+        })
+
+
         cy.intercept({
             method: 'GET',
             url: '**/api/item/hierarchy*'
diff --git a/items/frontend/src/dataaccess/ItemBackend.ts b/items/frontend/src/dataaccess/ItemBackend.ts
index 526bc9a..fb66724 100644
--- a/items/frontend/src/dataaccess/ItemBackend.ts
+++ b/items/frontend/src/dataaccess/ItemBackend.ts
@@ -4,12 +4,16 @@ import { ItemData } from '../dto/ItemData';
 import { useGlobalState } from '../state/GlobalState';
 
 const handleFetch = async (url: string, init?: RequestInit | undefined): Promise<any | null> => {
-    const resp = await fetch(url, { ...init, mode: 'cors' })
-    if (resp.status === 200) {
-        const jsonResponse = await resp.json();
-        return jsonResponse !== undefined ? jsonResponse : null;
-    } else if (resp.status >= 400) {
-        console.error(resp)
+    try {
+        const resp = await fetch(url, { ...init, mode: 'cors' })
+        if (resp.status === 200) {
+            const jsonResponse = await resp.json();
+            return jsonResponse !== undefined ? jsonResponse : null;
+        } else if (resp.status >= 400) {
+            console.warn(resp)
+        }
+    }catch (e) {
+        console.warn(e)
     }
     return null;
 }
diff --git a/items/frontend/src/dataaccess/SaveKeys.ts b/items/frontend/src/dataaccess/SaveKeys.ts
index f3c7b58..2063df2 100644
--- a/items/frontend/src/dataaccess/SaveKeys.ts
+++ b/items/frontend/src/dataaccess/SaveKeys.ts
@@ -1,10 +1,10 @@
 export enum LocalStorageKeys {
-    PREFERED_COLOR_SCHEME = 'items.sp-tarkov.com-prefered-color-scheme',
-    PREFERED_JSON_THEME = 'items.sp-tarkov.com-prefered-json-theme',
-    PREFERED_LOCALE = 'items.sp-tarkov.com-prefered-locale'
+    PREFERED_COLOR_SCHEME = 'db.sp-tarkov.com-prefered-color-scheme',
+    PREFERED_JSON_THEME = 'db.sp-tarkov.com-prefered-json-theme',
+    PREFERED_LOCALE = 'db.sp-tarkov.com-prefered-locale'
 }
 
 export enum SessionStorageKeys {
-    LOCALES = 'items.sp-tarkov.com-locales',
-    ITEMS_HIERARCHY = 'items.sp-tarkov.com-items-hierarchy',
+    LOCALES = 'db.sp-tarkov.com-locales',
+    ITEMS_HIERARCHY = 'db.sp-tarkov.com-items-hierarchy',
 }
\ No newline at end of file
diff --git a/items/frontend/src/pages/MainPage.tsx b/items/frontend/src/pages/MainPage.tsx
index 4d92486..5b271e3 100644
--- a/items/frontend/src/pages/MainPage.tsx
+++ b/items/frontend/src/pages/MainPage.tsx
@@ -26,11 +26,11 @@ export const MainPage = () => {
                 <Header/>
                 <BrowserRouter>
                     <Routes>
-                        <Route path="/search" element={<InteractiveArea/>}>
-                            <Route path=":id" element={<InteractiveArea/>}/>
-                        </Route>
+                        <Route path="/search" element={<InteractiveArea/>}/>
+                        <Route path="/search/:id" element={<InteractiveArea/>}/>
+                        <Route path="/404" element={<PageNotFound />}/>
                         <Route path="/" element={<Navigate replace to="/search"/>}/>
-                        <Route path="*" element={<PageNotFound/>}/>
+                        <Route path="*" element={<Navigate replace to="/404" />} />
                     </Routes>
                 </BrowserRouter>
                 <Footer/>
diff --git a/items/frontend/src/state/GlobalState.ts b/items/frontend/src/state/GlobalState.ts
index 6f2abe7..ecfa2dd 100644
--- a/items/frontend/src/state/GlobalState.ts
+++ b/items/frontend/src/state/GlobalState.ts
@@ -57,7 +57,7 @@ export const useGlobalState = create<GlobalState>((set) => ({
   localesList: [],
   refreshLocalesList: async () => {
     const locales = sessionStorage.getItem(SessionStorageKeys.LOCALES);
-    const localesList = locales !== null && locales !== undefined && locales !== 'undefined' ? JSON.parse(locales) : await getLocaleList()
+    const localesList = locales !== null && locales !== undefined && locales !== 'undefined' && locales !== 'null' ? JSON.parse(locales) : await getLocaleList()
     if (!locales) sessionStorage.setItem(SessionStorageKeys.LOCALES, JSON.stringify(localesList ? localesList : null))
     set((_state) => ({ localesList: localesList ? localesList : [] }))
   },