diff --git a/src/admin/components/views/Global/Default.tsx b/src/admin/components/views/Global/Default.tsx index 26bf473c7b..a8cf37a117 100644 --- a/src/admin/components/views/Global/Default.tsx +++ b/src/admin/components/views/Global/Default.tsx @@ -34,7 +34,7 @@ const DefaultGlobalView: React.FC = (props) => { const { t, i18n } = useTranslation('general'); const { - global, data, onSave, permissions, action, apiURL, initialState, isLoading, + global, data, onSave, permissions, action, apiURL, initialState, isLoading, updatedAt, } = props; const { @@ -170,10 +170,10 @@ const DefaultGlobalView: React.FC = (props) => { )} - {data.updatedAt && ( + {updatedAt && (
  • {t('lastModified')}
    -
    {format(new Date(data.updatedAt as string), dateFormat)}
    +
    {format(new Date(updatedAt as string), dateFormat)}
  • )} diff --git a/src/admin/components/views/Global/index.tsx b/src/admin/components/views/Global/index.tsx index 368deba88f..fe4dab73ec 100644 --- a/src/admin/components/views/Global/index.tsx +++ b/src/admin/components/views/Global/index.tsx @@ -22,6 +22,7 @@ const GlobalView: React.FC = (props) => { const { setStepNav } = useStepNav(); const { user } = useAuth(); const [initialState, setInitialState] = useState(); + const [updatedAt, setUpdatedAt] = useState(); const { getVersions, preferencesKey, docPermissions, getDocPermissions } = useDocumentInfo(); const { getPreference } = usePreferences(); const { t } = useTranslation(); @@ -51,6 +52,7 @@ const GlobalView: React.FC = (props) => { const onSave = useCallback(async (json) => { getVersions(); getDocPermissions(); + setUpdatedAt(json?.result?.updatedAt); const state = await buildStateFromSchema({ fieldSchema: fields, data: json.result, operation: 'update', user, locale, t }); setInitialState(state); }, [getVersions, fields, user, locale, t, getDocPermissions]); @@ -93,6 +95,7 @@ const GlobalView: React.FC = (props) => { onSave, apiURL: `${serverURL}${api}/globals/${slug}${global.versions?.drafts ? '?draft=true' : ''}`, action: `${serverURL}${api}/globals/${slug}?locale=${locale}&depth=0&fallback-locale=null`, + updatedAt: updatedAt || dataToRender?.updatedAt, }} /> ); diff --git a/src/admin/components/views/Global/types.ts b/src/admin/components/views/Global/types.ts index c670506aec..0782339845 100644 --- a/src/admin/components/views/Global/types.ts +++ b/src/admin/components/views/Global/types.ts @@ -17,4 +17,5 @@ export type Props = { initialState: Fields isLoading: boolean autosaveEnabled: boolean + updatedAt: string } diff --git a/src/admin/components/views/collections/Edit/index.tsx b/src/admin/components/views/collections/Edit/index.tsx index 99337d07e1..c32fdb6d6c 100644 --- a/src/admin/components/views/collections/Edit/index.tsx +++ b/src/admin/components/views/collections/Edit/index.tsx @@ -113,7 +113,7 @@ const EditView: React.FC = (props) => { hasSavePermission, apiURL, action, - updatedAt, + updatedAt: updatedAt || dataToRender?.updatedAt, }} />