cr changes + tests

Feature #14277

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>

diff --git a/package.json b/package.json
index 8ed84dd9b818b121be780d176760b7cc3fc40922..94f00dc43cad86c0dc2a7ad794e8f5f47f3d8ea8 100644 (file)
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
   "scripts": {
     "start": "react-scripts-ts start",
     "build": "REACT_APP_BUILD_NUMBER=$BUILD_NUMBER REACT_APP_GIT_COMMIT=$GIT_COMMIT react-scripts-ts build",
-    "test": "CI=true react-scripts-ts test --env=jsdom",
+    "test": "react-scripts-ts test --env=jsdom",
     "eject": "react-scripts-ts eject",
     "lint": "tslint src/** -t verbose"
   },

diff --git a/src/services/search-service/search-service.ts b/src/services/search-service/search-service.ts
index 9d60e1b6a750550d141fbef8a8c99b5ff43a52df..8a41fbc79db82ba1b33e4f0a4d4d62145370e802 100644 (file)
--- a/src/services/search-service/search-service.ts
+++ b/src/services/search-service/search-service.ts
@@ -23,16 +23,7 @@ export class SearchService {
     }
 
     saveQuery(data: SearchBarAdvanceFormData) {
-        this.savedQueries.push({
-            type: data.type,
-            cluster: data.cluster,
-            project: data.project,
-            inTrash: data.inTrash,
-            dateFrom: data.dateFrom,
-            dateTo: data.dateTo,
-            saveQuery: data.saveQuery,
-            searchQuery: data.searchQuery
-        });
+        this.savedQueries.push({...data});
         localStorage.setItem('savedQueries', JSON.stringify(this.savedQueries));
     }
 

diff --git a/src/store/search-bar/search-bar-actions.ts b/src/store/search-bar/search-bar-actions.ts
index 97367e20ff7ce7b82054494adc4025ba00af0fe5..f32c1287f7d7197eff3d601692bf3db26f94de77 100644 (file)
--- a/src/store/search-bar/search-bar-actions.ts
+++ b/src/store/search-bar/search-bar-actions.ts
@@ -62,17 +62,7 @@ export const deleteSavedQuery = (id: number) =>
 export const editSavedQuery = (data: SearchBarAdvanceFormData, id: number) =>
     (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
         dispatch(searchBarActions.SET_CURRENT_VIEW(SearchView.ADVANCED));
-        const initialData: SearchBarAdvanceFormData = {
-            type: data.type,
-            cluster: data.cluster,
-            project: data.project,
-            inTrash: data.inTrash,
-            dateFrom: data.dateFrom,
-            dateTo: data.dateTo,
-            saveQuery: data.saveQuery,
-            searchQuery: data.searchQuery
-        };
-        dispatch<any>(initialize(SEARCH_BAR_ADVANCE_FORM_NAME, initialData));
+        dispatch<any>(initialize(SEARCH_BAR_ADVANCE_FORM_NAME, data));
     };
 
 export const openSearchView = () =>

diff --git a/src/views-components/search-bar/search-bar-view.test.tsx b/src/views-components/search-bar/search-bar-view.test.tsx
index 2ecb835381a9c52ae8308f6d2ce614612223f7f2..801bf7ad3506614f6966406bd2634b19509558de 100644 (file)
--- a/src/views-components/search-bar/search-bar-view.test.tsx
+++ b/src/views-components/search-bar/search-bar-view.test.tsx
@@ -102,5 +102,7 @@ const mockSearchProps = () => ({
     loadRecentQueries: () => ['test'],
     saveQuery: jest.fn(),
     deleteSavedQuery: jest.fn(),
-    openSearchView: jest.fn()
+    openSearchView: jest.fn(),
+    editSavedQuery: jest.fn(),
+    navigateTo: jest.fn()
 });
\ No newline at end of file

diff --git a/src/views-components/search-bar/search-bar-view.tsx b/src/views-components/search-bar/search-bar-view.tsx
index a81eec97e018d8b32415473f1d92cfa62b31b813..3d15801ae944a6441f7917a9386cf3199bb65387 100644 (file)
--- a/src/views-components/search-bar/search-bar-view.tsx
+++ b/src/views-components/search-bar/search-bar-view.tsx
@@ -77,8 +77,8 @@ interface SearchBarState {
 }
 
 interface RenderRecentQueriesProps {
-    text: string | JSX.Element;
-    onSearch: (searchValue: string | JSX.Element) => void;
+    text: string;
+    onSearch: (searchValue: string) => void;
 }
 
 export const RenderRecentQueries = (props: RenderRecentQueriesProps) => {
@@ -100,10 +100,10 @@ export const RenderAutocompleteItems = (props: RenderAutocompleteItemsProps) =>
 };
 
 interface RenderSavedQueriesProps {
-    text: string | JSX.Element;
+    text: string;
     id: number;
     deleteSavedQuery: (id: number) => void;
-    onSearch: (searchValue: string | JSX.Element) => void;
+    onSearch: (searchValue: string) => void;
     editSavedQuery: (data: SearchBarAdvanceFormData, id: number) => void;
     data: SearchBarAdvanceFormData;
 }