From 6e7407f4e2a958bfca784fb7f930ea7a10d43736 Mon Sep 17 00:00:00 2001
From: pedrobonamin <pedrobonamin@gmail.com>
Date: Tue, 5 Nov 2024 11:52:52 +0100
Subject: [PATCH 1/3] fix(core): update getPublishDateFromRelease, add
 ScheduledRelease type

---
 packages/sanity/src/core/index.ts             |  1 +
 .../navbar/GlobalPerspectiveMenuItem.tsx      |  4 ++--
 .../sanity/src/core/releases/store/types.ts   | 11 ++++++++++
 .../overview/ReleasesOverviewColumnDefs.tsx   | 16 +++++++++------
 .../sanity/src/core/releases/util/util.ts     | 20 ++-----------------
 .../banners/AddToReleaseBanner.tsx            |  8 +++-----
 6 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/packages/sanity/src/core/index.ts b/packages/sanity/src/core/index.ts
index 74803b6ada0..7e24853d8d0 100644
--- a/packages/sanity/src/core/index.ts
+++ b/packages/sanity/src/core/index.ts
@@ -37,6 +37,7 @@ export {
   isDraftPerspective,
   isPublishedPerspective,
   isReleaseDocument,
+  isScheduledRelease,
   LATEST,
   ReleaseAvatar,
   ReleaseBadge,
diff --git a/packages/sanity/src/core/releases/navbar/GlobalPerspectiveMenuItem.tsx b/packages/sanity/src/core/releases/navbar/GlobalPerspectiveMenuItem.tsx
index 32e17b18183..7dce8865f28 100644
--- a/packages/sanity/src/core/releases/navbar/GlobalPerspectiveMenuItem.tsx
+++ b/packages/sanity/src/core/releases/navbar/GlobalPerspectiveMenuItem.tsx
@@ -9,7 +9,7 @@ import {Tooltip} from '../../../ui-components/tooltip'
 import {useTranslation} from '../../i18n/hooks/useTranslation'
 import {ReleaseAvatar} from '../components/ReleaseAvatar'
 import {usePerspective} from '../hooks/usePerspective'
-import {type ReleaseDocument} from '../store/types'
+import {isScheduledRelease, type ReleaseDocument} from '../store/types'
 import {getBundleIdFromReleaseDocumentId} from '../util/getBundleIdFromReleaseDocumentId'
 import {getReleaseTone} from '../util/getReleaseTone'
 import {getPublishDateFromRelease, isPublishedPerspective} from '../util/util'
@@ -170,7 +170,7 @@ export const GlobalPerspectiveMenuItem = forwardRef<
             </Text>
             {!isPublishedPerspective(release) &&
               release.metadata.releaseType !== 'undecided' &&
-              (release.publishAt || release.metadata.intendedPublishAt) && (
+              isScheduledRelease(release) && (
                 <Text muted size={1}>
                   {formatRelative(getPublishDateFromRelease(release), new Date())}
                 </Text>
diff --git a/packages/sanity/src/core/releases/store/types.ts b/packages/sanity/src/core/releases/store/types.ts
index 0043e9a6126..13656519190 100644
--- a/packages/sanity/src/core/releases/store/types.ts
+++ b/packages/sanity/src/core/releases/store/types.ts
@@ -35,6 +35,17 @@ export interface ReleaseSystemDocument {
 /**
  * @internal
  */
+
+export interface ScheduledRelease extends ReleaseDocument {
+  publishAt?: string
+  metadata: ReleaseDocument['metadata'] & {
+    intendedPublishAt: string
+    releaseType: 'scheduled'
+  }
+}
+export const isScheduledRelease = (release: ReleaseDocument): release is ScheduledRelease =>
+  release.metadata.releaseType === 'scheduled' && 'intendedPublishAt' in release.metadata
+
 export interface ReleaseDocument {
   /**
    * typically
diff --git a/packages/sanity/src/core/releases/tool/overview/ReleasesOverviewColumnDefs.tsx b/packages/sanity/src/core/releases/tool/overview/ReleasesOverviewColumnDefs.tsx
index 9916243629c..556917b43c2 100644
--- a/packages/sanity/src/core/releases/tool/overview/ReleasesOverviewColumnDefs.tsx
+++ b/packages/sanity/src/core/releases/tool/overview/ReleasesOverviewColumnDefs.tsx
@@ -11,9 +11,10 @@ import {Translate, useTranslation} from '../../../i18n'
 import {ReleaseAvatar} from '../../components/ReleaseAvatar'
 import {usePerspective} from '../../hooks/usePerspective'
 import {releasesLocaleNamespace} from '../../i18n'
+import {isScheduledRelease} from '../../store/types'
 import {getBundleIdFromReleaseDocumentId} from '../../util/getBundleIdFromReleaseDocumentId'
 import {getReleaseTone} from '../../util/getReleaseTone'
-import {getReleasePublishDate} from '../../util/util'
+import {getPublishDateFromRelease} from '../../util/util'
 import {type TableRowProps} from '../components/Table/Table'
 import {Headers} from '../components/Table/TableHeader'
 import {type Column} from '../components/Table/types'
@@ -32,7 +33,7 @@ const ReleaseTime = ({release}: {release: TableRelease}) => {
       return t('release.type.undecided')
     }
 
-    const publishDate = getReleasePublishDate(release)
+    const publishDate = isScheduledRelease(release) ? getPublishDateFromRelease(release) : undefined
 
     return publishDate ? format(new Date(publishDate), 'PPpp') : null
   }
@@ -137,11 +138,14 @@ export const releasesOverviewColumnDefs: (
     {
       id: 'publishAt',
       sorting: true,
-      sortTransform: ({metadata, publishAt}) => {
-        if (metadata.releaseType === 'undecided') return Infinity
+      sortTransform: (release) => {
+        if (release.metadata.releaseType === 'undecided') return Infinity
 
-        const publishDate = getReleasePublishDate({metadata, publishAt})
-        if (metadata.releaseType === 'asap' || !publishDate) return 0
+        const publishDate = isScheduledRelease(release)
+          ? getPublishDateFromRelease(release)
+          : undefined
+
+        if (release.metadata.releaseType === 'asap' || !publishDate) return 0
         return new Date(publishDate).getTime()
       },
       width: 250,
diff --git a/packages/sanity/src/core/releases/util/util.ts b/packages/sanity/src/core/releases/util/util.ts
index 40949cedfbf..9dfc2680af4 100644
--- a/packages/sanity/src/core/releases/util/util.ts
+++ b/packages/sanity/src/core/releases/util/util.ts
@@ -7,7 +7,7 @@ import {
 } from '../../util'
 import {type CurrentPerspective} from '../hooks/usePerspective'
 import {type VersionOriginTypes} from '../index'
-import {type ReleaseDocument} from '../store/types'
+import {type ReleaseDocument, type ScheduledRelease} from '../store/types'
 import {LATEST} from './const'
 
 /**
@@ -64,28 +64,12 @@ export function getCreateVersionOrigin(documentId: string): VersionOriginTypes {
 }
 
 /** @internal */
-export function getPublishDateFromRelease(release: ReleaseDocument): Date {
+export function getPublishDateFromRelease(release: ScheduledRelease): Date {
   const dateString = release.publishAt || release.metadata.intendedPublishAt
-  if (!dateString) {
-    console.error('No publish date found on release', release)
-    return new Date()
-  }
 
   return new Date(dateString)
 }
 
-/** @internal */
-export function getReleasePublishDate(
-  release: Pick<ReleaseDocument, 'publishAt'> & {
-    metadata: Pick<ReleaseDocument['metadata'], 'intendedPublishAt'>
-  },
-): Date | null {
-  const publishDate = release.metadata.intendedPublishAt || release.publishAt
-
-  if (!publishDate) return null
-  return new Date(publishDate)
-}
-
 /** @internal */
 export function isPublishedPerspective(bundle: CurrentPerspective | string): bundle is 'published' {
   return bundle === 'published'
diff --git a/packages/sanity/src/structure/panes/document/documentPanel/banners/AddToReleaseBanner.tsx b/packages/sanity/src/structure/panes/document/documentPanel/banners/AddToReleaseBanner.tsx
index 3a2453919ce..162ae837faa 100644
--- a/packages/sanity/src/structure/panes/document/documentPanel/banners/AddToReleaseBanner.tsx
+++ b/packages/sanity/src/structure/panes/document/documentPanel/banners/AddToReleaseBanner.tsx
@@ -6,6 +6,7 @@ import {
   getBundleIdFromReleaseDocumentId,
   getPublishDateFromRelease,
   getReleaseTone,
+  isScheduledRelease,
   LATEST,
   type ReleaseDocument,
   Translate,
@@ -30,9 +31,6 @@ export function AddToReleaseBanner({
 
   const {createVersion} = useVersionOperations()
 
-  const isScheduled =
-    currentRelease?.state === 'scheduled' || currentRelease?.state === 'scheduling'
-
   const handleAddToRelease = useCallback(async () => {
     if (currentRelease._id) {
       await createVersion(getBundleIdFromReleaseDocumentId(currentRelease._id), documentId)
@@ -46,7 +44,7 @@ export function AddToReleaseBanner({
       content={
         <Flex align="center" justify="space-between" gap={1} flex={1}>
           <Text size={1}>
-            {isScheduled ? (
+            {isScheduledRelease(currentRelease) ? (
               <Flex align="center" justify="center" gap={2}>
                 <LockIcon />{' '}
                 <Translate
@@ -89,7 +87,7 @@ export function AddToReleaseBanner({
             )}
           </Text>
 
-          {!isScheduled && (
+          {!isScheduledRelease(currentRelease) && (
             <Button
               text={t('banners.release.action.add-to-release')}
               tone={tone}

From e8f72e2f303d8c167a80cec12a44e032c00600c3 Mon Sep 17 00:00:00 2001
From: pedrobonamin <pedrobonamin@gmail.com>
Date: Tue, 5 Nov 2024 12:00:47 +0100
Subject: [PATCH 2/3] fix(core): update release telemetry event

---
 .../src/core/releases/__telemetry__/releases.telemetry.ts     | 2 +-
 .../ReleasePublishAllButton/ReleaseScheduleButton.tsx         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/sanity/src/core/releases/__telemetry__/releases.telemetry.ts b/packages/sanity/src/core/releases/__telemetry__/releases.telemetry.ts
index 5abdf62f2e0..4897e69a5ba 100644
--- a/packages/sanity/src/core/releases/__telemetry__/releases.telemetry.ts
+++ b/packages/sanity/src/core/releases/__telemetry__/releases.telemetry.ts
@@ -69,7 +69,7 @@ export const PublishedRelease = defineEvent({
 /** When a release is successfully scheduled
  * @internal
  */
-export const ScheduledRelease = defineEvent({
+export const ReleaseScheduledEvent = defineEvent({
   name: 'Schedule release',
   version: 1,
   description: 'User scheduled a release',
diff --git a/packages/sanity/src/core/releases/tool/components/ReleasePublishAllButton/ReleaseScheduleButton.tsx b/packages/sanity/src/core/releases/tool/components/ReleasePublishAllButton/ReleaseScheduleButton.tsx
index 22d415f54eb..f07e475db17 100644
--- a/packages/sanity/src/core/releases/tool/components/ReleasePublishAllButton/ReleaseScheduleButton.tsx
+++ b/packages/sanity/src/core/releases/tool/components/ReleasePublishAllButton/ReleaseScheduleButton.tsx
@@ -11,7 +11,7 @@ import {DateTimeInput} from '../../../../../ui-components/inputs/DateInputs/Date
 import {ToneIcon} from '../../../../../ui-components/toneIcon/ToneIcon'
 import {getCalendarLabels} from '../../../../form/inputs/DateInputs/utils'
 import {Translate, useTranslation} from '../../../../i18n'
-import {ScheduledRelease} from '../../../__telemetry__/releases.telemetry'
+import {ReleaseScheduledEvent} from '../../../__telemetry__/releases.telemetry'
 import {releasesLocaleNamespace} from '../../../i18n'
 import {type ReleaseDocument} from '../../../index'
 import {useReleaseOperations} from '../../../store/useReleaseOperations'
@@ -45,7 +45,7 @@ export const ReleaseScheduleButton = ({
     try {
       setStatus('scheduling')
       await schedule(release._id, publishAt)
-      telemetry.log(ScheduledRelease)
+      telemetry.log(ReleaseScheduledEvent)
       toast.push({
         closable: true,
         status: 'success',

From a1a7b98b114326c23895941ef5cbc3e22d7e586d Mon Sep 17 00:00:00 2001
From: pedrobonamin <pedrobonamin@gmail.com>
Date: Tue, 5 Nov 2024 12:08:41 +0100
Subject: [PATCH 3/3] fix(core): add release tags to releases

---
 packages/sanity/src/core/releases/store/types.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/sanity/src/core/releases/store/types.ts b/packages/sanity/src/core/releases/store/types.ts
index 13656519190..ccc536cb9dd 100644
--- a/packages/sanity/src/core/releases/store/types.ts
+++ b/packages/sanity/src/core/releases/store/types.ts
@@ -32,10 +32,10 @@ export interface ReleaseSystemDocument {
   state: ReleaseState
   publishAt?: string
 }
+
 /**
  * @internal
  */
-
 export interface ScheduledRelease extends ReleaseDocument {
   publishAt?: string
   metadata: ReleaseDocument['metadata'] & {
@@ -43,9 +43,15 @@ export interface ScheduledRelease extends ReleaseDocument {
     releaseType: 'scheduled'
   }
 }
+/**
+ * @internal
+ */
 export const isScheduledRelease = (release: ReleaseDocument): release is ScheduledRelease =>
   release.metadata.releaseType === 'scheduled' && 'intendedPublishAt' in release.metadata
 
+/**
+ * @internal
+ */
 export interface ReleaseDocument {
   /**
    * typically