From a52362163c2bf71eb35b192f8a3fa3a61f3a9665 Mon Sep 17 00:00:00 2001 From: Ash Date: Thu, 24 Oct 2024 16:44:44 +0100 Subject: [PATCH] fix(sanity): omit `RELEASE_DOCUMENTS_PATH` prefix --- packages/sanity/src/core/store/release/reducer.ts | 4 ++-- .../searchResults/item/SearchResultItemPreview.tsx | 6 +++--- .../src/structure/components/paneItem/PaneItemPreview.tsx | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/sanity/src/core/store/release/reducer.ts b/packages/sanity/src/core/store/release/reducer.ts index 68638438f9f..ffeb2bfdfa0 100644 --- a/packages/sanity/src/core/store/release/reducer.ts +++ b/packages/sanity/src/core/store/release/reducer.ts @@ -1,4 +1,4 @@ -import {DRAFTS_FOLDER, resolveBundlePerspective} from 'sanity' +import {DRAFTS_FOLDER, getBundleIdFromReleaseId, resolveBundlePerspective} from 'sanity' import {type ReleaseDocument} from './types' @@ -165,7 +165,7 @@ function getReleaseStack({ const stack = [...releases.values()] .toSorted(sortReleases(resolveBundlePerspective(perspective))) - .map(({_id}) => _id) + .map(({_id}) => getBundleIdFromReleaseId(_id)) .concat(DRAFTS_FOLDER) return stack diff --git a/packages/sanity/src/core/studio/components/navbar/search/components/searchResults/item/SearchResultItemPreview.tsx b/packages/sanity/src/core/studio/components/navbar/search/components/searchResults/item/SearchResultItemPreview.tsx index cc1a3a57d81..2eb09d08e8d 100644 --- a/packages/sanity/src/core/studio/components/navbar/search/components/searchResults/item/SearchResultItemPreview.tsx +++ b/packages/sanity/src/core/studio/components/navbar/search/components/searchResults/item/SearchResultItemPreview.tsx @@ -3,7 +3,7 @@ import {type SchemaType} from '@sanity/types' import {Badge, Box, Flex} from '@sanity/ui' import {useMemo} from 'react' import {useObservable} from 'react-rx' -import {getPublishedId} from 'sanity' +import {getBundleIdFromReleaseId, getPublishedId} from 'sanity' import {styled} from 'styled-components' import {type GeneralPreviewLayoutKey} from '../../../../../../../components' @@ -17,8 +17,8 @@ import { } from '../../../../../../../preview' import { type DocumentPresence, - useReleases, useDocumentPreviewStore, + useReleases, } from '../../../../../../../store' interface SearchResultItemPreviewProps { @@ -59,7 +59,7 @@ export function SearchResultItemPreview({ const observable = useMemo( () => getPreviewStateObservable(documentPreviewStore, schemaType, getPublishedId(documentId), '', { - bundleIds: (releases.data ?? []).map((release) => release._id), + bundleIds: (releases.data ?? []).map((release) => getBundleIdFromReleaseId(release._id)), bundleStack: releases.stack, }), [releases.data, releases.stack, documentId, documentPreviewStore, schemaType], diff --git a/packages/sanity/src/structure/components/paneItem/PaneItemPreview.tsx b/packages/sanity/src/structure/components/paneItem/PaneItemPreview.tsx index b7036794dff..063a71ea7b8 100644 --- a/packages/sanity/src/structure/components/paneItem/PaneItemPreview.tsx +++ b/packages/sanity/src/structure/components/paneItem/PaneItemPreview.tsx @@ -10,6 +10,7 @@ import { DocumentStatus, DocumentStatusIndicator, type GeneralPreviewLayoutKey, + getBundleIdFromReleaseId, getPreviewStateObservable, getPreviewValueWithFallback, isRecord, @@ -50,7 +51,7 @@ export function PaneItemPreview(props: PaneItemPreviewProps) { const previewStateObservable = useMemo( () => getPreviewStateObservable(props.documentPreviewStore, schemaType, value._id, title, { - bundleIds: (releases.data ?? []).map((release) => release._id), + bundleIds: (releases.data ?? []).map((release) => getBundleIdFromReleaseId(release._id)), bundleStack: releases.stack, }), [props.documentPreviewStore, schemaType, value._id, title, releases.data, releases.stack],