[ARVADOS-WORKBENCH2] updated: 1.2.0-732-gb8a54f4
Git user
git at public.curoverse.com
Thu Oct 25 05:41:23 EDT 2018
Summary of changes:
.../search-bar/search-bar-basic-view.tsx | 22 +++++++++++-----------
...t-queries.tsx => search-bar-recent-queries.tsx} | 8 ++++----
...ave-queries.tsx => search-bar-save-queries.tsx} | 14 +++++++-------
src/views-components/search-bar/search-bar.tsx | 2 --
4 files changed, 22 insertions(+), 24 deletions(-)
rename src/views-components/search-bar/{search-bar-render-recent-queries.tsx => search-bar-recent-queries.tsx} (78%)
rename src/views-components/search-bar/{search-bar-render-save-queries.tsx => search-bar-save-queries.tsx} (83%)
via b8a54f4563eb3bbe73226a8f22c04a98a1cba039 (commit)
from 8618c6a611c7cdb785c8eb570a8e84e82741eb02 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit b8a54f4563eb3bbe73226a8f22c04a98a1cba039
Author: Janicki Artur <artur.janicki at contractors.roche.com>
Date: Thu Oct 25 11:41:14 2018 +0200
change code after quick cr - remove render word inside components
Feature #14276
Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki at contractors.roche.com>
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 9d312a0..22dfa82 100644
--- a/src/views-components/search-bar/search-bar-basic-view.tsx
+++ b/src/views-components/search-bar/search-bar-basic-view.tsx
@@ -6,14 +6,14 @@ import * as React from 'react';
import { Paper, StyleRulesCallback, withStyles, WithStyles } from '@material-ui/core';
import { SearchView } from '~/store/search-bar/search-bar-reducer';
import {
- SearchBarRenderRecentQueries,
- SearchBarRenderRecentQueriesActionProps
-} from '~/views-components/search-bar/search-bar-render-recent-queries';
+ SearchBarRecentQueries,
+ SearchBarRecentQueriesActionProps
+} from '~/views-components/search-bar/search-bar-recent-queries';
import {
- SearchBarRenderSavedQueries,
- SearchBarRenderSavedQueriesDataProps,
- SearchBarRenderSavedQueriesActionProps
-} from '~/views-components/search-bar/search-bar-render-save-queries';
+ SearchBarSavedQueries,
+ SearchBarSavedQueriesDataProps,
+ SearchBarSavedQueriesActionProps
+} from '~/views-components/search-bar/search-bar-save-queries';
type CssRules = 'advanced' | 'label' | 'root';
@@ -40,12 +40,12 @@ const styles: StyleRulesCallback<CssRules> = theme => {
};
};
-export type SearchBarBasicViewDataProps = SearchBarRenderSavedQueriesDataProps;
+export type SearchBarBasicViewDataProps = SearchBarSavedQueriesDataProps;
export type SearchBarBasicViewActionProps = {
onSetView: (currentView: string) => void;
onSearch: (searchValue: string) => void;
-} & SearchBarRenderRecentQueriesActionProps & SearchBarRenderSavedQueriesActionProps;
+} & SearchBarRecentQueriesActionProps & SearchBarSavedQueriesActionProps;
type SearchBarBasicViewProps = SearchBarBasicViewDataProps & SearchBarBasicViewActionProps & WithStyles<CssRules>;
@@ -53,11 +53,11 @@ export const SearchBarBasicView = withStyles(styles)(
({ classes, onSetView, loadRecentQueries, deleteSavedQuery, savedQueries, onSearch, editSavedQuery }: SearchBarBasicViewProps) =>
<Paper className={classes.root}>
<div className={classes.label}>Recent search queries</div>
- <SearchBarRenderRecentQueries
+ <SearchBarRecentQueries
onSearch={onSearch}
loadRecentQueries={loadRecentQueries} />
<div className={classes.label}>Saved search queries</div>
- <SearchBarRenderSavedQueries
+ <SearchBarSavedQueries
onSearch={onSearch}
savedQueries={savedQueries}
editSavedQuery={editSavedQuery}
diff --git a/src/views-components/search-bar/search-bar-render-recent-queries.tsx b/src/views-components/search-bar/search-bar-recent-queries.tsx
similarity index 78%
rename from src/views-components/search-bar/search-bar-render-recent-queries.tsx
rename to src/views-components/search-bar/search-bar-recent-queries.tsx
index b248d70..3de3ca7 100644
--- a/src/views-components/search-bar/search-bar-render-recent-queries.tsx
+++ b/src/views-components/search-bar/search-bar-recent-queries.tsx
@@ -22,15 +22,15 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
}
});
-export interface SearchBarRenderRecentQueriesActionProps {
+export interface SearchBarRecentQueriesActionProps {
onSearch: (searchValue: string) => void;
loadRecentQueries: () => string[];
}
-type SearchBarRenderRecentQueriesProps = SearchBarRenderRecentQueriesActionProps & WithStyles<CssRules>;
+type SearchBarRecentQueriesProps = SearchBarRecentQueriesActionProps & WithStyles<CssRules>;
-export const SearchBarRenderRecentQueries = withStyles(styles)(
- ({ classes, onSearch, loadRecentQueries }: SearchBarRenderRecentQueriesProps) =>
+export const SearchBarRecentQueries = withStyles(styles)(
+ ({ classes, onSearch, loadRecentQueries }: SearchBarRecentQueriesProps) =>
<List component="nav" className={classes.root}>
{loadRecentQueries().map((query, index) =>
<ListItem button key={index} className={classes.listItem}>
diff --git a/src/views-components/search-bar/search-bar-render-save-queries.tsx b/src/views-components/search-bar/search-bar-save-queries.tsx
similarity index 83%
rename from src/views-components/search-bar/search-bar-render-save-queries.tsx
rename to src/views-components/search-bar/search-bar-save-queries.tsx
index 5c525a7..ccf10a1 100644
--- a/src/views-components/search-bar/search-bar-render-save-queries.tsx
+++ b/src/views-components/search-bar/search-bar-save-queries.tsx
@@ -3,7 +3,7 @@
// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
-import { withStyles, WithStyles, StyleRulesCallback, List, ListItem, ListItemText, ListItemSecondaryAction, Tooltip, IconButton, Button } from '@material-ui/core';
+import { withStyles, WithStyles, StyleRulesCallback, List, ListItem, ListItemText, ListItemSecondaryAction, Tooltip, IconButton } from '@material-ui/core';
import { ArvadosTheme } from '~/common/custom-theme';
import { RemoveIcon, EditSavedQueryIcon } from '~/components/icon/icon';
import { SearchBarAdvanceFormData } from '~/models/search-bar';
@@ -28,22 +28,22 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
}
});
-export interface SearchBarRenderSavedQueriesDataProps {
+export interface SearchBarSavedQueriesDataProps {
savedQueries: SearchBarAdvanceFormData[];
}
-export interface SearchBarRenderSavedQueriesActionProps {
+export interface SearchBarSavedQueriesActionProps {
onSearch: (searchValue: string) => void;
deleteSavedQuery: (id: number) => void;
editSavedQuery: (data: SearchBarAdvanceFormData, id: number) => void;
}
-type SearchBarRenderSavedQueriesProps = SearchBarRenderSavedQueriesDataProps
- & SearchBarRenderSavedQueriesActionProps
+type SearchBarSavedQueriesProps = SearchBarSavedQueriesDataProps
+ & SearchBarSavedQueriesActionProps
& WithStyles<CssRules>;
-export const SearchBarRenderSavedQueries = withStyles(styles)(
- ({ classes, savedQueries, onSearch, editSavedQuery, deleteSavedQuery }: SearchBarRenderSavedQueriesProps) =>
+export const SearchBarSavedQueries = withStyles(styles)(
+ ({ classes, savedQueries, onSearch, editSavedQuery, deleteSavedQuery }: SearchBarSavedQueriesProps) =>
<List component="nav" className={classes.root}>
{savedQueries.map((query, index) =>
<ListItem button key={index} className={classes.listItem}>
diff --git a/src/views-components/search-bar/search-bar.tsx b/src/views-components/search-bar/search-bar.tsx
index 4578ef3..b40225b 100644
--- a/src/views-components/search-bar/search-bar.tsx
+++ b/src/views-components/search-bar/search-bar.tsx
@@ -9,14 +9,12 @@ import {
goToView,
searchData,
deleteSavedQuery,
- saveRecentQuery,
loadRecentQueries,
saveQuery,
openSearchView,
closeSearchView,
navigateToItem,
editSavedQuery,
- searchDataOnEnter,
changeData,
submitData
} from '~/store/search-bar/search-bar-actions';
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list