yohei0125 3 лет назад
Родитель
Сommit
7efedc5e4d

+ 6 - 6
packages/app/src/components/Common/Dropdown/PageItemControl.tsx

@@ -8,7 +8,7 @@ import {
 import {
 import {
   IPageInfoAll, isIPageInfoForOperation,
   IPageInfoAll, isIPageInfoForOperation,
 } from '~/interfaces/page';
 } from '~/interfaces/page';
-import { IPageOperationProcessInfo } from '~/interfaces/page-operation';
+import { IPageOperationProcessData } from '~/interfaces/page-operation';
 import { useSWRxPageInfo } from '~/stores/page';
 import { useSWRxPageInfo } from '~/stores/page';
 import loggerFactory from '~/utils/logger';
 import loggerFactory from '~/utils/logger';
 
 
@@ -49,7 +49,7 @@ type CommonProps = {
 type DropdownMenuProps = CommonProps & {
 type DropdownMenuProps = CommonProps & {
   pageId: string,
   pageId: string,
   isLoading?: boolean,
   isLoading?: boolean,
-  operationProcessInfo?: IPageOperationProcessInfo,
+  operationProcessData?: IPageOperationProcessData,
 }
 }
 
 
 const PageItemControlDropdownMenu = React.memo((props: DropdownMenuProps): JSX.Element => {
 const PageItemControlDropdownMenu = React.memo((props: DropdownMenuProps): JSX.Element => {
@@ -57,7 +57,7 @@ const PageItemControlDropdownMenu = React.memo((props: DropdownMenuProps): JSX.E
 
 
   const {
   const {
     pageId, isLoading,
     pageId, isLoading,
-    pageInfo, isEnableActions, forceHideMenuItems, operationProcessInfo,
+    pageInfo, isEnableActions, forceHideMenuItems, operationProcessData,
     onClickBookmarkMenuItem, onClickRenameMenuItem, onClickDuplicateMenuItem, onClickDeleteMenuItem, onClickRevertMenuItem, onClickPathRecoveryMenuItem,
     onClickBookmarkMenuItem, onClickRenameMenuItem, onClickDuplicateMenuItem, onClickDeleteMenuItem, onClickRevertMenuItem, onClickPathRecoveryMenuItem,
     additionalMenuItemRenderer: AdditionalMenuItems, isInstantRename,
     additionalMenuItemRenderer: AdditionalMenuItems, isInstantRename,
   } = props;
   } = props;
@@ -197,7 +197,7 @@ const PageItemControlDropdownMenu = React.memo((props: DropdownMenuProps): JSX.E
         ) }
         ) }
 
 
         {/* PathRecovery */}
         {/* PathRecovery */}
-        { !forceHideMenuItems?.includes(MenuItemType.PATH_RECOVERY) && isEnableActions && operationProcessInfo?.Rename != null && (
+        { !forceHideMenuItems?.includes(MenuItemType.PATH_RECOVERY) && isEnableActions && operationProcessData?.Rename != null && (
           <DropdownItem
           <DropdownItem
             onClick={pathRecoveryItemClickedHandler}
             onClick={pathRecoveryItemClickedHandler}
             className="grw-page-control-dropdown-item"
             className="grw-page-control-dropdown-item"
@@ -239,7 +239,7 @@ type PageItemControlSubstanceProps = CommonProps & {
   pageId: string,
   pageId: string,
   fetchOnInit?: boolean,
   fetchOnInit?: boolean,
   children?: React.ReactNode,
   children?: React.ReactNode,
-  operationProcessInfo?: IPageOperationProcessInfo,
+  operationProcessData?: IPageOperationProcessData,
 }
 }
 
 
 export const PageItemControlSubstance = (props: PageItemControlSubstanceProps): JSX.Element => {
 export const PageItemControlSubstance = (props: PageItemControlSubstanceProps): JSX.Element => {
@@ -325,7 +325,7 @@ export const PageItemControlSubstance = (props: PageItemControlSubstanceProps):
 type PageItemControlProps = CommonProps & {
 type PageItemControlProps = CommonProps & {
   pageId?: string,
   pageId?: string,
   children?: React.ReactNode,
   children?: React.ReactNode,
-  operationProcessInfo?: IPageOperationProcessInfo,
+  operationProcessData?: IPageOperationProcessData,
 }
 }
 
 
 export const PageItemControl = (props: PageItemControlProps): JSX.Element => {
 export const PageItemControl = (props: PageItemControlProps): JSX.Element => {

+ 1 - 1
packages/app/src/components/Sidebar/PageTree/Item.tsx

@@ -457,7 +457,7 @@ const Item: FC<ItemProps> = (props: ItemProps) => {
             onClickRenameMenuItem={renameMenuItemClickHandler}
             onClickRenameMenuItem={renameMenuItemClickHandler}
             onClickDeleteMenuItem={deleteMenuItemClickHandler}
             onClickDeleteMenuItem={deleteMenuItemClickHandler}
             isInstantRename
             isInstantRename
-            operationProcessInfo={page.processInfo}
+            operationProcessData={page.processData}
           >
           >
             {/* pass the color property to reactstrap dropdownToggle props. https://6-4-0--reactstrap.netlify.app/components/dropdowns/  */}
             {/* pass the color property to reactstrap dropdownToggle props. https://6-4-0--reactstrap.netlify.app/components/dropdowns/  */}
             <DropdownToggle color="transparent" className="border-0 rounded btn-page-item-control p-0 grw-visible-on-hover mr-1">
             <DropdownToggle color="transparent" className="border-0 rounded btn-page-item-control p-0 grw-visible-on-hover mr-1">

+ 2 - 2
packages/app/src/interfaces/page.ts

@@ -1,6 +1,6 @@
 import { Ref, Nullable } from './common';
 import { Ref, Nullable } from './common';
 import { HasObjectId } from './has-object-id';
 import { HasObjectId } from './has-object-id';
-import { IPageOperationProcessInfo } from './page-operation';
+import { IPageOperationProcessData } from './page-operation';
 import { IRevision, HasRevisionShortbody } from './revision';
 import { IRevision, HasRevisionShortbody } from './revision';
 import { SubscriptionStatusType } from './subscription';
 import { SubscriptionStatusType } from './subscription';
 import { ITag } from './tag';
 import { ITag } from './tag';
@@ -44,7 +44,7 @@ export type PageGrant = typeof PageGrant[keyof typeof PageGrant];
 
 
 export type IPageHasId = IPage & HasObjectId;
 export type IPageHasId = IPage & HasObjectId;
 
 
-export type IPageForItem = Partial<IPageHasId & {isTarget?: boolean, processInfo?: IPageOperationProcessInfo}>;
+export type IPageForItem = Partial<IPageHasId & {isTarget?: boolean, processData?: IPageOperationProcessData}>;
 
 
 export type IPageInfo = {
 export type IPageInfo = {
   isV5Compatible: boolean,
   isV5Compatible: boolean,

+ 2 - 2
packages/app/src/server/service/page.ts

@@ -3567,9 +3567,9 @@ class PageService {
    * Inject the information into page docuement if they are related based on page id
    * Inject the information into page docuement if they are related based on page id
    */
    */
   async injectProcessDataIntoPagesByActionTypes(
   async injectProcessDataIntoPagesByActionTypes(
-      pages: (PageDocument & { processInfo?: IPageOperationProcessData })[],
+      pages: (PageDocument & { processData?: IPageOperationProcessData })[],
       actionTypes: PageActionType[],
       actionTypes: PageActionType[],
-  ): Promise<(PageDocument & { processInfo?: IPageOperationProcessData })[]> {
+  ): Promise<(PageDocument & { processData?: IPageOperationProcessData })[]> {
 
 
     const pageOperations = await PageOperation.find({ actionType: { $in: actionTypes } });
     const pageOperations = await PageOperation.find({ actionType: { $in: actionTypes } });
     if (pageOperations == null || pageOperations.length === 0) {
     if (pageOperations == null || pageOperations.length === 0) {