From 8e3d8f9868858913d1885110a07d4e4d1266926a Mon Sep 17 00:00:00 2001 From: Michal Klobukowski Date: Mon, 25 Jun 2018 15:45:43 +0200 Subject: [PATCH] Apply better code formatting Feature #13678 Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski --- .../data-explorer/data-explorer-reducer.ts | 33 ++++++++++++++----- .../data-explorer/data-explorer.tsx | 6 ++-- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/src/store/data-explorer/data-explorer-reducer.ts b/src/store/data-explorer/data-explorer-reducer.ts index af1eb469..1b1c36b7 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; 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>) => (dataExplorer: DataExplorer) => diff --git a/src/views-components/data-explorer/data-explorer.tsx b/src/views-components/data-explorer/data-explorer.tsx index f00664fa..d9d1fc4a 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); -- 2.30.2