sanity-plugin-media 4.3.5 → 4.3.6

package/src/modules/assets/deleteAndUpdateEpics.test.ts

@@ -47,7 +47,7 @@ describe('assetsDeleteEpic', () => {
     store.dispatch(assetsActions.deleteRequest({assets: [sampleAsset]}))
 
     await vi.waitFor(() => {
-      expect(store.getState().assets.byIds.a1).toBeUndefined()
+      expect(store.getState().assets.byIds['a1']).toBeUndefined()
       expect(client.observable.delete).toHaveBeenCalled()
     })
   })
@@ -81,7 +81,7 @@ describe('assetsUpdateEpic', () => {
 
     await vi.waitFor(() => {
       expect(chain.commit).toHaveBeenCalled()
-      expect(store.getState().assets.byIds.a1.asset.title).toBe('Updated')
+      expect(store.getState().assets.byIds['a1']!.asset.title).toBe('Updated')
     })
   })
 })

package/src/modules/assets/fetchEpic.test.ts

@@ -9,7 +9,7 @@ import type {ImageAsset} from '../../types'
 import {assetsActions, assetsFetchEpic} from './index'
 
 function assertFetchSucceeded(store: ReturnType<typeof createEpicTestStore>, asset: ImageAsset) {
-  expect(store.getState().assets.byIds.a1?.asset).toEqual(asset)
+  expect(store.getState().assets.byIds['a1']?.asset).toEqual(asset)
   expect(store.getState().assets.fetching).toBe(false)
 }
 

package/src/modules/assets/index.ts

@@ -110,37 +110,37 @@ const assetsSlice = createSlice({
       .addCase(ASSETS_ACTIONS.tagsAddComplete, (state, action) => {
         const {assets} = action.payload
         assets.forEach((asset) => {
-          state.byIds[asset.asset._id].updating = false
+          state.byIds[asset.asset._id]!.updating = false
         })
       })
       .addCase(ASSETS_ACTIONS.tagsAddError, (state, action) => {
         const {assets} = action.payload
         assets.forEach((asset) => {
-          state.byIds[asset.asset._id].updating = false
+          state.byIds[asset.asset._id]!.updating = false
         })
       })
       .addCase(ASSETS_ACTIONS.tagsAddRequest, (state, action) => {
         const {assets} = action.payload
         assets.forEach((asset) => {
-          state.byIds[asset.asset._id].updating = true
+          state.byIds[asset.asset._id]!.updating = true
         })
       })
       .addCase(ASSETS_ACTIONS.tagsRemoveComplete, (state, action) => {
         const {assets} = action.payload
         assets.forEach((asset) => {
-          state.byIds[asset.asset._id].updating = false
+          state.byIds[asset.asset._id]!.updating = false
         })
       })
       .addCase(ASSETS_ACTIONS.tagsRemoveError, (state, action) => {
         const {assets} = action.payload
         assets.forEach((asset) => {
-          state.byIds[asset.asset._id].updating = false
+          state.byIds[asset.asset._id]!.updating = false
         })
       })
       .addCase(ASSETS_ACTIONS.tagsRemoveRequest, (state, action) => {
         const {assets} = action.payload
         assets.forEach((asset) => {
-          state.byIds[asset.asset._id].updating = true
+          state.byIds[asset.asset._id]!.updating = true
         })
       })
   },
@@ -170,20 +170,20 @@ const assetsSlice = createSlice({
       )
 
       assetIds?.forEach((id) => {
-        state.byIds[id].updating = false
+        state.byIds[id]!.updating = false
       })
       itemErrors?.forEach((item) => {
-        state.byIds[item.id].error = item.description
+        state.byIds[item.id]!.error = item.description
       })
     },
     deleteRequest(state, action: PayloadAction<{assets: Asset[]; closeDialogId?: string}>) {
       const {assets} = action.payload
       assets.forEach((asset) => {
-        state.byIds[asset?._id].updating = true
+        state.byIds[asset?._id]!.updating = true
       })
 
       Object.keys(state.byIds).forEach((key) => {
-        delete state.byIds[key].error
+        delete state.byIds[key]!.error
       })
     },
     fetchComplete(state, action: PayloadAction<{assets: Asset[]}>) {
@@ -284,7 +284,7 @@ const assetsSlice = createSlice({
       const {assets} = action.payload
       assets?.forEach((asset) => {
         if (state.byIds[asset?._id]?.asset) {
-          state.byIds[asset._id].asset = asset
+          state.byIds[asset._id]!.asset = asset
         }
       })
     },
@@ -308,7 +308,7 @@ const assetsSlice = createSlice({
       const {assets} = action.payload
       assets?.forEach((asset) => {
         if (state.byIds[asset?._id]?.asset) {
-          state.byIds[asset._id].asset = asset
+          state.byIds[asset._id]!.asset = asset
         }
       })
     },
@@ -326,18 +326,18 @@ const assetsSlice = createSlice({
     pick(state, action: PayloadAction<{assetId: string; picked: boolean}>) {
       const {assetId, picked} = action.payload
 
-      state.byIds[assetId].picked = picked
+      state.byIds[assetId]!.picked = picked
       state.lastPicked = picked ? assetId : undefined
     },
     pickAll(state) {
       state.allIds.forEach((id) => {
-        state.byIds[id].picked = true
+        state.byIds[id]!.picked = true
       })
     },
     pickClear(state) {
       state.lastPicked = undefined
       Object.values(state.byIds).forEach((asset) => {
-        state.byIds[asset.asset._id].picked = false
+        state.byIds[asset.asset._id]!.picked = false
       })
     },
     pickRange(state, action: PayloadAction<{endId: string; startId: string}>) {
@@ -347,15 +347,15 @@ const assetsSlice = createSlice({
       // Sort numerically, ascending order
       const indices = [startIndex, endIndex].sort((a, b) => a - b)
 
-      state.allIds.slice(indices[0], indices[1] + 1).forEach((key) => {
-        state.byIds[key].picked = true
+      state.allIds.slice(indices[0], indices[1]! + 1).forEach((key) => {
+        state.byIds[key]!.picked = true
       })
       state.lastPicked = state.allIds[endIndex]
     },
     sort(state) {
       state.allIds.sort((a, b) => {
-        const tagA = state.byIds[a].asset[state.order.field]
-        const tagB = state.byIds[b].asset[state.order.field]
+        const tagA = state.byIds[a]!.asset[state.order.field]
+        const tagB = state.byIds[b]!.asset[state.order.field]
 
         if (tagA < tagB) {
           return state.order.direction === 'asc' ? -1 : 1
@@ -367,22 +367,22 @@ const assetsSlice = createSlice({
     },
     updateComplete(state, action: PayloadAction<{asset: Asset; closeDialogId?: string}>) {
       const {asset} = action.payload
-      state.byIds[asset._id].updating = false
-      state.byIds[asset._id].asset = asset
+      state.byIds[asset._id]!.updating = false
+      state.byIds[asset._id]!.asset = asset
     },
     updateError(state, action: PayloadAction<{asset: Asset; error: HttpError}>) {
       const {asset, error} = action.payload
 
       const assetId = asset?._id
-      state.byIds[assetId].error = error.message
-      state.byIds[assetId].updating = false
+      state.byIds[assetId]!.error = error.message
+      state.byIds[assetId]!.updating = false
     },
     updateRequest(
       state,
       action: PayloadAction<{asset: Asset; closeDialogId?: string; formData: Record<string, any>}>,
     ) {
       const assetId = action.payload?.asset?._id
-      state.byIds[assetId].updating = true
+      state.byIds[assetId]!.updating = true
     },
     viewSet(state, action: PayloadAction<{view: BrowserView}>) {
       state.view = action.payload?.view
@@ -523,49 +523,6 @@ const patchOperationTagUnset =
   (patch: Patch) =>
     patch.ifRevisionId(asset?.asset?._rev).unset([`opt.media.tags[_ref == "${tag._id}"]`])
 
-export const assetsRemoveTagsEpic: MyEpic = (action$, state$, {client}) => {
-  return action$.pipe(
-    filter(ASSETS_ACTIONS.tagsAddRequest.match),
-    withLatestFrom(state$),
-    mergeMap(([action, state]) => {
-      const {assets, tag} = action.payload
-
-      return of(action).pipe(
-        // Optionally throttle
-        debugThrottle(state.debug.badConnection),
-        // Add tag references to all picked assets
-        mergeMap(() => {
-          const pickedAssets = selectAssetsPicked(state)
-
-          // Filter out picked assets which already include tag
-          const pickedAssetsFiltered = pickedAssets?.filter(filterAssetWithoutTag(tag))
-
-          const transaction: Transaction = pickedAssetsFiltered.reduce(
-            (tx, pickedAsset) => tx.patch(pickedAsset?.asset?._id, patchOperationTagAppend({tag})),
-            client.transaction(),
-          )
-
-          return from(transaction.commit())
-        }),
-        // Dispatch complete action
-        mergeMap(() => of(ASSETS_ACTIONS.tagsAddComplete({assets, tag}))),
-        catchError((error: ClientError) =>
-          of(
-            ASSETS_ACTIONS.tagsAddError({
-              assets,
-              error: {
-                message: error?.message || 'Internal error',
-                statusCode: error?.statusCode || 500,
-              },
-              tag,
-            }),
-          ),
-        ),
-      )
-    }),
-  )
-}
-
 export const assetsOrderSetEpic: MyEpic = (action$) =>
   action$.pipe(
     filter(assetsActions.orderSet.match),
@@ -804,9 +761,9 @@ export const selectAssetById = createSelector(
   },
 )
 
-export const selectAssets: Selector<RootReducerState, AssetItem[]> = createSelector(
+const selectAssets: Selector<RootReducerState, AssetItem[]> = createSelector(
   [selectAssetsByIds, selectAssetsAllIds],
-  (byIds, allIds) => allIds.map((id) => byIds[id]),
+  (byIds, allIds) => allIds.map((id) => byIds[id]!),
 )
 
 export const selectAssetsLength = createSelector([selectAssets], (assets) => assets.length)

package/src/modules/assets/reducer.test.ts

@@ -37,7 +37,7 @@ describe('assets slice', () => {
   it('pick toggles picked flag', () => {
     let state = stateWithOneAsset()
     state = assetsReducer(state, assetsActions.pick({assetId: 'img-1', picked: true}))
-    expect(state.byIds['img-1'].picked).toBe(true)
+    expect(state.byIds['img-1']!.picked).toBe(true)
     expect(state.lastPicked).toBe('img-1')
   })
 
@@ -45,7 +45,7 @@ describe('assets slice', () => {
     let state = stateWithOneAsset()
     state = assetsReducer(state, assetsActions.pick({assetId: 'img-1', picked: true}))
     state = assetsReducer(state, assetsActions.pickClear())
-    expect(state.byIds['img-1'].picked).toBe(false)
+    expect(state.byIds['img-1']!.picked).toBe(false)
     expect(state.lastPicked).toBeUndefined()
   })
 
@@ -86,6 +86,6 @@ describe('assets slice', () => {
     let state = stateWithOneAsset()
     const updated = {...minimalImage, title: 'New'}
     state = assetsReducer(state, assetsActions.listenerUpdateQueueComplete({assets: [updated]}))
-    expect(state.byIds['img-1'].asset.title).toBe('New')
+    expect(state.byIds['img-1']!.asset.title).toBe('New')
   })
 })

package/src/modules/assets/tagsAndListenerEpics.test.ts

@@ -159,7 +159,7 @@ describe('assets listener queue epics', () => {
     await vi.advanceTimersByTimeAsync(2000)
 
     await vi.waitFor(() => {
-      expect(store.getState().assets.byIds.a1.asset.title).toBe('L')
+      expect(store.getState().assets.byIds['a1']!.asset.title).toBe('L')
     })
   })
 
@@ -179,7 +179,7 @@ describe('assets listener queue epics', () => {
     await vi.advanceTimersByTimeAsync(2000)
 
     await vi.waitFor(() => {
-      expect(store.getState().assets.byIds.a1).toBeUndefined()
+      expect(store.getState().assets.byIds['a1']).toBeUndefined()
     })
   })
 
@@ -200,7 +200,7 @@ describe('assets listener queue epics', () => {
     await vi.advanceTimersByTimeAsync(2000)
 
     await vi.waitFor(() => {
-      expect(store.getState().assets.byIds.a1.asset.title).toBe('Buffered')
+      expect(store.getState().assets.byIds['a1']!.asset.title).toBe('Buffered')
     })
   })
 })

package/src/modules/dialog/epics.test.ts

@@ -116,7 +116,7 @@ describe('dialogTagCreateEpic', () => {
     await vi.waitFor(() => {
       const item = store.getState().dialog.items[0]
       expect(item?.type).toBe('assetEdit')
-      expect('lastCreatedTag' in item && item.lastCreatedTag).toEqual({
+      expect('lastCreatedTag' in item! && item.lastCreatedTag).toEqual({
         label: 'alpha',
         value: 't1',
       })

package/src/modules/dialog/index.ts

@@ -209,7 +209,7 @@ export const dialogTagCreateEpic: MyEpic = (action$) =>
   action$.pipe(
     filter(tagsActions.createComplete.match),
     mergeMap((action) => {
-      const {assetId, tag} = action?.payload
+      const {assetId, tag} = action?.payload || {}
 
       if (assetId) {
         return of(dialogSlice.actions.inlineTagCreate({tag, assetId}))
@@ -227,7 +227,7 @@ export const dialogTagDeleteEpic: MyEpic = (action$) =>
   action$.pipe(
     filter(tagsActions.listenerDeleteQueueComplete.match),
     mergeMap((action) => {
-      const {tagIds} = action?.payload
+      const {tagIds} = action?.payload || {}
 
       return of(dialogSlice.actions.inlineTagRemove({tagIds}))
     }),

package/src/modules/index.ts

@@ -1,9 +1,4 @@
-import {
-  type ActionFromReducersMapObject,
-  type Reducer,
-  type StateFromReducersMapObject,
-  combineReducers,
-} from '@reduxjs/toolkit'
+import {type Reducer, type StateFromReducersMapObject, combineReducers} from '@reduxjs/toolkit'
 import {combineEpics} from 'redux-observable'
 
 import assetsReducer, {
@@ -118,7 +113,5 @@ type ReducersMapObject = typeof reducers
 // Workaround to avoid `$CombinedState` ts errors
 // source: https://github.com/reduxjs/redux-toolkit/issues/2068#issuecomment-1130796500
 // TODO: remove once we use `redux-toolkit` v2
-export const rootReducer: Reducer<
-  StateFromReducersMapObject<ReducersMapObject>,
-  ActionFromReducersMapObject<ReducersMapObject>
-> = combineReducers(reducers)
+export const rootReducer: Reducer<StateFromReducersMapObject<ReducersMapObject>> =
+  combineReducers(reducers)

package/src/modules/notifications/epics.test.ts

@@ -94,8 +94,8 @@ describe('notificationsAssetsDeleteErrorEpic', () => {
     store.dispatch(assetsActions.deleteError({assetIds: ['a1'], error: {} as any}))
     await vi.waitFor(() => {
       const [n] = store.getState().notifications.items
-      expect(n.status).toBe('error')
-      expect(n.title).toBe(
+      expect(n!.status).toBe('error')
+      expect(n!.title).toBe(
         'Unable to delete 1 asset. Please review any asset errors and try again.',
       )
     })
@@ -271,7 +271,7 @@ describe('notificationsGenericErrorEpic', () => {
       }),
     )
     await vi.waitFor(() => {
-      expect(store.getState().notifications.items[0].title).toBe('An error occurred: fetch failed')
+      expect(store.getState().notifications.items[0]!.title).toBe('An error occurred: fetch failed')
     })
   })
 
@@ -294,7 +294,7 @@ describe('notificationsGenericErrorEpic', () => {
       }),
     )
     await vi.waitFor(() => {
-      expect(store.getState().notifications.items[0].title).toBe('An error occurred: tag create')
+      expect(store.getState().notifications.items[0]!.title).toBe('An error occurred: tag create')
     })
   })
 
@@ -309,7 +309,7 @@ describe('notificationsGenericErrorEpic', () => {
       }),
     )
     await vi.waitFor(() => {
-      expect(store.getState().notifications.items[0].title).toBe('An error occurred: upload bad')
+      expect(store.getState().notifications.items[0]!.title).toBe('An error occurred: upload bad')
     })
   })
 })

package/src/modules/notifications/index.ts

@@ -166,7 +166,7 @@ export const notificationsGenericErrorEpic: MyEpic = (action$) =>
       uploadsActions.uploadError.type,
     ),
     mergeMap((action: AnyAction) => {
-      const title = `An error occurred: ${messageFromGenericErrorPayload(action.payload)}`
+      const title = `An error occurred: ${messageFromGenericErrorPayload(action['payload'])}`
       return of(
         notificationsSlice.actions.add({
           status: 'error',

package/src/modules/search/index.test.ts

@@ -10,8 +10,8 @@ describe('search slice', () => {
     let state = searchReducer(undefined, {type: '@@INIT'} as never)
     state = searchReducer(state, searchActions.facetsAdd({facet: {...inputs.title}}))
     expect(state.facets).toHaveLength(1)
-    expect(state.facets[0].name).toBe('title')
-    expect(state.facets[0].id).toBeDefined()
+    expect(state.facets[0]!.name).toBe('title')
+    expect(state.facets[0]!.id).toBeDefined()
   })
 
   it('querySet updates search string', () => {

package/src/modules/search/index.ts

@@ -103,7 +103,7 @@ const searchSlice = createSlice({
             facet.operatorType = operatorType
           }
           if (typeof value !== 'undefined') {
-            state.facets[index].value = value
+            state.facets[index]!.value = value
           }
         }
       })

package/src/modules/tags/epics.test.ts

@@ -33,7 +33,7 @@ describe('tagsCreateEpic', () => {
     store.dispatch(tagsActions.createRequest({name: 'alpha'}))
 
     await vi.waitFor(() => {
-      expect(store.getState().tags.byIds.t1?.tag).toEqual(sampleTag)
+      expect(store.getState().tags.byIds['t1']?.tag).toEqual(sampleTag)
       expect(client.observable.create).toHaveBeenCalled()
     })
   })
@@ -90,7 +90,7 @@ describe('tagsDeleteEpic', () => {
       expect(tx.patch).toHaveBeenCalled()
       expect(tx.delete).toHaveBeenCalledWith('t1')
       expect(tx.commit).toHaveBeenCalled()
-      expect(store.getState().tags.byIds.t1).toBeUndefined()
+      expect(store.getState().tags.byIds['t1']).toBeUndefined()
     })
   })
 })

package/src/modules/tags/index.test.ts

@@ -19,7 +19,7 @@ describe('tags slice', () => {
     let state = tagsReducer(undefined, {type: '@@INIT'} as never)
     state = tagsReducer(state, tagsActions.createComplete({tag: sampleTag}))
     expect(state.allIds).toContain('tag-1')
-    expect(state.byIds['tag-1'].tag).toEqual(sampleTag)
+    expect(state.byIds['tag-1']!.tag).toEqual(sampleTag)
     expect(state.creating).toBe(false)
   })
 
@@ -37,6 +37,6 @@ describe('tags slice', () => {
     expect(state.fetching).toBe(true)
     state = tagsReducer(state, tagsActions.fetchComplete({tags: [sampleTag]}))
     expect(state.fetching).toBe(false)
-    expect(state.byIds['tag-1'].tag).toEqual(sampleTag)
+    expect(state.byIds['tag-1']!.tag).toEqual(sampleTag)
   })
 })

package/src/modules/tags/index.ts

@@ -48,7 +48,7 @@ const tagsSlice = createSlice({
       })
       .addCase(DIALOG_ACTIONS.showTagEdit, (state, action) => {
         const {tagId} = action.payload
-        delete state.byIds[tagId].error
+        delete state.byIds[tagId]!.error
       })
       .addMatcher(
         isAnyOf(
@@ -59,14 +59,14 @@ const tagsSlice = createSlice({
         ),
         (state, action) => {
           const {tag} = action.payload
-          state.byIds[tag._id].updating = false
+          state.byIds[tag._id]!.updating = false
         },
       )
       .addMatcher(
         isAnyOf(ASSETS_ACTIONS.tagsAddRequest, ASSETS_ACTIONS.tagsRemoveRequest),
         (state, action) => {
           const {tag} = action.payload
-          state.byIds[tag._id].updating = true
+          state.byIds[tag._id]!.updating = true
         },
       )
   },
@@ -104,16 +104,16 @@ const tagsSlice = createSlice({
       const {error, tag} = action.payload
 
       const tagId = tag?._id
-      state.byIds[tagId].error = error
-      state.byIds[tagId].updating = false
+      state.byIds[tagId]!.error = error
+      state.byIds[tagId]!.updating = false
     },
     deleteRequest(state, action: PayloadAction<{tag: Tag}>) {
       const tagId = action.payload?.tag?._id
-      state.byIds[tagId].picked = false
-      state.byIds[tagId].updating = true
+      state.byIds[tagId]!.picked = false
+      state.byIds[tagId]!.updating = true
 
       Object.keys(state.byIds).forEach((key) => {
-        delete state.byIds[key].error
+        delete state.byIds[key]!.error
       })
     },
     fetchComplete(state, action: PayloadAction<{tags: Tag[]}>) {
@@ -209,7 +209,7 @@ const tagsSlice = createSlice({
 
       tags?.forEach((tag) => {
         if (state.byIds[tag._id]) {
-          state.byIds[tag._id].tag = tag
+          state.byIds[tag._id]!.tag = tag
         }
       })
     },
@@ -221,8 +221,8 @@ const tagsSlice = createSlice({
     // Sort all tags by name
     sort(state) {
       state.allIds.sort((a, b) => {
-        const tagA = state.byIds[a].tag.name.current
-        const tagB = state.byIds[b].tag.name.current
+        const tagA = state.byIds[a]!.tag.name.current
+        const tagB = state.byIds[b]!.tag.name.current
 
         if (tagA < tagB) {
           return -1
@@ -234,14 +234,14 @@ const tagsSlice = createSlice({
     },
     updateComplete(state, action: PayloadAction<{closeDialogId?: string; tag: Tag}>) {
       const {tag} = action.payload
-      state.byIds[tag._id].tag = tag
-      state.byIds[tag._id].updating = false
+      state.byIds[tag._id]!.tag = tag
+      state.byIds[tag._id]!.updating = false
     },
     updateError(state, action: PayloadAction<{tag: Tag; error: HttpError}>) {
       const {error, tag} = action.payload
       const tagId = tag?._id
-      state.byIds[tagId].error = error
-      state.byIds[tagId].updating = false
+      state.byIds[tagId]!.error = error
+      state.byIds[tagId]!.updating = false
     },
     updateRequest(
       state,
@@ -252,7 +252,7 @@ const tagsSlice = createSlice({
       }>,
     ) {
       const {tag} = action.payload
-      state.byIds[tag?._id].updating = true
+      state.byIds[tag?._id]!.updating = true
     },
   },
 })
@@ -464,14 +464,14 @@ export const tagsUpdateEpic: MyEpic = (action$, state$, {client}) =>
         // Optionally throttle
         debugThrottle(state.debug.badConnection),
         // Check if tag name is available, throw early if not
-        checkTagName(client, formData?.name?.current),
+        checkTagName(client, formData?.['name']?.current),
         // Patch document (Update tag)
         mergeMap(
           () =>
             from(
               client
                 .patch(tag._id)
-                .set({name: {_type: 'slug', current: formData?.name.current}})
+                .set({name: {_type: 'slug', current: formData?.['name'].current}})
                 .commit(),
             ) as Observable<Tag>,
         ),
@@ -507,7 +507,7 @@ const selectTagsAllIds = (state: RootReducerState) => state.tags.allIds
 
 export const selectTags: Selector<RootReducerState, TagItem[]> = createSelector(
   [selectTagsByIds, selectTagsAllIds],
-  (byIds, allIds) => allIds.map((id) => byIds[id]),
+  (byIds, allIds) => allIds.map((id) => byIds[id]!),
 )
 
 export const selectTagById = createSelector(

package/src/modules/uploads/epics.test.ts

@@ -55,7 +55,7 @@ describe('uploadsAssetStartEpic', () => {
     store.dispatch(uploadsActions.uploadStart({file, uploadItem}))
 
     await vi.waitFor(() => {
-      expect(store.getState().uploads.byIds.deadbeef?.objectUrl).toBe('blob:http://preview')
+      expect(store.getState().uploads.byIds['deadbeef']?.objectUrl).toBe('blob:http://preview')
     })
 
     await vi.waitFor(() => {
@@ -103,7 +103,7 @@ describe('uploadsCheckRequestEpic', () => {
 
     await vi.waitFor(() => {
       expect(client.observable.fetch).toHaveBeenCalled()
-      expect(store.getState().uploads.byIds.hh).toBeUndefined()
+      expect(store.getState().uploads.byIds['hh']).toBeUndefined()
     })
   })
 })

package/src/modules/uploads/index.test.ts

@@ -26,7 +26,7 @@ describe('uploads slice', () => {
     )
 
     expect(state.allIds).toEqual(['abc'])
-    expect(state.byIds.abc).toMatchObject({hash: 'abc', status: 'queued'})
+    expect(state.byIds['abc']).toMatchObject({hash: 'abc', status: 'queued'})
   })
 
   it('uploadProgress updates percent and status', () => {
@@ -53,7 +53,7 @@ describe('uploads slice', () => {
       }),
     )
 
-    expect(state.byIds.h1.percent).toBe(42)
-    expect(state.byIds.h1.status).toBe('uploading')
+    expect(state.byIds['h1']!.percent).toBe(42)
+    expect(state.byIds['h1']!.status).toBe('uploading')
   })
 })

package/src/modules/uploads/index.ts

@@ -1,7 +1,6 @@
 import {createSelector, createSlice, type PayloadAction} from '@reduxjs/toolkit'
 import type {ClientError, SanityAssetDocument, SanityImageAssetDocument} from '@sanity/client'
 import groq from 'groq'
-import type {Selector} from 'react-redux'
 import {empty, merge, of} from 'rxjs'
 import {catchError, delay, filter, mergeMap, takeUntil, withLatestFrom} from 'rxjs/operators'
 
@@ -31,7 +30,7 @@ const uploadsSlice = createSlice({
       .addCase(UPLOADS_ACTIONS.uploadComplete, (state, action) => {
         const {asset} = action.payload
         if (state.byIds[asset.sha1hash]) {
-          state.byIds[asset.sha1hash].status = 'complete'
+          state.byIds[asset.sha1hash]!.status = 'complete'
         }
       })
   },
@@ -98,8 +97,8 @@ const uploadsSlice = createSlice({
       action: PayloadAction<{event: SanityUploadProgressEvent; uploadHash: string}>,
     ) {
       const {event, uploadHash} = action.payload
-      state.byIds[uploadHash].percent = event.percent
-      state.byIds[uploadHash].status = 'uploading'
+      state.byIds[uploadHash]!.percent = event.percent
+      state.byIds[uploadHash]!.status = 'uploading'
     },
     uploadStart(state, action: PayloadAction<{file: File; uploadItem: UploadItem}>) {
       const {uploadItem} = action.payload
@@ -260,10 +259,6 @@ export const uploadsCheckRequestEpic: MyEpic = (action$, state$, {client}) =>
 
 // Selectors
 
-const selectUploadsByIds = (state: RootReducerState) => state.uploads.byIds
-
-const selectUploadsAllIds = (state: RootReducerState) => state.uploads.allIds
-
 export const selectUploadById = createSelector(
   [
     (state: RootReducerState) => state.uploads.byIds,
@@ -272,11 +267,6 @@ export const selectUploadById = createSelector(
   (byIds, uploadId) => byIds[uploadId],
 )
 
-export const selectUploads: Selector<RootReducerState, UploadItem[]> = createSelector(
-  [selectUploadsByIds, selectUploadsAllIds],
-  (byIds, allIds) => allIds.map((id) => byIds[id]),
-)
-
 export const uploadsActions = {...uploadsSlice.actions}
 
 export default uploadsSlice.reducer