fix: prevent TypeError when deleting assets in table view

sanity-io · Jul 23, 2023 · a86764c · a86764c
1 parent b7b08f3
commit a86764c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/components/DialogAssetEdit/index.tsx b/src/components/DialogAssetEdit/index.tsx
@@ -47,7 +47,7 @@ const DialogAssetEdit = (props: Props) => {
   const assetItem = useTypedSelector(state => selectAssetById(state, String(assetId))) // TODO: check casting
   const tags = useTypedSelector(selectTags)
 
-  const assetUpdatedPrev = useRef<string | null>(null)
+  const assetUpdatedPrev = useRef<string | undefined>(undefined)
 
   // Generate a snapshot of the current asset
   const [assetSnapshot, setAssetSnapshot] = useState(assetItem?.asset)
@@ -222,7 +222,7 @@ const DialogAssetEdit = (props: Props) => {
         <FormSubmitButton
           disabled={formUpdating || !isDirty || !isValid}
           isValid={isValid}
-          lastUpdated={currentAsset._updatedAt}
+          lastUpdated={currentAsset?._updatedAt}
           onClick={handleSubmit(onSubmit)}
         />
       </Flex>
@@ -242,7 +242,7 @@ const DialogAssetEdit = (props: Props) => {
       */}
       <Flex direction={['column-reverse', 'column-reverse', 'row-reverse']}>
         <Box flex={1} marginTop={[5, 5, 0]} padding={4}>
-          <WithReferringDocuments documentStore={documentStore} id={assetItem.asset._id}>
+          <WithReferringDocuments documentStore={documentStore} id={currentAsset._id}>
             {({isLoading, referringDocuments}) => {
               const uniqueReferringDocuments = getUniqueDocuments(referringDocuments)
               return (

diff --git a/src/components/TableRowAsset/index.tsx b/src/components/TableRowAsset/index.tsx
@@ -100,6 +100,7 @@ const TableRowAsset = (props: Props) => {
     (e: MouseEvent<HTMLDivElement>) => {
       e.stopPropagation()
 
+      if (!asset) return
       if (onSelect) {
         dispatch(dialogActions.showAssetEdit({assetId: asset._id}))
       } else if (shiftPressed.current && !picked) {
@@ -108,13 +109,14 @@ const TableRowAsset = (props: Props) => {
         dispatch(assetsActions.pick({assetId: asset._id, picked: !picked}))
       }
     },
-    [asset._id, dispatch, lastPicked, onSelect, picked, shiftPressed]
+    [asset, dispatch, lastPicked, onSelect, picked, shiftPressed]
   )
 
   const handleClick = useCallback(
     (e: MouseEvent<HTMLDivElement>) => {
       e.stopPropagation()
 
+      if (!asset) return
       if (onSelect) {
         onSelect([{kind: 'assetDocumentId', value: asset._id}])
       } else if (shiftPressed.current) {
@@ -127,7 +129,7 @@ const TableRowAsset = (props: Props) => {
         dispatch(dialogActions.showAssetEdit({assetId: asset._id}))
       }
     },
-    [asset._id, dispatch, lastPicked, onSelect, picked, shiftPressed]
+    [asset, dispatch, lastPicked, onSelect, picked, shiftPressed]
   )
 
   const opacityCell = updating ? 0.5 : 1

diff --git a/src/modules/assets/index.ts b/src/modules/assets/index.ts
@@ -791,7 +791,10 @@ export const selectAssetById = createSelector(
     (state: RootReducerState) => state.assets.byIds,
     (_state: RootReducerState, assetId: string) => assetId
   ],
-  (byIds, assetId) => byIds[assetId]
+  (byIds, assetId) => {
+    const asset = byIds[assetId]
+    return asset ? asset : undefined
+  }
 )
 
 export const selectAssets: Selector<RootReducerState, AssetItem[]> = createSelector(