rm unsed type

apps/app/src/components/PageEditor/ConflictDiffModal.tsx

@@ -2,7 +2,7 @@ import React, {
   useState, useEffect, useCallback, useMemo,
 } from 'react';
 
-import type { IRevisionOnConflict } from '@growi/core';
+import type { IUser } from '@growi/core';
 import {
   MergeViewer, CodeMirrorEditorDiff, GlobalCodeMirrorEditorKey, useCodeMirrorEditorIsolated,
 } from '@growi/editor';
@@ -22,11 +22,15 @@ import {
 
 import styles from './ConflictDiffModal.module.scss';
 
-type OmiitedRevisionOnConflict = Omit<IRevisionOnConflict, 'revisionId'>;
+type IRevisionOnConflict = {
+  revisionBody: string
+  createdAt: Date
+  user: IUser
+}
 
 type ConflictDiffModalCoreProps = {
-  request: OmiitedRevisionOnConflict
-  latest: OmiitedRevisionOnConflict
+  request: IRevisionOnConflict
+  latest: IRevisionOnConflict
 };
 
 const formatedDate = (date: Date): string => {
@@ -182,9 +186,8 @@ const ConflictDiffModalCore = (props: ConflictDiffModalCoreProps): JSX.Element =
 
 export const ConflictDiffModal = (): JSX.Element => {
   const { data: currentUser } = useCurrentUser();
-
-  // state for current page
   const { data: currentPage } = useSWRxCurrentPage();
+  const { data: conflictDiffModalStatus } = useConflictDiffModal();
 
   // state for latest page
   const { data: remoteRevisionId } = useRemoteRevisionId();
@@ -192,8 +195,6 @@ export const ConflictDiffModal = (): JSX.Element => {
   const { data: remoteRevisionLastUpdateUser } = useRemoteRevisionLastUpdateUser();
   const { data: remoteRevisionLastUpdatedAt } = useRemoteRevisionLastUpdatedAt();
 
-  const { data: conflictDiffModalStatus } = useConflictDiffModal();
-
   const isRemotePageDataInappropriate = remoteRevisionId == null || remoteRevisionBody == null || remoteRevisionLastUpdateUser == null;
 
   if (!conflictDiffModalStatus?.isOpened || currentUser == null || currentPage == null || isRemotePageDataInappropriate) {
@@ -202,13 +203,13 @@ export const ConflictDiffModal = (): JSX.Element => {
 
   const currentTime: Date = new Date();
 
-  const request: OmiitedRevisionOnConflict = {
+  const request: IRevisionOnConflict = {
     revisionBody: conflictDiffModalStatus.requestRevisionBody ?? '',
     createdAt: currentTime,
     user: currentUser,
   };
 
-  const latest: OmiitedRevisionOnConflict = {
+  const latest: IRevisionOnConflict = {
     revisionBody: remoteRevisionBody,
     createdAt: new Date(remoteRevisionLastUpdatedAt ?? currentTime.toString()),
     user: remoteRevisionLastUpdateUser,

packages/core/src/interfaces/revision.ts

@@ -31,14 +31,6 @@ export type IRevisionsForPagination = {
   revisions: IRevisionHasPageId[], // revisions in one pagination
   totalCounts: number // total counts
 }
-
-export type IRevisionOnConflict = {
-  revisionId: string,
-  revisionBody: string,
-  createdAt: Date,
-  user: IUser
-}
-
 export type HasRevisionShortbody = {
   revisionShortBody?: string,
 }