[ARVADOS-WORKBENCH2] updated: 1.1.4-143-g8e3d8f9

Git user git at public.curoverse.com
Mon Jun 25 09:45:58 EDT 2018


Summary of changes:
 src/store/data-explorer/data-explorer-reducer.ts   | 33 ++++++++++++++++------
 .../data-explorer/data-explorer.tsx                |  6 ++--
 2 files changed, 28 insertions(+), 11 deletions(-)

       via  8e3d8f9868858913d1885110a07d4e4d1266926a (commit)
      from  75b209b2cbd37e3510fd726e737fa5457a6a8d77 (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 8e3d8f9868858913d1885110a07d4e4d1266926a
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Mon Jun 25 15:45:43 2018 +0200

    Apply better code formatting
    
    Feature #13678
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/store/data-explorer/data-explorer-reducer.ts b/src/store/data-explorer/data-explorer-reducer.ts
index af1eb46..1b1c36b 100644
--- a/src/store/data-explorer/data-explorer-reducer.ts
+++ b/src/store/data-explorer/data-explorer-reducer.ts
@@ -26,22 +26,37 @@ export type DataExplorerState = Record<string, DataExplorer | undefined>;
 
 const dataExplorerReducer = (state: DataExplorerState = {}, action: DataExplorerAction) =>
     actions.match(action, {
-        SET_COLUMNS: ({ id, columns }) => update(state, id, setColumns(columns)),
-        SET_FILTERS: ({ id, columnName, filters }) => update(state, id, mapColumns(setFilters(columnName, filters))),
-        SET_ITEMS: ({ id, items }) => update(state, id, explorer => ({ ...explorer, items })),
-        SET_PAGE: ({ id, page }) => update(state, id, explorer => ({ ...explorer, page })),
-        SET_ROWS_PER_PAGE: ({ id, rowsPerPage }) => update(state, id, explorer => ({ ...explorer, rowsPerPage })),
-        TOGGLE_SORT: ({ id, columnName }) => update(state, id, mapColumns(toggleSort(columnName))),
-        TOGGLE_COLUMN: ({ id, columnName }) => update(state, id, mapColumns(toggleColumn(columnName))),
+        SET_COLUMNS: ({ id, columns }) =>
+            update(state, id, setColumns(columns)),
+
+        SET_FILTERS: ({ id, columnName, filters }) =>
+            update(state, id, mapColumns(setFilters(columnName, filters))),
+
+        SET_ITEMS: ({ id, items }) =>
+            update(state, id, explorer => ({ ...explorer, items })),
+
+        SET_PAGE: ({ id, page }) =>
+            update(state, id, explorer => ({ ...explorer, page })),
+
+        SET_ROWS_PER_PAGE: ({ id, rowsPerPage }) =>
+            update(state, id, explorer => ({ ...explorer, rowsPerPage })),
+
+        TOGGLE_SORT: ({ id, columnName }) =>
+            update(state, id, mapColumns(toggleSort(columnName))),
+
+        TOGGLE_COLUMN: ({ id, columnName }) =>
+            update(state, id, mapColumns(toggleColumn(columnName))),
+
         default: () => state
     });
 
 export default dataExplorerReducer;
 
-export const get = (state: DataExplorerState, id: string) => state[id] || initialDataExplorer;
+export const getDataExplorer = (state: DataExplorerState, id: string) =>
+    state[id] || initialDataExplorer;
 
 const update = (state: DataExplorerState, id: string, updateFn: (dataExplorer: DataExplorer) => DataExplorer) =>
-    ({ ...state, [id]: updateFn(get(state, id)) });
+    ({ ...state, [id]: updateFn(getDataExplorer(state, id)) });
 
 const setColumns = (columns: Array<DataColumn<any>>) =>
     (dataExplorer: DataExplorer) =>
diff --git a/src/views-components/data-explorer/data-explorer.tsx b/src/views-components/data-explorer/data-explorer.tsx
index f00664f..d9d1fc4 100644
--- a/src/views-components/data-explorer/data-explorer.tsx
+++ b/src/views-components/data-explorer/data-explorer.tsx
@@ -5,6 +5,8 @@
 import { connect } from "react-redux";
 import { RootState } from "../../store/store";
 import DataExplorer from "../../components/data-explorer/data-explorer";
-import { get } from "../../store/data-explorer/data-explorer-reducer";
+import { getDataExplorer } from "../../store/data-explorer/data-explorer-reducer";
 
-export default connect((state: RootState, props: { id: string }) => get(state.dataExplorer, props.id))(DataExplorer);
+export default connect((state: RootState, props: { id: string }) =>
+    getDataExplorer(state.dataExplorer, props.id)
+)(DataExplorer);

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list