kaori 4 лет назад
Родитель
Сommit
0aad37fa7a

+ 4 - 1
packages/app/src/client/services/ContextExtractor.tsx

@@ -40,10 +40,13 @@ const ContextExtractorOnce: FC = () => {
   const pageId = mainContent?.getAttribute('data-page-id') || null;
   const pageId = mainContent?.getAttribute('data-page-id') || null;
   const revisionCreatedAt = +(mainContent?.getAttribute('data-page-revision-created') || '');
   const revisionCreatedAt = +(mainContent?.getAttribute('data-page-revision-created') || '');
 
 
+  // createdAt
   const createdAtAttribute = mainContent?.getAttribute('data-page-created-at');
   const createdAtAttribute = mainContent?.getAttribute('data-page-created-at');
   const createdAt: Date | null = (createdAtAttribute != null) ? new Date(createdAtAttribute) : null;
   const createdAt: Date | null = (createdAtAttribute != null) ? new Date(createdAtAttribute) : null;
+  // updatedAt
+  const updatedAtAttribute = mainContent?.getAttribute('data-page-updated-at');
+  const updatedAt: Date | null = (updatedAtAttribute != null) ? new Date(updatedAtAttribute) : null;
 
 
-  const updatedAt = mainContent?.getAttribute('data-page-updated-at');
   const deletedAt = mainContent?.getAttribute('data-page-deleted-at') || null;
   const deletedAt = mainContent?.getAttribute('data-page-deleted-at') || null;
   const isUserPage = JSON.parse(mainContent?.getAttribute('data-page-user') || jsonNull);
   const isUserPage = JSON.parse(mainContent?.getAttribute('data-page-user') || jsonNull);
   const isTrashPage = _isTrashPage(path);
   const isTrashPage = _isTrashPage(path);

+ 1 - 1
packages/app/src/client/services/PageContainer.js

@@ -66,7 +66,7 @@ export default class PageContainer extends Container {
 
 
       createdAt: mainContent.getAttribute('data-page-created-at'),
       createdAt: mainContent.getAttribute('data-page-created-at'),
       // please use useCurrentUpdatedAt instead
       // please use useCurrentUpdatedAt instead
-      // updatedAt: mainContent.getAttribute('data-page-updated-at'),
+      updatedAt: mainContent.getAttribute('data-page-updated-at'),
       deletedAt: mainContent.getAttribute('data-page-deleted-at') || null,
       deletedAt: mainContent.getAttribute('data-page-deleted-at') || null,
 
 
       isUserPage: JSON.parse(mainContent.getAttribute('data-page-user')) != null,
       isUserPage: JSON.parse(mainContent.getAttribute('data-page-user')) != null,

+ 1 - 1
packages/app/src/components/Navbar/AuthorInfo.jsx

@@ -60,7 +60,7 @@ const AuthorInfo = (props) => {
 };
 };
 
 
 AuthorInfo.propTypes = {
 AuthorInfo.propTypes = {
-  date: PropTypes.string.isRequired,
+  date: PropTypes.instanceOf(Date),
   user: PropTypes.object,
   user: PropTypes.object,
   mode: PropTypes.oneOf(['create', 'update']),
   mode: PropTypes.oneOf(['create', 'update']),
   locate: PropTypes.oneOf(['subnav', 'footer']),
   locate: PropTypes.oneOf(['subnav', 'footer']),

+ 2 - 1
packages/app/src/components/PageContentFooter.jsx

@@ -11,12 +11,13 @@ import { useCurrentCreatedAt, useCurrentUpdatedAt } from '~/stores/context';
 const PageContentFooter = (props) => {
 const PageContentFooter = (props) => {
   const { pageContainer } = props;
   const { pageContainer } = props;
   const { data: createdAt } = useCurrentCreatedAt();
   const { data: createdAt } = useCurrentCreatedAt();
+  const { data: updatedAt } = useCurrentUpdatedAt();
+
 
 
   const {
   const {
     creator, revisionAuthor,
     creator, revisionAuthor,
   } = pageContainer.state;
   } = pageContainer.state;
 
 
-  const { data: updatedAt } = useCurrentUpdatedAt();
 
 
   return (
   return (
     <div className="page-content-footer py-4 d-edit-none d-print-none">
     <div className="page-content-footer py-4 d-edit-none d-print-none">

+ 2 - 2
packages/app/src/stores/context.tsx

@@ -34,8 +34,8 @@ export const useCurrentCreatedAt = (initialData?: Nullable<Date>): SWRResponse<N
   return useStaticSWR<Nullable<Date>, Error>('createdAt', initialData ?? null);
   return useStaticSWR<Nullable<Date>, Error>('createdAt', initialData ?? null);
 };
 };
 
 
-export const useCurrentUpdatedAt = (initialData?: Nullable<any>): SWRResponse<Nullable<any>, Error> => {
-  return useStaticSWR<Nullable<any>, Error>('updatedAt', initialData ?? null);
+export const useCurrentUpdatedAt = (initialData?: Nullable<Date>): SWRResponse<Nullable<Date>, Error> => {
+  return useStaticSWR<Nullable<Date>, Error>('updatedAt', initialData ?? null);
 };
 };
 
 
 export const useDeletedAt = (initialData?: Nullable<any>): SWRResponse<Nullable<any>, Error> => {
 export const useDeletedAt = (initialData?: Nullable<any>): SWRResponse<Nullable<any>, Error> => {