Make redux utils generic (#4511)

Author: mattseddon

webview/src/experiments/state/rowSelectionSlice.ts

@@ -1,7 +1,7 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit'
 import { ExecutorStatus } from 'dvc/src/cli/dvc/contract'
 import { getCompositeId } from '../util/rows'
-import { keepEqualOldReferencesInArray } from '../../util/array'
+import { keepReferenceIfEqual } from '../../util/objects'
 
 export type SelectedRow = {
   depth: number
@@ -80,10 +80,7 @@ export const rowSelectionSlice = createSlice({
     },
     updateRowOrder(state, action: PayloadAction<SelectedRow[]>) {
       const newOrder = action.payload
-      state.rowOrder = keepEqualOldReferencesInArray(
-        state.rowOrder,
-        newOrder
-      ) as SelectedRow[]
+      state.rowOrder = keepReferenceIfEqual(state.rowOrder, newOrder)
     }
   }
 })

webview/src/experiments/state/tableDataSlice.ts

@@ -126,7 +126,7 @@ export const tableDataSlice = createSlice({
       state.columnWidths = keepReferenceIfEqual(
         state.columnWidths,
         action.payload
-      ) as Record<string, number>
+      )
     },
     updateColumns: (state, action: PayloadAction<ExtensionColumn[]>) => {
       if (isEqual(state.columns, action.payload)) {
@@ -161,7 +161,7 @@ export const tableDataSlice = createSlice({
       state.hasMoreCommits = keepReferenceIfEqual(
         state.hasMoreCommits,
         action.payload
-      ) as Record<string, boolean>
+      )
     },
     updateHasRunningWorkspaceExperiment: (
       state,
@@ -176,13 +176,10 @@ export const tableDataSlice = createSlice({
       state.isShowingMoreCommits = keepReferenceIfEqual(
         state.isShowingMoreCommits,
         action.payload
-      ) as Record<string, boolean>
+      )
     },
     updateRows: (state, action: PayloadAction<Experiment[]>) => {
-      state.rows = keepEqualOldReferencesInArray(
-        state.rows,
-        action.payload
-      ) as Experiment[]
+      state.rows = keepEqualOldReferencesInArray(state.rows, action.payload)
     },
     updateSelectedBranches: (state, action: PayloadAction<string[]>) => {
       state.selectedBranches = action.payload
@@ -194,10 +191,7 @@ export const tableDataSlice = createSlice({
       state.showOnlyChanged = action.payload
     },
     updateSorts: (state, action: PayloadAction<SortDefinition[]>) => {
-      state.sorts = keepEqualOldReferencesInArray(
-        state.sorts,
-        action.payload
-      ) as SortDefinition[]
+      state.sorts = keepEqualOldReferencesInArray(state.sorts, action.payload)
     }
   }
 })

webview/src/util/array.ts

@@ -5,10 +5,10 @@ import { DraggedInfo } from '../shared/components/dragDrop/dragDropSlice'
 export const pushIf = <T>(array: T[], condition: boolean, elements: T[]) =>
   condition && array.push(...elements)
 
-export const keepEqualOldReferencesInArray = (
-  oldArray: BaseType[],
-  newArray: BaseType[]
-) =>
+export const keepEqualOldReferencesInArray = <T extends BaseType>(
+  oldArray: T[],
+  newArray: T[]
+): T[] =>
   newArray.map(item => oldArray.find(oldItem => isEqual(oldItem, item)) || item)
 
 export const changeOrderWithDraggedInfo = (

webview/src/util/objects.ts

@@ -13,5 +13,7 @@ export type Any = BaseType | BaseType[]
 
 type Obj = { [key: string]: Any }
 
-export const keepReferenceIfEqual = (old: BaseType, recent: BaseType) =>
-  isEqual(old, recent) ? old : recent
+export const keepReferenceIfEqual = <T extends BaseType>(
+  old: T,
+  recent: T
+): T => (isEqual(old, recent) ? old : recent)