|
@@ -14,7 +14,6 @@ import { IUser } from '~/interfaces/user';
|
|
|
import { useCurrentUser } from '~/stores/context';
|
|
import { useCurrentUser } from '~/stores/context';
|
|
|
import { useEditorMode } from '~/stores/ui';
|
|
import { useEditorMode } from '~/stores/ui';
|
|
|
|
|
|
|
|
-import PageContainer from '../../client/services/PageContainer';
|
|
|
|
|
import { IRevisionOnConflict } from '../../interfaces/revision';
|
|
import { IRevisionOnConflict } from '../../interfaces/revision';
|
|
|
import ExpandOrContractButton from '../ExpandOrContractButton';
|
|
import ExpandOrContractButton from '../ExpandOrContractButton';
|
|
|
import { UncontrolledCodeMirror } from '../UncontrolledCodeMirror';
|
|
import { UncontrolledCodeMirror } from '../UncontrolledCodeMirror';
|
|
@@ -29,7 +28,7 @@ Object.keys(DMP).forEach((key) => { window[key] = DMP[key] });
|
|
|
type ConflictDiffModalProps = {
|
|
type ConflictDiffModalProps = {
|
|
|
isOpen?: boolean;
|
|
isOpen?: boolean;
|
|
|
onClose?: (() => void);
|
|
onClose?: (() => void);
|
|
|
- pageContainer: PageContainer;
|
|
|
|
|
|
|
+ // pageContainer: PageContainer;
|
|
|
markdownOnEdit: string;
|
|
markdownOnEdit: string;
|
|
|
};
|
|
};
|
|
|
|
|
|
|
@@ -38,7 +37,7 @@ type IRevisionOnConflictWithStringDate = Omit<IRevisionOnConflict, 'createdAt'>
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
const ConflictDiffModalCore = (props: ConflictDiffModalProps & { currentUser: IUser }): JSX.Element => {
|
|
const ConflictDiffModalCore = (props: ConflictDiffModalProps & { currentUser: IUser }): JSX.Element => {
|
|
|
- const { currentUser, pageContainer, onClose } = props;
|
|
|
|
|
|
|
+ const { currentUser, onClose } = props;
|
|
|
|
|
|
|
|
const { data: editorMode } = useEditorMode();
|
|
const { data: editorMode } = useEditorMode();
|
|
|
|
|
|
|
@@ -59,16 +58,25 @@ const ConflictDiffModalCore = (props: ConflictDiffModalProps & { currentUser: IU
|
|
|
user: currentUser,
|
|
user: currentUser,
|
|
|
};
|
|
};
|
|
|
const origin: IRevisionOnConflictWithStringDate = {
|
|
const origin: IRevisionOnConflictWithStringDate = {
|
|
|
- revisionId: pageContainer.state.revisionId || '',
|
|
|
|
|
- revisionBody: pageContainer.state.markdown || '',
|
|
|
|
|
- createdAt: pageContainer.state.updatedAt || '',
|
|
|
|
|
- user: pageContainer.state.revisionAuthor,
|
|
|
|
|
|
|
+ // revisionId: pageContainer.state.revisionId || '',
|
|
|
|
|
+ // revisionBody: pageContainer.state.markdown || '',
|
|
|
|
|
+ // createdAt: pageContainer.state.updatedAt || '',
|
|
|
|
|
+ // user: pageContainer.state.revisionAuthor,
|
|
|
|
|
+ revisionId: '',
|
|
|
|
|
+ revisionBody: '',
|
|
|
|
|
+ createdAt: '',
|
|
|
|
|
+ user: {} as IUser,
|
|
|
};
|
|
};
|
|
|
const latest: IRevisionOnConflictWithStringDate = {
|
|
const latest: IRevisionOnConflictWithStringDate = {
|
|
|
- revisionId: pageContainer.state.remoteRevisionId || '',
|
|
|
|
|
- revisionBody: pageContainer.state.remoteRevisionBody || '',
|
|
|
|
|
- createdAt: format(new Date(pageContainer.state.remoteRevisionUpdateAt || currentTime.toString()), 'yyyy/MM/dd HH:mm:ss'),
|
|
|
|
|
- user: pageContainer.state.lastUpdateUser,
|
|
|
|
|
|
|
+ // revisionId: pageContainer.state.remoteRevisionId || '',
|
|
|
|
|
+ // revisionBody: pageContainer.state.remoteRevisionBody || '',
|
|
|
|
|
+ // createdAt: format(new Date(pageContainer.state.remoteRevisionUpdateAt || currentTime.toString()), 'yyyy/MM/dd HH:mm:ss'),
|
|
|
|
|
+ // user: pageContainer.state.lastUpdateUser,
|
|
|
|
|
+ revisionId: '',
|
|
|
|
|
+ revisionBody: '',
|
|
|
|
|
+ createdAt: format(new Date(''), 'yyyy/MM/dd HH:mm:ss'),
|
|
|
|
|
+ user: {} as IUser,
|
|
|
|
|
+
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
useEffect(() => {
|
|
useEffect(() => {
|
|
@@ -101,15 +109,15 @@ const ConflictDiffModalCore = (props: ConflictDiffModalProps & { currentUser: IU
|
|
|
const codeMirrorVal = uncontrolledRef.current?.editor.doc.getValue();
|
|
const codeMirrorVal = uncontrolledRef.current?.editor.doc.getValue();
|
|
|
|
|
|
|
|
try {
|
|
try {
|
|
|
- await pageContainer.resolveConflict(codeMirrorVal, editorMode);
|
|
|
|
|
- close();
|
|
|
|
|
- pageContainer.showSuccessToastr();
|
|
|
|
|
|
|
+ // await pageContainer.resolveConflict(codeMirrorVal, editorMode);
|
|
|
|
|
+ // close();
|
|
|
|
|
+ // pageContainer.showSuccessToastr();
|
|
|
}
|
|
}
|
|
|
catch (error) {
|
|
catch (error) {
|
|
|
- pageContainer.showErrorToastr(error);
|
|
|
|
|
|
|
+ // pageContainer.showErrorToastr(error);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- }, [editorMode, close, pageContainer]);
|
|
|
|
|
|
|
+ }, [editorMode, close]);
|
|
|
|
|
|
|
|
const resizeAndCloseButtons = useMemo(() => (
|
|
const resizeAndCloseButtons = useMemo(() => (
|
|
|
<div className="d-flex flex-nowrap">
|
|
<div className="d-flex flex-nowrap">
|