projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 14490-workflow-presets
[arvados-workbench2.git]
/
src
/
views-components
/
data-explorer
/
data-explorer.tsx
diff --git
a/src/views-components/data-explorer/data-explorer.tsx
b/src/views-components/data-explorer/data-explorer.tsx
index 16dd59933411f5d394b31a58d5262fbff0418cda..710d202dfe25997c66dcde62f44ead0d9e469b10 100644
(file)
--- a/
src/views-components/data-explorer/data-explorer.tsx
+++ b/
src/views-components/data-explorer/data-explorer.tsx
@@
-9,19
+9,21
@@
import { getDataExplorer } from "~/store/data-explorer/data-explorer-reducer";
import { Dispatch } from "redux";
import { dataExplorerActions } from "~/store/data-explorer/data-explorer-action";
import { DataColumn } from "~/components/data-table/data-column";
import { Dispatch } from "redux";
import { dataExplorerActions } from "~/store/data-explorer/data-explorer-action";
import { DataColumn } from "~/components/data-table/data-column";
-import { DataTableFilterItem } from "~/components/data-table-filters/data-table-filters";
import { DataColumns } from "~/components/data-table/data-table";
import { DataColumns } from "~/components/data-table/data-table";
+import { DataTableFilters } from '~/components/data-table-filters/data-table-filters-tree';
interface Props {
id: string;
onRowClick: (item: any) => void;
interface Props {
id: string;
onRowClick: (item: any) => void;
- onContextMenu: (event: React.MouseEvent<HTMLElement>, item: any) => void;
+ onContextMenu
?
: (event: React.MouseEvent<HTMLElement>, item: any) => void;
onRowDoubleClick: (item: any) => void;
extractKey?: (item: any) => React.Key;
}
const mapStateToProps = (state: RootState, { id }: Props) => {
onRowDoubleClick: (item: any) => void;
extractKey?: (item: any) => React.Key;
}
const mapStateToProps = (state: RootState, { id }: Props) => {
- return getDataExplorer(state.dataExplorer, id);
+ const progress = state.progressIndicator.find(p => p.id === id);
+ const working = progress && progress.working;
+ return { ...getDataExplorer(state.dataExplorer, id), working };
};
const mapDispatchToProps = () => {
};
const mapDispatchToProps = () => {
@@
-31,7
+33,7
@@
const mapDispatchToProps = () => {
},
onSearch: (searchValue: string) => {
},
onSearch: (searchValue: string) => {
- dispatch(dataExplorerActions.SET_SEARCH_VALUE({ id, searchValue }));
+ dispatch(dataExplorerActions.SET_
EXPLORER_
SEARCH_VALUE({ id, searchValue }));
},
onColumnToggle: (column: DataColumn<any>) => {
},
onColumnToggle: (column: DataColumn<any>) => {
@@
-42,7
+44,7
@@
const mapDispatchToProps = () => {
dispatch(dataExplorerActions.TOGGLE_SORT({ id, columnName: column.name }));
},
dispatch(dataExplorerActions.TOGGLE_SORT({ id, columnName: column.name }));
},
- onFiltersChange: (filters: DataTableFilter
Item[]
, column: DataColumn<any>) => {
+ onFiltersChange: (filters: DataTableFilter
s
, column: DataColumn<any>) => {
dispatch(dataExplorerActions.SET_FILTERS({ id, columnName: column.name, filters }));
},
dispatch(dataExplorerActions.SET_FILTERS({ id, columnName: column.name, filters }));
},