Procházet zdrojové kódy

Revert "syncLatestRevisionBodyToYjsDraft -> deleteYjsData"

This reverts commit e0513f515e996c13a361706e6b848a40123742a7.
Shun Miyazawa před 1 rokem
rodič
revize
ad86dc10e9

+ 2 - 2
apps/app/src/client/components/Navbar/GrowiContextualSubNavigation.tsx

@@ -14,7 +14,7 @@ import { useRouter } from 'next/router';
 import Sticky from 'react-stickynode';
 import Sticky from 'react-stickynode';
 import { DropdownItem } from 'reactstrap';
 import { DropdownItem } from 'reactstrap';
 
 
-import { exportAsMarkdown, updateContentWidth, deleteYjsData } from '~/client/services/page-operation';
+import { exportAsMarkdown, updateContentWidth, syncLatestRevisionBody } from '~/client/services/page-operation';
 import { toastSuccess, toastError } from '~/client/util/toastr';
 import { toastSuccess, toastError } from '~/client/util/toastr';
 import { GroundGlassBar } from '~/components/Navbar/GroundGlassBar';
 import { GroundGlassBar } from '~/components/Navbar/GroundGlassBar';
 import type { OnDuplicatedFunction, OnRenamedFunction, OnDeletedFunction } from '~/interfaces/ui';
 import type { OnDuplicatedFunction, OnRenamedFunction, OnDeletedFunction } from '~/interfaces/ui';
@@ -83,7 +83,7 @@ const PageOperationMenuItems = (props: PageOperationMenuItemsProps): JSX.Element
     const answer = window.confirm(t('sync-latest-reevision-body.confirm'));
     const answer = window.confirm(t('sync-latest-reevision-body.confirm'));
     if (answer) {
     if (answer) {
       try {
       try {
-        await deleteYjsData(pageId);
+        await syncLatestRevisionBody(pageId);
         toastSuccess(t('sync-latest-reevision-body.success-toaster'));
         toastSuccess(t('sync-latest-reevision-body.success-toaster'));
       }
       }
       catch {
       catch {

+ 3 - 5
apps/app/src/client/services/page-operation.ts

@@ -13,9 +13,7 @@ import { useSetRemoteLatestPageData } from '~/stores/remote-latest-page';
 import loggerFactory from '~/utils/logger';
 import loggerFactory from '~/utils/logger';
 
 
 import { apiPost } from '../util/apiv1-client';
 import { apiPost } from '../util/apiv1-client';
-import {
-  apiv3Get, apiv3Post, apiv3Put, apiv3Delete,
-} from '../util/apiv3-client';
+import { apiv3Get, apiv3Post, apiv3Put } from '../util/apiv3-client';
 import { toastError } from '../util/toastr';
 import { toastError } from '../util/toastr';
 
 
 const logger = loggerFactory('growi:services:page-operation');
 const logger = loggerFactory('growi:services:page-operation');
@@ -177,7 +175,7 @@ export const unpublish = async(pageId: string): Promise<IPageHasId> => {
   return res.data;
   return res.data;
 };
 };
 
 
-export const deleteYjsData = async(pageId: string): Promise<void> => {
-  await apiv3Delete(`/page/${pageId}/yjs-data`);
+export const syncLatestRevisionBody = async(pageId: string): Promise<void> => {
+  await apiv3Put(`/page/${pageId}/sync-latest-revision-body-to-yjs-draft`);
   return;
   return;
 };
 };

+ 2 - 2
apps/app/src/server/routes/apiv3/page/index.ts

@@ -29,9 +29,9 @@ import type { ApiV3Response } from '../interfaces/apiv3-response';
 
 
 import { checkPageExistenceHandlersFactory } from './check-page-existence';
 import { checkPageExistenceHandlersFactory } from './check-page-existence';
 import { createPageHandlersFactory } from './create-page';
 import { createPageHandlersFactory } from './create-page';
-import { deleteYjsDataHandlerFactory } from './delete-yjs-data';
 import { getYjsDataHandlerFactory } from './get-yjs-data';
 import { getYjsDataHandlerFactory } from './get-yjs-data';
 import { publishPageHandlersFactory } from './publish-page';
 import { publishPageHandlersFactory } from './publish-page';
+import { syncLatestRevisionBodyToYjsDraftHandlerFactory } from './sync-latest-revision-body-to-yjs-draft';
 import { unpublishPageHandlersFactory } from './unpublish-page';
 import { unpublishPageHandlersFactory } from './unpublish-page';
 import { updatePageHandlersFactory } from './update-page';
 import { updatePageHandlersFactory } from './update-page';
 
 
@@ -954,7 +954,7 @@ module.exports = (crowi) => {
 
 
   router.get('/:pageId/yjs-data', getYjsDataHandlerFactory(crowi));
   router.get('/:pageId/yjs-data', getYjsDataHandlerFactory(crowi));
 
 
-  router.delete('/:pageId/yjs-data', deleteYjsDataHandlerFactory(crowi));
+  router.put('/:pageId/sync-latest-revision-body-to-yjs-draft', syncLatestRevisionBodyToYjsDraftHandlerFactory(crowi));
 
 
   return router;
   return router;
 };
 };

+ 2 - 2
apps/app/src/server/routes/apiv3/page/delete-yjs-data.ts → apps/app/src/server/routes/apiv3/page/sync-latest-revision-body-to-yjs-draft.ts

@@ -16,7 +16,7 @@ import type { ApiV3Response } from '../interfaces/apiv3-response';
 
 
 const logger = loggerFactory('growi:routes:apiv3:page:sync-latest-revision-body-to-yjs-draft');
 const logger = loggerFactory('growi:routes:apiv3:page:sync-latest-revision-body-to-yjs-draft');
 
 
-type DeleteYjsDataHandlerFactory = (crowi: Crowi) => RequestHandler[];
+type SyncLatestRevisionBodyToYjsDraftHandlerFactory = (crowi: Crowi) => RequestHandler[];
 
 
 type ReqParams = {
 type ReqParams = {
   pageId: string,
   pageId: string,
@@ -24,7 +24,7 @@ type ReqParams = {
 interface Req extends Request<ReqParams, ApiV3Response> {
 interface Req extends Request<ReqParams, ApiV3Response> {
   user: IUserHasId,
   user: IUserHasId,
 }
 }
-export const deleteYjsDataHandlerFactory: DeleteYjsDataHandlerFactory = (crowi) => {
+export const syncLatestRevisionBodyToYjsDraftHandlerFactory: SyncLatestRevisionBodyToYjsDraftHandlerFactory = (crowi) => {
   const Page = mongoose.model<IPage, PageModel>('Page');
   const Page = mongoose.model<IPage, PageModel>('Page');
   const accessTokenParser = require('../../../middlewares/access-token-parser')(crowi);
   const accessTokenParser = require('../../../middlewares/access-token-parser')(crowi);
   const loginRequiredStrictly = require('../../../middlewares/login-required')(crowi);
   const loginRequiredStrictly = require('../../../middlewares/login-required')(crowi);