| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260 |
- import React, {
- useState, useEffect, useCallback, useMemo,
- } from 'react';
- import type { IRevisionOnConflict } from '@growi/core';
- import {
- MergeViewer, CodeMirrorEditorDiff, GlobalCodeMirrorEditorKey, useCodeMirrorEditorIsolated,
- } from '@growi/editor';
- import { UserPicture } from '@growi/ui/dist/components';
- import { format } from 'date-fns';
- import { useTranslation } from 'next-i18next';
- import {
- Modal, ModalHeader, ModalBody, ModalFooter,
- } from 'reactstrap';
- import { toastError, toastSuccess } from '~/client/util/toastr';
- import { useCurrentPathname, useCurrentUser } from '~/stores/context';
- import { useConflictDiffModal } from '~/stores/modal';
- import { useCurrentPagePath, useSWRxCurrentPage, useCurrentPageId } from '~/stores/page';
- import {
- useRemoteRevisionBody, useRemoteRevisionId, useRemoteRevisionLastUpdatedAt, useRemoteRevisionLastUpdateUser, useSetRemoteLatestPageData,
- } from '~/stores/remote-latest-page';
- import styles from './ConflictDiffModal.module.scss';
- type ConflictDiffModalCoreProps = {
- isOpen?: boolean;
- onClose?: (() => void);
- // optionsToSave: OptionsToSave | undefined;
- request: IRevisionOnConflictWithStringDate,
- latest: IRevisionOnConflictWithStringDate,
- // afterResolvedHandler: () => void,
- };
- type IRevisionOnConflictWithStringDate = Omit<IRevisionOnConflict, 'createdAt'> & {
- createdAt: string
- }
- const ConflictDiffModalCore = (props: ConflictDiffModalCoreProps): JSX.Element => {
- const {
- onClose, request, latest,
- } = props;
- const [resolvedRevision, setResolvedRevision] = useState<string>('');
- const [isRevisionselected, setIsRevisionSelected] = useState<boolean>(false);
- const [revisionSelectedToggler, setRevisionSelectedToggler] = useState<boolean>(false);
- const [isModalExpanded, setIsModalExpanded] = useState<boolean>(false);
- const { t } = useTranslation();
- const { data: conflictDiffModalStatus, close: closeConflictDiffModal } = useConflictDiffModal();
- const { data: codeMirrorEditor } = useCodeMirrorEditorIsolated(GlobalCodeMirrorEditorKey.DIFF);
- // const [codeMirrorRef, setCodeMirrorRef] = useState<HTMLDivElement | null>(null);
- // const { data: remoteRevisionId } = useRemoteRevisionId();
- // const { setRemoteLatestPageData } = useSetRemoteLatestPageData();
- // const { data: pageId } = useCurrentPageId();
- // const { data: currentPagePath } = useCurrentPagePath();
- // const { data: currentPathname } = useCurrentPathname();
- const revisionSelectHandler = useCallback((selectedRevision: string) => {
- setResolvedRevision(selectedRevision);
- // Enable selecting the same revision after editing by including revisionSelectedToggler in the dependency array of useEffect
- setRevisionSelectedToggler(prev => !prev);
- if (!isRevisionselected) {
- setIsRevisionSelected(true);
- }
- }, [isRevisionselected]);
- const closeModal = useCallback(() => {
- onClose?.();
- closeConflictDiffModal();
- }, [closeConflictDiffModal, onClose]);
- const headerButtons = useMemo(() => (
- <div className="d-flex align-items-center">
- <button type="button" className="btn" onClick={() => setIsModalExpanded(prev => !prev)}>
- <span className="material-symbols-outlined">{isModalExpanded ? 'close_fullscreen' : 'open_in_full'}</span>
- </button>
- <button type="button" className="btn" onClick={closeModal} aria-label="Close">
- <span className="material-symbols-outlined">close</span>
- </button>
- </div>
- ), [closeModal, isModalExpanded]);
- useEffect(() => {
- codeMirrorEditor?.initDoc(resolvedRevision);
- }, [codeMirrorEditor, resolvedRevision, revisionSelectedToggler]);
- return (
- <Modal
- isOpen // use conflictDiffModalStatus?.isOpened
- toggle={closeModal}
- backdrop="static"
- className={`${styles['conflict-diff-modal']} ${isModalExpanded ? ' grw-modal-expanded' : ''}`}
- size="xl"
- >
- <ModalHeader tag="h4" className="d-flex align-items-center" close={headerButtons}>
- <span className="material-symbols-outlined me-1">error</span>{t('modal_resolve_conflict.resolve_conflict')}
- </ModalHeader>
- <ModalBody className="mx-4 my-1">
- <div className="row">
- <div className="col-12 text-center mt-2 mb-4">
- <h3 className="fw-bold text-muted">{t('modal_resolve_conflict.resolve_conflict_message')}</h3>
- </div>
- <div className="col-6">
- <h4 className="fw-bold my-2 text-muted">{t('modal_resolve_conflict.requested_revision')}</h4>
- <div className="d-flex align-items-center my-3">
- <div>
- <UserPicture user={request.user} size="lg" noLink noTooltip />
- </div>
- <div className="ms-3 text-muted">
- <p className="my-0">updated by {request.user.username}</p>
- <p className="my-0">{request.createdAt}</p>
- </div>
- </div>
- </div>
- <div className="col-6">
- <h4 className="fw-bold my-2 text-muted">{t('modal_resolve_conflict.latest_revision')}</h4>
- <div className="d-flex align-items-center my-3">
- <div>
- <UserPicture user={latest.user} size="lg" noLink noTooltip />
- </div>
- <div className="ms-3 text-muted">
- <p className="my-0">updated by {latest.user.username}</p>
- <p className="my-0">{latest.createdAt}</p>
- </div>
- </div>
- </div>
- <MergeViewer
- leftBody={request.revisionBody}
- rightBody={latest.revisionBody}
- />
- <div className="col-6">
- <div className="text-center my-4">
- <button
- type="button"
- className="btn btn-outline-primary"
- onClick={() => { revisionSelectHandler(request.revisionBody) }}
- >
- <span className="material-symbols-outlined me-1">arrow_circle_down</span>
- {t('modal_resolve_conflict.select_revision', { revision: 'mine' })}
- </button>
- </div>
- </div>
- <div className="col-6">
- <div className="text-center my-4">
- <button
- type="button"
- className="btn btn-outline-primary"
- onClick={() => { revisionSelectHandler(latest.revisionBody) }}
- >
- <span className="material-symbols-outlined me-1">arrow_circle_down</span>
- {t('modal_resolve_conflict.select_revision', { revision: 'theirs' })}
- </button>
- </div>
- </div>
- <div className="col-12">
- <div className="border border-dark">
- <h4 className="fw-bold my-2 mx-2 text-muted">{t('modal_resolve_conflict.selected_editable_revision')}</h4>
- <CodeMirrorEditorDiff />
- </div>
- </div>
- </div>
- </ModalBody>
- <ModalFooter>
- <button
- type="button"
- className="btn btn-outline-secondary"
- onClick={closeModal}
- >
- {t('Cancel')}
- </button>
- <button
- type="button"
- className="btn btn-primary ms-3"
- // onClick={onResolveConflict}
- disabled={!isRevisionselected}
- >
- {t('modal_resolve_conflict.resolve_and_save')}
- </button>
- </ModalFooter>
- </Modal>
- );
- };
- type ConflictDiffModalProps = {
- isOpen?: boolean;
- onClose?: (() => void);
- markdownOnEdit: string;
- // optionsToSave: OptionsToSave | undefined;
- // afterResolvedHandler: () => void,
- };
- export const ConflictDiffModal = (props: ConflictDiffModalProps): JSX.Element => {
- const {
- isOpen, onClose, markdownOnEdit,
- } = props;
- const { data: currentUser } = useCurrentUser();
- // state for current page
- const { data: currentPage } = useSWRxCurrentPage();
- // state for latest page
- const { data: remoteRevisionId } = useRemoteRevisionId();
- const { data: remoteRevisionBody } = useRemoteRevisionBody();
- const { data: remoteRevisionLastUpdateUser } = useRemoteRevisionLastUpdateUser();
- const { data: remoteRevisionLastUpdatedAt } = useRemoteRevisionLastUpdatedAt();
- const currentTime: Date = new Date();
- const isRemotePageDataInappropriate = remoteRevisionId == null || remoteRevisionBody == null || remoteRevisionLastUpdateUser == null;
- if (!isOpen || currentUser == null || currentPage == null) {
- return <></>;
- }
- const request: IRevisionOnConflictWithStringDate = {
- revisionId: '',
- revisionBody: markdownOnEdit,
- createdAt: format(currentTime, 'yyyy/MM/dd HH:mm:ss'),
- user: currentUser,
- };
- const latest: IRevisionOnConflictWithStringDate = {
- revisionId: '',
- revisionBody: markdownOnEdit,
- createdAt: format(currentTime, 'yyyy/MM/dd HH:mm:ss'),
- user: currentUser,
- };
- // const latest: IRevisionOnConflictWithStringDate = {
- // revisionId: remoteRevisionId,
- // revisionBody: remoteRevisionBody,
- // createdAt: format(new Date(remoteRevisionLastUpdatedAt || currentTime.toString()), 'yyyy/MM/dd HH:mm:ss'),
- // user: remoteRevisionLastUpdateUser,
- // };
- const propsForCore = {
- isOpen,
- onClose,
- request,
- latest,
- };
- return <ConflictDiffModalCore {...propsForCore} />;
- };
|