From d38fcf4f5b9d8a1889b9bdf79ee77a2022ed4b52 Mon Sep 17 00:00:00 2001
From: Janicki Artur <artur.janicki@contractors.roche.com>
Date: Tue, 9 Oct 2018 07:22:13 +0200
Subject: [PATCH] change code after PR

Feature #14307

Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki@contractors.roche.com>
---
 src/store/search-bar/search-bar-actions.ts                  | 3 +--
 .../search-bar/search-bar-advanced-view.tsx                 | 4 ++--
 .../search-bar/search-bar-autocomplete-view.tsx             | 4 ++--
 src/views-components/search-bar/search-bar-basic-view.tsx   | 6 +++---
 src/views-components/search-bar/search-bar-view.tsx         | 3 +--
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/store/search-bar/search-bar-actions.ts b/src/store/search-bar/search-bar-actions.ts
index 32f120189b..3aceb65887 100644
--- 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 ef13547c74..356eb33fcb 100644
--- 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 73872f2add..fb3e895da8 100644
--- 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 7e25214e58..c2bca73e13 100644
--- 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 69e3717c48..e7067f5b42 100644
--- 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>;
-- 
2.30.2