diff --git a/packages/next/src/views/API/index.client.tsx b/packages/next/src/views/API/index.client.tsx index 8fa450384..e88dcd437 100644 --- a/packages/next/src/views/API/index.client.tsx +++ b/packages/next/src/views/API/index.client.tsx @@ -54,8 +54,6 @@ export const APIViewClient: React.FC = () => { localization && localization.locales.map((locale) => ({ label: locale.label, value: locale.code })) - const isEditing = Boolean(globalSlug || (collectionSlug && !!id)) - let draftsEnabled: boolean = false let docEndpoint: string = '' @@ -122,7 +120,6 @@ export const APIViewClient: React.FC = () => { globalLabel={globalConfig?.label} globalSlug={globalSlug} id={id} - isEditing={isEditing} pluralLabel={collectionConfig ? collectionConfig?.labels?.plural : undefined} useAsTitle={collectionConfig ? collectionConfig?.admin?.useAsTitle : undefined} view="API" diff --git a/packages/next/src/views/Document/index.tsx b/packages/next/src/views/Document/index.tsx index fab24bc79..efcaa34cf 100644 --- a/packages/next/src/views/Document/index.tsx +++ b/packages/next/src/views/Document/index.tsx @@ -198,6 +198,7 @@ export const Document: React.FC = async ({ id={id} initialData={data} initialState={initialState} + isEditing={isEditing} title={formatTitle({ collectionConfig, dateFormat: config.admin.dateFormat, diff --git a/packages/next/src/views/Edit/Default/SetStepNav/index.tsx b/packages/next/src/views/Edit/Default/SetStepNav/index.tsx index 99e3d0e3c..0689f0ce9 100644 --- a/packages/next/src/views/Edit/Default/SetStepNav/index.tsx +++ b/packages/next/src/views/Edit/Default/SetStepNav/index.tsx @@ -17,16 +17,15 @@ export const SetStepNav: React.FC<{ globalLabel?: SanitizedGlobalConfig['label'] globalSlug?: SanitizedGlobalConfig['slug'] id?: number | string - isEditing?: boolean pluralLabel?: SanitizedCollectionConfig['labels']['plural'] useAsTitle?: SanitizedCollectionConfig['admin']['useAsTitle'] view?: string }> = (props) => { - const { id, collectionSlug, globalSlug, isEditing = true, pluralLabel, useAsTitle } = props + const { id, collectionSlug, globalSlug, pluralLabel, useAsTitle } = props const view: string | undefined = props?.view || undefined - const { title } = useDocumentInfo() + const { isEditing, title } = useDocumentInfo() const { setStepNav } = useStepNav() diff --git a/packages/next/src/views/Edit/Default/index.tsx b/packages/next/src/views/Edit/Default/index.tsx index 2a9c3d14b..35c0f2429 100644 --- a/packages/next/src/views/Edit/Default/index.tsx +++ b/packages/next/src/views/Edit/Default/index.tsx @@ -92,7 +92,7 @@ export const DefaultEditView: React.FC = () => { async (json) => { reportUpdate({ id, - entitySlug: entitySlug, + entitySlug, updatedAt: json?.result?.updatedAt || new Date().toISOString(), }) @@ -165,7 +165,6 @@ export const DefaultEditView: React.FC = () => { collectionSlug={collectionConfig?.slug} globalSlug={globalConfig?.slug} id={id} - isEditing={Boolean(id)} pluralLabel={collectionConfig?.labels?.plural} useAsTitle={collectionConfig?.admin?.useAsTitle} /> diff --git a/packages/next/src/views/Edit/index.client.tsx b/packages/next/src/views/Edit/index.client.tsx index cbbee2a5a..159e90f72 100644 --- a/packages/next/src/views/Edit/index.client.tsx +++ b/packages/next/src/views/Edit/index.client.tsx @@ -13,7 +13,7 @@ import React, { Fragment, useEffect } from 'react' import { useCallback } from 'react' export const EditViewClient: React.FC = () => { - const { id, collectionSlug, getDocPermissions, getVersions, globalSlug, setDocumentInfo } = + const { collectionSlug, getDocPermissions, getVersions, globalSlug, isEditing, setDocumentInfo } = useDocumentInfo() const { @@ -30,8 +30,6 @@ export const EditViewClient: React.FC = () => { globalSlug, }) - const isEditing = Boolean(id && collectionSlug) - const onSave = useCallback( async (json: { doc }) => { void getVersions() diff --git a/packages/next/src/views/LivePreview/index.client.tsx b/packages/next/src/views/LivePreview/index.client.tsx index eddd27160..12fa8a4da 100644 --- a/packages/next/src/views/LivePreview/index.client.tsx +++ b/packages/next/src/views/LivePreview/index.client.tsx @@ -149,7 +149,6 @@ const PreviewView: React.FC = (props) => { globalLabel={globalConfig?.label} globalSlug={globalSlug} id={id} - isEditing={Boolean(id)} view={t('general:livePreview')} /> = async (props) => collectionSlug={collectionConfig?.slug} globalSlug={globalConfig?.slug} id={id} - isEditing pluralLabel={collectionConfig?.labels?.plural} view={i18n.t('version:versions')} /> diff --git a/packages/ui/src/elements/DocumentDrawer/DrawerContent.tsx b/packages/ui/src/elements/DocumentDrawer/DrawerContent.tsx index 6d6b1d8d7..566501dcb 100644 --- a/packages/ui/src/elements/DocumentDrawer/DrawerContent.tsx +++ b/packages/ui/src/elements/DocumentDrawer/DrawerContent.tsx @@ -149,12 +149,12 @@ const Content: React.FC = ({ collectionSlug={collectionConfig.slug} disableActions disableLeaveWithoutSaving - // hasSavePermission={hasSavePermission} - // isEditing={isEditing} // isLoading, id={id} initialData={data} initialState={initialState} + // hasSavePermission={hasSavePermission} + isEditing={isEditing} // me: true, onSave={onSave} > diff --git a/packages/ui/src/providers/DocumentInfo/types.ts b/packages/ui/src/providers/DocumentInfo/types.ts index 379693d72..add6c0f2b 100644 --- a/packages/ui/src/providers/DocumentInfo/types.ts +++ b/packages/ui/src/providers/DocumentInfo/types.ts @@ -28,6 +28,7 @@ export type DocumentInfoProps = { id: null | number | string initialData?: Data initialState?: FormState + isEditing?: boolean onSave?: (data: Data) => Promise | void title?: string }