sanity-plugin-media 4.3.0 → 4.3.2

package/src/modules/tags/index.ts

@@ -1,14 +1,15 @@
 import {createSelector, createSlice, isAnyOf, type PayloadAction} from '@reduxjs/toolkit'
 import type {ClientError, Transaction} from '@sanity/client'
-import type {Asset, HttpError, MyEpic, TagSelectOption, Tag, TagItem} from '../../types'
 import groq from 'groq'
 import type {Selector} from 'react-redux'
 import {ofType} from 'redux-observable'
 import {from, Observable, of} from 'rxjs'
 import {bufferTime, catchError, filter, mergeMap, switchMap, withLatestFrom} from 'rxjs/operators'
+
 import {TAG_DOCUMENT_NAME} from '../../constants'
 import checkTagName from '../../operators/checkTagName'
 import debugThrottle from '../../operators/debugThrottle'
+import type {Asset, HttpError, MyEpic, TagSelectOption, Tag, TagItem} from '../../types'
 import getTagSelectOptions from '../../utils/getTagSelectOptions'
 import {ASSETS_ACTIONS} from '../assets/actions'
 import {DIALOG_ACTIONS} from '../dialog/actions'
@@ -34,15 +35,15 @@ const initialState = {
   fetchCount: -1,
   fetching: false,
   fetchingError: undefined,
-  panelVisible: true
+  panelVisible: true,
 } as TagsReducerState
 
 const tagsSlice = createSlice({
   name: 'tags',
   initialState,
-  extraReducers: builder => {
+  extraReducers: (builder) => {
     builder
-      .addCase(DIALOG_ACTIONS.showTagCreate, state => {
+      .addCase(DIALOG_ACTIONS.showTagCreate, (state) => {
         delete state.creatingError
       })
       .addCase(DIALOG_ACTIONS.showTagEdit, (state, action) => {
@@ -54,19 +55,19 @@ const tagsSlice = createSlice({
           ASSETS_ACTIONS.tagsAddComplete,
           ASSETS_ACTIONS.tagsAddError,
           ASSETS_ACTIONS.tagsRemoveComplete,
-          ASSETS_ACTIONS.tagsRemoveError
+          ASSETS_ACTIONS.tagsRemoveError,
         ),
         (state, action) => {
           const {tag} = action.payload
           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
-        }
+        },
       )
   },
   reducers: {
@@ -80,7 +81,7 @@ const tagsSlice = createSlice({
         _type: 'tag',
         picked: false,
         tag,
-        updating: false
+        updating: false,
       }
     },
     createError(state, action: PayloadAction<{error: HttpError; name: string}>) {
@@ -111,20 +112,20 @@ const tagsSlice = createSlice({
       state.byIds[tagId].picked = false
       state.byIds[tagId].updating = true
 
-      Object.keys(state.byIds).forEach(key => {
+      Object.keys(state.byIds).forEach((key) => {
         delete state.byIds[key].error
       })
     },
     fetchComplete(state, action: PayloadAction<{tags: Tag[]}>) {
       const {tags} = action.payload
 
-      tags?.forEach(tag => {
+      tags?.forEach((tag) => {
         state.allIds.push(tag._id)
         state.byIds[tag._id] = {
           _type: 'tag',
           picked: false,
           tag,
-          updating: false
+          updating: false,
         }
       })
 
@@ -160,7 +161,7 @@ const tagsSlice = createSlice({
           }
         `
         return {payload: {query}}
-      }
+      },
     },
     // Queue batch tag creation
     listenerCreateQueue(_state, _action: PayloadAction<{tag: Tag}>) {
@@ -170,12 +171,12 @@ const tagsSlice = createSlice({
     listenerCreateQueueComplete(state, action: PayloadAction<{tags: Tag[]}>) {
       const {tags} = action.payload
 
-      tags?.forEach(tag => {
+      tags?.forEach((tag) => {
         state.byIds[tag._id] = {
           _type: 'tag',
           picked: false,
           tag,
-          updating: false
+          updating: false,
         }
         if (!state.allIds.includes(tag._id)) {
           state.allIds.push(tag._id)
@@ -190,7 +191,7 @@ const tagsSlice = createSlice({
     listenerDeleteQueueComplete(state, action: PayloadAction<{tagIds: string[]}>) {
       const {tagIds} = action.payload
 
-      tagIds?.forEach(tagId => {
+      tagIds?.forEach((tagId) => {
         const deleteIndex = state.allIds.indexOf(tagId)
         if (deleteIndex >= 0) {
           state.allIds.splice(deleteIndex, 1)
@@ -206,7 +207,7 @@ const tagsSlice = createSlice({
     listenerUpdateQueueComplete(state, action: PayloadAction<{tags: Tag[]}>) {
       const {tags} = action.payload
 
-      tags?.forEach(tag => {
+      tags?.forEach((tag) => {
         if (state.byIds[tag._id]) {
           state.byIds[tag._id].tag = tag
         }
@@ -248,12 +249,12 @@ const tagsSlice = createSlice({
         closeDialogId?: string
         formData: Record<string, any>
         tag: Tag
-      }>
+      }>,
     ) {
       const {tag} = action.payload
       state.byIds[tag?._id].updating = true
-    }
-  }
+    },
+  },
 })
 
 // Epics
@@ -277,24 +278,24 @@ export const tagsCreateEpic: MyEpic = (action$, state$, {client}) =>
             _type: TAG_DOCUMENT_NAME,
             name: {
               _type: 'slug',
-              current: name
-            }
-          })
+              current: name,
+            },
+          }),
         ),
-        mergeMap(result => of(tagsSlice.actions.createComplete({assetId, tag: result as Tag}))),
+        mergeMap((result) => of(tagsSlice.actions.createComplete({assetId, tag: result as Tag}))),
         catchError((error: ClientError) =>
           of(
             tagsSlice.actions.createError({
               error: {
                 message: error?.message || 'Internal error',
-                statusCode: error?.statusCode || 500
+                statusCode: error?.statusCode || 500,
               },
-              name
-            })
-          )
-        )
+              name,
+            }),
+          ),
+        ),
       )
-    })
+    }),
   )
 
 // On tag delete request
@@ -320,23 +321,23 @@ export const tagsDeleteEpic: MyEpic = (action$, state$, {client}) =>
               _rev,
               opt
             }`,
-            {tagName: tag.name.current}
-          )
+            {tagName: tag.name.current},
+          ),
         ),
         // Create transaction which remove tag references from all matched assets and delete tag
-        mergeMap(assets => {
-          const patches = assets.map(asset => ({
+        mergeMap((assets) => {
+          const patches = assets.map((asset) => ({
             id: asset._id,
             patch: {
               // this will cause the transaction to fail if the document has been modified since it was fetched.
               ifRevisionID: asset._rev,
-              unset: [`opt.media.tags[_ref == "${tag._id}"]`]
-            }
+              unset: [`opt.media.tags[_ref == "${tag._id}"]`],
+            },
           }))
 
           const transaction: Transaction = patches.reduce(
             (tx, patch) => tx.patch(patch.id, patch.patch),
-            client.transaction()
+            client.transaction(),
           )
 
           transaction.delete(tag._id)
@@ -350,14 +351,14 @@ export const tagsDeleteEpic: MyEpic = (action$, state$, {client}) =>
             tagsSlice.actions.deleteError({
               error: {
                 message: error?.message || 'Internal error',
-                statusCode: error?.statusCode || 500
+                statusCode: error?.statusCode || 500,
               },
-              tag
-            })
-          )
-        )
+              tag,
+            }),
+          ),
+        ),
       )
-    })
+    }),
   )
 
 // Async fetch tags
@@ -375,10 +376,10 @@ export const tagsFetchEpic: MyEpic = (action$, state$, {client}) =>
         mergeMap(() =>
           client.observable.fetch<{
             items: Tag[]
-          }>(query)
+          }>(query),
         ),
         // Dispatch complete action
-        mergeMap(result => {
+        mergeMap((result) => {
           const {items} = result
           return of(tagsSlice.actions.fetchComplete({tags: items}))
         }),
@@ -387,65 +388,65 @@ export const tagsFetchEpic: MyEpic = (action$, state$, {client}) =>
             tagsSlice.actions.fetchError({
               error: {
                 message: error?.message || 'Internal error',
-                statusCode: error?.statusCode || 500
-              }
-            })
-          )
-        )
+                statusCode: error?.statusCode || 500,
+              },
+            }),
+          ),
+        ),
       )
-    })
+    }),
   )
 
 // TODO: merge all buffer epics
 // Buffer tag creation via sanity subscriber
-export const tagsListenerCreateQueueEpic: MyEpic = action$ =>
+export const tagsListenerCreateQueueEpic: MyEpic = (action$) =>
   action$.pipe(
     filter(tagsSlice.actions.listenerCreateQueue.match),
     bufferTime(2000),
-    filter(actions => actions.length > 0),
-    mergeMap(actions => {
-      const tags = actions?.map(action => action.payload.tag)
+    filter((actions) => actions.length > 0),
+    mergeMap((actions) => {
+      const tags = actions?.map((action) => action.payload.tag)
       return of(tagsSlice.actions.listenerCreateQueueComplete({tags}))
-    })
+    }),
   )
 
 // TODO: merge all buffer epics
 // Buffer tag deletion via sanity subscriber
-export const tagsListenerDeleteQueueEpic: MyEpic = action$ =>
+export const tagsListenerDeleteQueueEpic: MyEpic = (action$) =>
   action$.pipe(
     filter(tagsSlice.actions.listenerDeleteQueue.match),
     bufferTime(2000),
-    filter(actions => actions.length > 0),
-    mergeMap(actions => {
-      const tagIds = actions?.map(action => action.payload.tagId)
+    filter((actions) => actions.length > 0),
+    mergeMap((actions) => {
+      const tagIds = actions?.map((action) => action.payload.tagId)
       return of(tagsSlice.actions.listenerDeleteQueueComplete({tagIds}))
-    })
+    }),
   )
 
 // TODO: merge all buffer epics
 // Buffer tag update via sanity subscriber
-export const tagsListenerUpdateQueueEpic: MyEpic = action$ =>
+export const tagsListenerUpdateQueueEpic: MyEpic = (action$) =>
   action$.pipe(
     filter(tagsSlice.actions.listenerUpdateQueue.match),
     bufferTime(2000),
-    filter(actions => actions.length > 0),
-    mergeMap(actions => {
-      const tags = actions?.map(action => action.payload.tag)
+    filter((actions) => actions.length > 0),
+    mergeMap((actions) => {
+      const tags = actions?.map((action) => action.payload.tag)
       return of(tagsSlice.actions.listenerUpdateQueueComplete({tags}))
-    })
+    }),
   )
 
 // On successful tag creation or updates:
 // - Re-sort all tags
-export const tagsSortEpic: MyEpic = action$ =>
+export const tagsSortEpic: MyEpic = (action$) =>
   action$.pipe(
     ofType(
       tagsSlice.actions.listenerCreateQueueComplete.type,
-      tagsSlice.actions.listenerUpdateQueueComplete.type
+      tagsSlice.actions.listenerUpdateQueueComplete.type,
     ),
     bufferTime(1000),
-    filter(actions => actions.length > 0),
-    mergeMap(() => of(tagsSlice.actions.sort()))
+    filter((actions) => actions.length > 0),
+    mergeMap(() => of(tagsSlice.actions.sort())),
   )
 
 // On tag update request
@@ -471,16 +472,16 @@ export const tagsUpdateEpic: MyEpic = (action$, state$, {client}) =>
               client
                 .patch(tag._id)
                 .set({name: {_type: 'slug', current: formData?.name.current}})
-                .commit()
-            ) as Observable<Tag>
+                .commit(),
+            ) as Observable<Tag>,
         ),
         // Dispatch complete action
         mergeMap((updatedTag: Tag) => {
           return of(
             tagsSlice.actions.updateComplete({
               closeDialogId,
-              tag: updatedTag
-            })
+              tag: updatedTag,
+            }),
           )
         }),
         catchError((error: ClientError) =>
@@ -488,14 +489,14 @@ export const tagsUpdateEpic: MyEpic = (action$, state$, {client}) =>
             tagsSlice.actions.updateError({
               error: {
                 message: error?.message || 'Internal error',
-                statusCode: error?.statusCode || 500
+                statusCode: error?.statusCode || 500,
               },
-              tag
-            })
-          )
-        )
+              tag,
+            }),
+          ),
+        ),
       )
-    })
+    }),
   )
 
 // Selectors
@@ -506,12 +507,12 @@ 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(
   [selectTagsByIds, (_state: RootReducerState, tagId: string) => tagId],
-  (byIds, tagId) => byIds[tagId]
+  (byIds, tagId) => byIds[tagId],
 )
 
 // TODO: use createSelector

package/src/modules/uploads/actions.ts

@@ -6,8 +6,8 @@ export const UPLOADS_ACTIONS = {
     'uploads/uploadComplete',
     function prepare({asset}: {asset: SanityAssetDocument | SanityImageAssetDocument}) {
       return {
-        payload: {asset}
+        payload: {asset},
       }
-    }
-  )
+    },
+  ),
 }

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

@@ -1,15 +1,16 @@
 // @vitest-environment jsdom
 
-import {describe, expect, it, vi, beforeEach, afterEach} from 'vitest'
+import type {SanityImageAssetDocument} from '@sanity/client'
 import {of} from 'rxjs'
-import {uploadsAssetStartEpic, uploadsCheckRequestEpic, uploadsActions} from './index'
+import {describe, expect, it, vi, beforeEach, afterEach} from 'vitest'
+
 import {createEpicTestStore} from '../../__tests__/fixtures/createEpicTestStore'
 import {createMockSanityClient} from '../../__tests__/fixtures/mockSanityClient'
 import {initialState as assetsInitialState} from '../assets'
-import type {SanityImageAssetDocument} from '@sanity/client'
+import {uploadsAssetStartEpic, uploadsCheckRequestEpic, uploadsActions} from './index'
 
 vi.mock('../../utils/generatePreviewBlobUrl', () => ({
-  generatePreviewBlobUrl$: () => of('blob:http://preview')
+  generatePreviewBlobUrl$: () => of('blob:http://preview'),
 }))
 
 const uploadedAsset = {
@@ -22,17 +23,17 @@ const uploadedAsset = {
   originalFilename: 'f.png',
   mimeType: 'image/png',
   size: 10,
-  url: ''
+  url: '',
 } as SanityImageAssetDocument
 
 vi.mock('../../utils/uploadSanityAsset', () => ({
   uploadAsset$: () =>
     of({
       type: 'complete' as const,
-      asset: uploadedAsset
+      asset: uploadedAsset,
     }),
   hashFile$: () => of('deadbeef'),
-  withMaxConcurrency: (fn: unknown) => fn
+  withMaxConcurrency: (fn: unknown) => fn,
 }))
 
 describe('uploadsAssetStartEpic', () => {
@@ -48,7 +49,7 @@ describe('uploadsAssetStartEpic', () => {
       hash: 'deadbeef',
       name: 'f.png',
       size: file.size,
-      status: 'queued' as const
+      status: 'queued' as const,
     }
 
     store.dispatch(uploadsActions.uploadStart({file, uploadItem}))
@@ -75,12 +76,12 @@ describe('uploadsCheckRequestEpic', () => {
   it('after delay, fetches sha hashes and dispatches checkComplete + insertUploads', async () => {
     const client = createMockSanityClient({
       observable: {
-        fetch: vi.fn(() => of(['hh']))
-      }
+        fetch: vi.fn(() => of(['hh'])),
+      },
     })
 
     const store = createEpicTestStore(uploadsCheckRequestEpic, client, {
-      assets: {...assetsInitialState, assetTypes: ['image']}
+      assets: {...assetsInitialState, assetTypes: ['image']},
     })
 
     const asset = {
@@ -93,7 +94,7 @@ describe('uploadsCheckRequestEpic', () => {
       originalFilename: 'f.png',
       mimeType: 'image/png',
       size: 1,
-      url: ''
+      url: '',
     } as SanityImageAssetDocument
 
     store.dispatch(uploadsActions.checkRequest({assets: [asset]}))

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

@@ -1,6 +1,7 @@
 // @vitest-environment node
 
 import {describe, expect, it} from 'vitest'
+
 import type {UploadItem} from '../../types'
 import uploadsReducer, {uploadsActions} from './index'
 
@@ -13,15 +14,15 @@ describe('uploads slice', () => {
       hash: 'abc',
       name: 'x.png',
       size: 1,
-      status: 'queued'
+      status: 'queued',
     } as UploadItem
 
     state = uploadsReducer(
       state,
       uploadsActions.uploadStart({
         file: new File([], 'x.png'),
-        uploadItem
-      })
+        uploadItem,
+      }),
     )
 
     expect(state.allIds).toEqual(['abc'])
@@ -37,19 +38,19 @@ describe('uploads slice', () => {
       name: 'x.png',
       size: 1,
       status: 'queued',
-      percent: 0
+      percent: 0,
     } as UploadItem
 
     state = uploadsReducer(
       state,
-      uploadsActions.uploadStart({file: new File([], 'x.png'), uploadItem})
+      uploadsActions.uploadStart({file: new File([], 'x.png'), uploadItem}),
     )
     state = uploadsReducer(
       state,
       uploadsActions.uploadProgress({
         uploadHash: 'h1',
-        event: {percent: 42, stage: 'upload'} as any
-      })
+        event: {percent: 42, stage: 'upload'} as any,
+      }),
     )
 
     expect(state.byIds.h1.percent).toBe(42)