fix: version operations error toast (#8920)

Author: jordanl17

packages/sanity/src/core/releases/components/dialog/DiscardVersionDialog.tsx

@@ -1,4 +1,4 @@
-import {Box, Stack, Text} from '@sanity/ui'
+import {Box, Stack, Text, useToast} from '@sanity/ui'
 import {useCallback, useState} from 'react'
 
 import {Dialog} from '../../../../ui-components'
@@ -23,10 +23,12 @@ export function DiscardVersionDialog(props: {
 }): React.JSX.Element {
   const {onClose, documentId, documentType} = props
   const {t} = useTranslation(releasesLocaleNamespace)
+  const {t: coreT} = useTranslation()
   const {discardChanges} = useDocumentOperation(getPublishedId(documentId), documentType)
   const {selectedPerspective} = usePerspective()
   const {discardVersion} = useVersionOperations()
   const schema = useSchema()
+  const toast = useToast()
   const [isDiscarding, setIsDiscarding] = useState(false)
 
   const schemaType = schema.get(documentType)
@@ -35,11 +37,20 @@ export function DiscardVersionDialog(props: {
     setIsDiscarding(true)
 
     if (isVersionId(documentId)) {
-      await discardVersion(
-        getVersionFromId(documentId) ||
-          getReleaseIdFromReleaseDocumentId((selectedPerspective as ReleaseDocument)._id),
-        documentId,
-      )
+      try {
+        await discardVersion(
+          getVersionFromId(documentId) ||
+            getReleaseIdFromReleaseDocumentId((selectedPerspective as ReleaseDocument)._id),
+          documentId,
+        )
+      } catch (err) {
+        toast.push({
+          closable: true,
+          status: 'error',
+          title: coreT('release.action.discard-version.failure'),
+          description: err.message,
+        })
+      }
     } else {
       // on the document header you can also discard the draft
       discardChanges.execute()
@@ -48,7 +59,7 @@ export function DiscardVersionDialog(props: {
     setIsDiscarding(false)
 
     onClose()
-  }, [documentId, onClose, discardVersion, selectedPerspective, discardChanges])
+  }, [documentId, onClose, discardVersion, selectedPerspective, toast, coreT, discardChanges])
 
   return (
     <Dialog

packages/sanity/src/core/releases/components/dialog/UnpublishVersionDialog.tsx

@@ -48,19 +48,29 @@ export function UnpublishVersionDialog(props: {
   const handleUnpublish = useCallback(async () => {
     setIsUnpublishing(true)
 
-    await unpublishVersion(documentVersionId)
+    try {
+      await unpublishVersion(documentVersionId)
+      toast.push({
+        closable: true,
+        status: 'success',
+        description: (
+          <Translate
+            t={coreT}
+            i18nKey={'release.action.unpublish-version.success'}
+            values={{title: preview?.value?.title || documentVersionId}}
+          />
+        ),
+      })
+    } catch (err) {
+      toast.push({
+        closable: true,
+        status: 'error',
+        title: coreT('release.action.unpublish-version.failure'),
+        description: err.message,
+      })
+    }
+
     setIsUnpublishing(false)
-    toast.push({
-      closable: true,
-      status: 'success',
-      description: (
-        <Translate
-          t={coreT}
-          i18nKey={'release.action.unpublish-version.success'}
-          values={{title: preview?.value?.title || documentVersionId}}
-        />
-      ),
-    })
 
     onClose()
   }, [coreT, documentVersionId, onClose, preview?.value?.title, toast, unpublishVersion])

packages/sanity/src/core/releases/components/documentHeader/VersionChip.tsx

@@ -7,6 +7,7 @@ import {
   Text,
   useClickOutsideEvent,
   useGlobalKeyDown,
+  useToast,
 } from '@sanity/ui'
 // eslint-disable-next-line camelcase
 import {
@@ -22,6 +23,7 @@ import {
 import {css, styled} from 'styled-components'
 
 import {Popover, Tooltip} from '../../../../ui-components'
+import {useTranslation} from '../../../i18n/hooks/useTranslation'
 import {getVersionId} from '../../../util/draftUtils'
 import {useReleasesUpsell} from '../../contexts/upsell/useReleasesUpsell'
 import {useVersionOperations} from '../../hooks/useVersionOperations'
@@ -121,6 +123,8 @@ export const VersionChip = memo(function VersionChip(props: {
   const docId = isVersion ? getVersionId(documentId, fromRelease) : documentId // operations recognises publish and draft as empty
 
   const {createVersion} = useVersionOperations()
+  const toast = useToast()
+  const {t} = useTranslation()
 
   const close = useCallback(() => setContextMenuPoint(undefined), [])
 
@@ -161,10 +165,20 @@ export const VersionChip = memo(function VersionChip(props: {
 
   const handleAddVersion = useCallback(
     async (targetRelease: string) => {
-      await createVersion(getReleaseIdFromReleaseDocumentId(targetRelease), docId)
+      try {
+        await createVersion(getReleaseIdFromReleaseDocumentId(targetRelease), docId)
+      } catch (err) {
+        toast.push({
+          closable: true,
+          status: 'error',
+          title: t('release.action.create-version.failure'),
+          description: err.message,
+        })
+      }
+
       close()
     },
-    [createVersion, docId, close],
+    [close, createVersion, docId, t, toast],
   )
 
   const referenceElement = useMemo(() => {

packages/sanity/src/core/releases/hooks/useVersionOperations.tsx

@@ -1,7 +1,5 @@
 import {useTelemetry} from '@sanity/telemetry/react'
-import {useToast} from '@sanity/ui'
 
-import {useTranslation} from '../../i18n'
 import {type ReleaseId} from '../../perspective/types'
 import {useSetPerspective} from '../../perspective/useSetPerspective'
 import {getDocumentVariantType} from '../../util/getDocumentVariantType'
@@ -25,56 +23,24 @@ export function useVersionOperations(): VersionOperationsValue {
 
   const setPerspective = useSetPerspective()
 
-  const toast = useToast()
-  const {t} = useTranslation()
-
   const handleCreateVersion = async (
     releaseId: ReleaseId,
     documentId: string,
     initialValue?: Record<string, unknown>,
   ) => {
     const origin = getDocumentVariantType(documentId)
-    try {
-      await createVersion(releaseId, documentId, initialValue)
-      setPerspective(releaseId)
-      telemetry.log(AddedVersion, {
-        documentOrigin: origin,
-      })
-    } catch (err) {
-      toast.push({
-        closable: true,
-        status: 'error',
-        title: t('release.action.create-version.failure'),
-        description: err.message,
-      })
-    }
+    await createVersion(releaseId, documentId, initialValue)
+    setPerspective(releaseId)
+    telemetry.log(AddedVersion, {
+      documentOrigin: origin,
+    })
   }
 
-  const handleDiscardVersion = async (releaseId: string, documentId: string) => {
-    try {
-      await discardVersion(releaseId, documentId)
-    } catch (err) {
-      toast.push({
-        closable: true,
-        status: 'error',
-        title: t('release.action.discard-version.failure'),
-        description: err.message,
-      })
-    }
-  }
+  const handleDiscardVersion = async (releaseId: string, documentId: string) =>
+    discardVersion(releaseId, documentId)
+
+  const handleUnpublishVersion = async (documentId: string) => unpublishVersion(documentId)
 
-  const handleUnpublishVersion = async (documentId: string) => {
-    try {
-      await unpublishVersion(documentId)
-    } catch (err) {
-      toast.push({
-        closable: true,
-        status: 'error',
-        title: t('release.action.unpublish-version.failure'),
-        description: err.message,
-      })
-    }
-  }
   return {
     createVersion: handleCreateVersion,
     discardVersion: handleDiscardVersion,