Merge branch 'corel' of github.com:sanity-io/sanity into corel

Author: jordanl17

packages/sanity/src/core/components/loadingBlock/LoadingBlock.tsx

@@ -121,7 +121,7 @@ const StyledText = styled(Text)`
  */
 export function LoadingBlock({fill, showText, title}: LoadingTestProps) {
   return (
-    <StyledCard $fill={fill} as={fill ? Layer : 'div'}>
+    <StyledCard $fill={fill} as={fill ? Layer : 'div'} data-testid="loading-block">
       <StyledSpinner $animatePosition={!!showText} muted />
       {showText && <LoadingText title={title} />}
     </StyledCard>

packages/sanity/src/core/releases/tool/components/ReleaseMenuButton/__tests__/ReleaseMenuButton.test.tsx

@@ -14,6 +14,7 @@ import {useReleaseOperations} from '../../../../store/useReleaseOperations'
 import {
   mockUseBundleDocuments,
   useBundleDocumentsMockReturn,
+  useBundleDocumentsMockReturnWithResults,
 } from '../../../detail/__tests__/__mocks__/useBundleDocuments.mock'
 import {ReleaseMenuButton, type ReleaseMenuButtonProps} from '../ReleaseMenuButton'
 
@@ -22,7 +23,7 @@ vi.mock('../../../../store/useReleaseOperations', () => ({
 }))
 
 vi.mock('../../../detail/useBundleDocuments', () => ({
-  useBundleDocuments: vi.fn(() => useBundleDocumentsMockReturn),
+  useBundleDocuments: vi.fn(() => useBundleDocumentsMockReturnWithResults),
 }))
 
 vi.mock('sanity/router', async (importOriginal) => ({
@@ -63,10 +64,7 @@ describe('ReleaseMenuButton', () => {
     }
 
     test('does not require confirmation when no documents in release', async () => {
-      mockUseBundleDocuments.mockReturnValue({
-        ...useBundleDocumentsMockReturn,
-        results: [],
-      })
+      mockUseBundleDocuments.mockReturnValue(useBundleDocumentsMockReturn)
 
       await renderTest({release: activeScheduledRelease})
 

packages/sanity/src/core/releases/tool/detail/ReleaseDashboardHeader.tsx

@@ -56,6 +56,7 @@ export function ReleaseDashboardHeader(props: {
             text={t('overview.title')}
             textWeight="regular"
             padding={2}
+            data-testid="back-to-releases-button"
           />
           <Button
             mode="bleed"

packages/sanity/src/core/releases/tool/detail/ReleaseDetail.tsx

@@ -5,7 +5,7 @@ import {type RouterContextValue, useRouter} from 'sanity/router'
 import {LoadingBlock} from '../../../components'
 import {useTranslation} from '../../../i18n'
 import {releasesLocaleNamespace} from '../../i18n'
-import {useReleases} from '../../store'
+import {useReleases} from '../../store/useReleases'
 import {type ReleasesRouterState} from '../../types/router'
 import {getBundleIdFromReleaseDocumentId} from '../../util/getBundleIdFromReleaseDocumentId'
 import {useReleaseHistory} from './documentTable/useReleaseHistory'

packages/sanity/src/core/releases/tool/detail/ReleaseTypePicker.tsx

@@ -3,25 +3,21 @@ import {Flex, Spinner, Stack, TabList, Text, useClickOutsideEvent} from '@sanity
 import {format, isBefore, isValid} from 'date-fns'
 import {isEqual} from 'lodash'
 import {useCallback, useEffect, useMemo, useRef, useState} from 'react'
-import {
-  getPublishDateFromRelease,
-  isReleaseScheduledOrScheduling,
-  type ReleaseDocument,
-  useTranslation,
-} from 'sanity'
 
 import {Button, Popover, Tab} from '../../../../ui-components'
 import {MONTH_PICKER_VARIANT} from '../../../../ui-components/inputs/DateInputs/calendar/Calendar'
 import {type CalendarLabels} from '../../../../ui-components/inputs/DateInputs/calendar/types'
 import {DatePicker} from '../../../../ui-components/inputs/DateInputs/DatePicker'
 import {LazyTextInput} from '../../../../ui-components/inputs/DateInputs/LazyTextInput'
 import {getCalendarLabels} from '../../../form/inputs/DateInputs/utils'
+import {useTranslation} from '../../../i18n/hooks/useTranslation'
 import useTimeZone from '../../../scheduledPublishing/hooks/useTimeZone'
 import {ReleaseAvatar} from '../../components/ReleaseAvatar'
 import {releasesLocaleNamespace} from '../../i18n'
-import {type ReleaseType} from '../../store'
+import {type ReleaseDocument, type ReleaseType} from '../../store'
 import {useReleaseOperations} from '../../store/useReleaseOperations'
 import {getReleaseTone} from '../../util/getReleaseTone'
+import {getPublishDateFromRelease, isReleaseScheduledOrScheduling} from '../../util/util'
 
 export function ReleaseTypePicker(props: {release: ReleaseDocument}): JSX.Element {
   const {release} = props