update reducer per feedback

Azure · Jul 29, 2019 · 01349cb · 01349cb
1 parent cd3a0c7
commit 01349cb
Showing 1 changed file with 33 additions and 43 deletions.
diff --git a/src/app/devices/deviceList/reducer.ts b/src/app/devices/deviceList/reducer.ts
@@ -14,92 +14,82 @@ import { BulkRegistryOperationResult } from '../../api/models/bulkRegistryOperat
 
 const reducer = reducerWithInitialState<DeviceListStateType>(deviceListStateInitial())
     .case(listDevicesAction.started, (state: DeviceListStateType, payload: DeviceQuery) => {
-        const devices = state.devices.merge({
-            deviceListSynchronizationStatus: SynchronizationStatus.working
-        });
         return state.merge({
             deviceQuery: {...payload},
-            devices
+            devices: state.devices.merge({
+                deviceListSynchronizationStatus: SynchronizationStatus.working
+            })
         });
     })
     .case(listDevicesAction.done, (state: DeviceListStateType, payload: {params: DeviceQuery} & {result: DeviceSummary[]}) => {
         const deviceList = new Map<string, DeviceSummary>();
         payload.result.forEach(item => deviceList.set(item.deviceId, item));
-        const devices = state.devices.merge({
-            deviceList: fromJS(deviceList),
-            deviceListSynchronizationStatus: SynchronizationStatus.fetched
-        });
         return state.merge({
             deviceQuery: {...payload.params},
-            devices
+            devices: state.devices.merge({
+                deviceList: fromJS(deviceList),
+                deviceListSynchronizationStatus: SynchronizationStatus.fetched
+            })
         });
     })
     .case(listDevicesAction.failed, (state: DeviceListStateType) => {
-        const devices = state.devices.merge({
-            deviceList: ImmutableMap<string, DeviceSummary>(),
-            deviceListSynchronizationStatus: SynchronizationStatus.failed
-        });
         return state.merge({
-            devices
+            devices: state.devices.merge({
+                deviceList: ImmutableMap<string, DeviceSummary>(),
+                deviceListSynchronizationStatus: SynchronizationStatus.failed
+            })
         });
     })
     .case(addDeviceAction.started, (state: DeviceListStateType) => {
-        const devices = state.devices.merge({
-            deviceListSynchronizationStatus: SynchronizationStatus.updating
-        });
         return state.merge({
-            devices
+            devices: state.devices.merge({
+                deviceListSynchronizationStatus: SynchronizationStatus.updating
+            })
         });
     })
     .case(addDeviceAction.done, (state: DeviceListStateType, payload: {params: DeviceIdentity} & {result: DeviceSummary}) => {
-        const devices = state.devices.merge({
-            deviceListSynchronizationStatus: SynchronizationStatus.upserted
-        });
         return state.merge({
-            devices
+            devices: state.devices.merge({
+                deviceListSynchronizationStatus: SynchronizationStatus.upserted
+            })
         });
     })
     .case(addDeviceAction.failed, (state: DeviceListStateType) => {
-        const devices = state.devices.merge({
-            deviceListSynchronizationStatus: SynchronizationStatus.failed
-        });
         return state.merge({
-            devices
+            devices: state.devices.merge({
+                deviceListSynchronizationStatus: SynchronizationStatus.failed
+            })
         });
     })
     .case(deleteDevicesAction.started, (state: DeviceListStateType) => {
-        const devices = state.devices.merge({
-            deviceListSynchronizationStatus: SynchronizationStatus.updating
-        });
         return state.merge({
-            devices
+            devices: state.devices.merge({
+                deviceListSynchronizationStatus: SynchronizationStatus.updating
+            })
         });
     })
     .case(deleteDevicesAction.done, (state: DeviceListStateType, payload: {params: string[]} & {result: BulkRegistryOperationResult}) => {
         const deviceList = state.devices.deviceList;
         payload.params.forEach(id => deviceList.delete(id));
-        const devices = state.devices.merge({
-            deviceListSynchronizationStatus: SynchronizationStatus.deleted
-        });
         return state.merge({
-            devices
+            devices: state.devices.merge({
+                deviceListSynchronizationStatus: SynchronizationStatus.deleted
+            })
         });
     })
     .case(deleteDevicesAction.failed, (state: DeviceListStateType) => {
-        const devices = state.devices.merge({
-            deviceListSynchronizationStatus: SynchronizationStatus.failed
-        });
         return state.merge({
-            devices
+            devices: state.devices.merge({
+                deviceListSynchronizationStatus: SynchronizationStatus.failed
+            })
         });
     })
     .case(clearDevicesAction, (state: DeviceListStateType) => {
-        const devices = state.devices.merge({
-            deviceList: ImmutableMap<string, DeviceSummary>(),
-            deviceListSynchronizationStatus: SynchronizationStatus.deleted
-        });
         return state.merge({
-            devices
+            devices: state.devices.merge({
+                deviceList: ImmutableMap<string, DeviceSummary>(),
+                deviceListSynchronizationStatus: SynchronizationStatus.deleted
+            })
         });
     });
 export default reducer;