Refactor usage of selection of rows

Author: jiridostal

src/SmartComponents/SystemAdvisories/SystemAdvisories.js

@@ -5,8 +5,8 @@ import { withRouter } from 'react-router-dom';
 import AdvisoriesTable from '../../PresentationalComponents/AdvisoriesTable/AdvisoriesTable';
 import { systemAdvisoriesColumns } from '../../PresentationalComponents/AdvisoriesTable/AdvisoriesTableAssets';
 import Error from '../../PresentationalComponents/Snippets/Error';
-import { changeSystemAdvisoryListParams, clearSystemAdvisoriesStore,
-    expandSystemAdvisoryRow, fetchApplicableSystemAdvisories, selectSystemAdvisoryRow } from '../../store/Actions/Actions';
+import { changeSystemAdvisoryListParams, clearSystemAdvisoriesStore, expandSystemAdvisoryRow,
+    fetchApplicableSystemAdvisories, selectSystemAdvisoryRow } from '../../store/Actions/Actions';
 import { STATUS_REJECTED } from '../../Utilities/constants';
 import { createSystemAdvisoriesRows } from '../../Utilities/DataMappers';
 import { arrayFromObj, createSortBy, decodeQueryparams, encodeURLParams,
@@ -71,15 +71,15 @@ const SystemAdvisories = ({ history }) => {
         )
     );
 
-    const onSelect = React.useCallback((event, value, rowId) => {
+    const onSelect = React.useCallback((event, selected, rowId) => {
         const toSelect = [];
         switch (event) {
             case 'none': {
                 Object.keys(selectedRows).forEach(id=>{
                     toSelect.push(
                         {
-                            rowId: id,
-                            value: false
+                            id,
+                            selected: false
                         }
                     );
                 });
@@ -90,17 +90,17 @@ const SystemAdvisories = ({ history }) => {
                 advisories.forEach(({ id })=>{
                     toSelect.push(
                         {
-                            rowId: id,
-                            value: true
+                            id,
+                            selected: true
                         }
                     );});
                 break;
             }
 
             default: {
                 toSelect.push({
-                    rowId: getRowIdByIndexExpandable(advisories, rowId),
-                    value
+                    id: getRowIdByIndexExpandable(advisories, rowId),
+                    selected
                 });
             }}
 

src/Utilities/Helpers.js

@@ -38,6 +38,14 @@ export const addOrRemoveItemFromSet = (targetObj, inputArr) => {
     return result;
 };
 
+export const getNewSelectedItems = (selectedItems, currentItems) => {
+    let payload = [].concat(selectedItems).map(item=>({ rowId: item.id, value: item.selected }));
+    return addOrRemoveItemFromSet(
+        currentItems,
+        payload
+    );
+};
+
 // for expandable rows only
 export const getRowIdByIndexExpandable = (arrayOfObjects, index) => {
     return arrayOfObjects[index / 2].id;

src/store/Actions/Actions.js

@@ -1,10 +1,5 @@
-import {
-    fetchAdvisoryDetailsApi,
-    fetchAffectedSystems,
-    fetchApplicableAdvisoriesApi,
-    fetchApplicableSystemAdvisoriesApi,
-    fetchSystems
-} from '../../Utilities/api';
+import { fetchAdvisoryDetailsApi, fetchAffectedSystems, fetchApplicableAdvisoriesApi,
+    fetchApplicableSystemAdvisoriesApi, fetchSystems } from '../../Utilities/api';
 import * as ActionTypes from '../ActionTypes';
 
 export const fetchApplicableAdvisories = params => ({
@@ -57,22 +52,22 @@ export const changeAffectedSystemsParams = params => ({
 
 export const expandAdvisoryRow = rowState => ({
     type: ActionTypes.EXPAND_ADVISORY_ROW,
-    payload: [].concat(rowState)
+    payload: rowState
 });
 
 export const expandSystemAdvisoryRow = rowState => ({
     type: ActionTypes.EXPAND_SYSTEM_ADVISORY_ROW,
-    payload: [].concat(rowState)
+    payload: rowState
 });
 
 export const selectAdvisoryRow = rowState => ({
     type: ActionTypes.SELECT_ADVISORY_ROW,
-    payload: [].concat(rowState)
+    payload: rowState
 });
 
 export const selectSystemAdvisoryRow = rowState => ({
     type: ActionTypes.SELECT_SYSTEM_ADVISORY_ROW,
-    payload: [].concat(rowState)
+    payload: rowState
 });
 
 export const clearSystemAdvisoriesStore = () => ({

src/store/Reducers/AdvisoryListStore.js

@@ -1,5 +1,5 @@
 import { STATUS_LOADING, STATUS_REJECTED, STATUS_RESOLVED, storeListDefaults } from '../../Utilities/constants';
-import { addOrRemoveItemFromSet, changeListParams } from '../../Utilities/Helpers';
+import { addOrRemoveItemFromSet, changeListParams, getNewSelectedItems } from '../../Utilities/Helpers';
 import * as ActionTypes from '../ActionTypes';
 
 export const AdvisoryListStore = (state = storeListDefaults, action) => {
@@ -41,10 +41,7 @@ export const AdvisoryListStore = (state = storeListDefaults, action) => {
         }
 
         case ActionTypes.SELECT_ADVISORY_ROW: {
-            const selectedUpdated = addOrRemoveItemFromSet(
-                newState.selectedRows,
-                action.payload
-            );
+            const selectedUpdated = getNewSelectedItems(action.payload, newState.selectedRows);
             newState = { ...newState, selectedRows: selectedUpdated };
             return newState;
         }

src/store/Reducers/AffectedSystemsStore.js

@@ -1,5 +1,5 @@
 import { STATUS_LOADING, STATUS_REJECTED, STATUS_RESOLVED, storeListDefaults } from '../../Utilities/constants';
-import { addOrRemoveItemFromSet, changeListParams } from '../../Utilities/Helpers';
+import { changeListParams, getNewSelectedItems } from '../../Utilities/Helpers';
 import * as ActionTypes from '../ActionTypes';
 
 export const AffectedSystemsStore = (state = storeListDefaults, action) => {
@@ -16,10 +16,7 @@ export const AffectedSystemsStore = (state = storeListDefaults, action) => {
             return newState;
 
         case 'SELECT_ENTITY': {
-            const selectedUpdated = addOrRemoveItemFromSet(
-                newState.selectedRows,
-                [{ rowId: action.payload.id, value: action.payload.selected }]
-            );
+            const selectedUpdated = getNewSelectedItems(action.payload, newState.selectedRows);
             newState = { ...newState, selectedRows: selectedUpdated };
             return newState;
         }

src/store/Reducers/SystemAdvisoryListStore.js

@@ -1,5 +1,5 @@
 import { STATUS_LOADING, STATUS_RESOLVED, storeListDefaults } from '../../Utilities/constants';
-import { addOrRemoveItemFromSet } from '../../Utilities/Helpers';
+import { addOrRemoveItemFromSet, getNewSelectedItems } from '../../Utilities/Helpers';
 import * as ActionTypes from '../ActionTypes';
 
 export const SystemAdvisoryListStore = (state = storeListDefaults, action) => {
@@ -33,10 +33,7 @@ export const SystemAdvisoryListStore = (state = storeListDefaults, action) => {
         }
 
         case ActionTypes.SELECT_SYSTEM_ADVISORY_ROW: {
-            const selectedUpdated = addOrRemoveItemFromSet(
-                newState.selectedRows,
-                action.payload
-            );
+            const selectedUpdated = getNewSelectedItems(action.payload, newState.selectedRows);
             newState = { ...newState, selectedRows: selectedUpdated };
             return newState;
         }