change code after PR

Feature #14307

Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki@contractors.roche.com>

diff --git a/src/store/search-bar/search-bar-actions.ts b/src/store/search-bar/search-bar-actions.ts
index 32f120189b7a5e085e342b5435fb7964ce9f0ac5..3aceb658870c772fc5f6caffbbc7fd97b8066f05 100644 (file)
--- a/src/store/search-bar/search-bar-actions.ts
+++ b/src/store/search-bar/search-bar-actions.ts
@@ -25,8 +25,7 @@ export const goToView = (currentView: string) => searchBarActions.SET_CURRENT_VI
 export const searchData = (searchValue: string) => 
     async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
         dispatch(searchBarActions.SET_SEARCH_RESULTS([]));
-        const user = getState().auth.user;
-        if (user && searchValue) {
+        if (searchValue) {
             const filters = getFilters('name', searchValue);
             // set user.uuid search only in Projects, the empty value search by whole app
             const { items } = await services.groupsService.contents('', {

diff --git a/src/views-components/search-bar/search-bar-advanced-view.tsx b/src/views-components/search-bar/search-bar-advanced-view.tsx
index ef13547c7462696c4b7b427a7fc75dec86478b96..356eb33fcbaf1898b737411198a9266bd7ebd330 100644 (file)
--- a/src/views-components/search-bar/search-bar-advanced-view.tsx
+++ b/src/views-components/search-bar/search-bar-advanced-view.tsx
@@ -5,7 +5,7 @@
 import * as React from 'react';
 import { Paper, StyleRulesCallback, withStyles, WithStyles, List, Button } from '@material-ui/core';
 import { SearchView } from '~/store/search-bar/search-bar-reducer';
-import { RenderRecentQueries } from '~/views-components/search-bar/search-bar-view';
+import { RecentQueriesItem } from '~/views-components/search-bar/search-bar-view';
 
 type CssRules = 'list';
 
@@ -25,7 +25,7 @@ export const SearchBarAdvancedView = withStyles(styles)(
     ({ classes, setView }: SearchBarAdvancedViewProps & WithStyles<CssRules>) =>
         <Paper>
             <List component="nav" className={classes.list}>
-                <RenderRecentQueries text='ADVANCED VIEW' />
+                <RecentQueriesItem text='ADVANCED VIEW' />
             </List>
             <Button onClick={() => setView(SearchView.BASIC)}>Back</Button>
         </Paper>

diff --git a/src/views-components/search-bar/search-bar-autocomplete-view.tsx b/src/views-components/search-bar/search-bar-autocomplete-view.tsx
index 73872f2add57e609f665333790bd245aa028ce78..fb3e895da8927c8e1b02b3cc36effc137e3e2143 100644 (file)
--- a/src/views-components/search-bar/search-bar-autocomplete-view.tsx
+++ b/src/views-components/search-bar/search-bar-autocomplete-view.tsx
@@ -4,7 +4,7 @@
 
 import * as React from 'react';
 import { Paper, StyleRulesCallback, withStyles, WithStyles, List } from '@material-ui/core';
-import { RenderRecentQueries } from '~/views-components/search-bar/search-bar-view';
+import { RecentQueriesItem } from '~/views-components/search-bar/search-bar-view';
 import { GroupContentsResource } from '~/services/groups-service/groups-service';
 
 type CssRules = 'list';
@@ -28,7 +28,7 @@ export const SearchBarAutocompleteView = withStyles(styles)(
         <Paper>
             {searchResults &&  <List component="nav" className={classes.list}>
                 {searchResults.map((item) => {
-                    return <RenderRecentQueries key={item.uuid} text={item.name} />;
+                    return <RecentQueriesItem key={item.uuid} text={item.name} />;
                 })}
             </List>}
         </Paper>

diff --git a/src/views-components/search-bar/search-bar-basic-view.tsx b/src/views-components/search-bar/search-bar-basic-view.tsx
index 7e25214e582ff3662793bac4661c721675817d83..c2bca73e13a1df9faba331d0c2b2456c8a6aa3e2 100644 (file)
--- a/src/views-components/search-bar/search-bar-basic-view.tsx
+++ b/src/views-components/search-bar/search-bar-basic-view.tsx
@@ -5,7 +5,7 @@
 import * as React from 'react';
 import { Paper, StyleRulesCallback, withStyles, WithStyles, List } from '@material-ui/core';
 import { SearchView } from '~/store/search-bar/search-bar-reducer';
-import { RenderRecentQueries, RenderSavedQueries } from '~/views-components/search-bar/search-bar-view';
+import { RecentQueriesItem, RenderSavedQueries } from '~/views-components/search-bar/search-bar-view';
 
 type CssRules = 'advanced' | 'searchQueryList' | 'list' | 'searchView';
 
@@ -47,8 +47,8 @@ export const SearchBarBasicView = withStyles(styles)(
             </List>
             <div className={classes.searchQueryList}>Recent search queries</div>
             <List component="nav" className={classes.list}>
-                <RenderRecentQueries text="cos" />
-                <RenderRecentQueries text="testtest" />
+                <RecentQueriesItem text="cos" />
+                <RecentQueriesItem text="testtest" />
             </List>
             <div className={classes.advanced} onClick={() => setView(SearchView.ADVANCED)}>Advanced search</div>
         </Paper>

diff --git a/src/views-components/search-bar/search-bar-view.tsx b/src/views-components/search-bar/search-bar-view.tsx
index 69e3717c48da02914c29765496e1f46c95b926fb..e7067f5b427e7e71b80bcd0f5ec37e4ea9e6d327 100644 (file)
--- a/src/views-components/search-bar/search-bar-view.tsx
+++ b/src/views-components/search-bar/search-bar-view.tsx
@@ -20,7 +20,6 @@ import { SearchView } from '~/store/search-bar/search-bar-reducer';
 import { SearchBarBasicView } from '~/views-components/search-bar/search-bar-basic-view';
 import { SearchBarAdvancedView } from '~/views-components/search-bar/search-bar-advanced-view';
 import { SearchBarAutocompleteView, SearchBarAutocompleteViewDataProps } from '~/views-components/search-bar/search-bar-autocomplete-view';
-import { GroupContentsResource } from '~/services/groups-service/groups-service';
 
 type CssRules = 'container' | 'input' | 'searchBar';
 
@@ -65,7 +64,7 @@ interface RenderQueriesProps {
     text: string;
 }
 
-export const RenderRecentQueries = (props: RenderQueriesProps) => {
+export const RecentQueriesItem = (props: RenderQueriesProps) => {
     return <ListItem button>
         <ListItemText secondary={props.text} />
     </ListItem>;