change names and add i18n

packages/app/resource/locales/en_US/translation.json

@@ -466,7 +466,9 @@
     "reload": "Reload",
     "resolve_conflict": "Resolve Conflict",
     "resolve_and_save" : "Resolve and save",
-    "select_revision" : "Select {{revision}}"
+    "select_revision" : "Select {{revision}}",
+    "revision_name": "{{revision}}本文",
+    "selected_editable_revision": "Selected Revision(Editable)"
   },
   "link_edit": {
     "edit_link": "Edit Link",

packages/app/resource/locales/ja_JP/translation.json

@@ -466,7 +466,9 @@
     "reload": "再読み込み",
     "resolve_conflict": "衝突を解消",
     "resolve_and_save" : "解消し保存する",
-    "select_revision" : "{{revision}}にする"
+    "select_revision" : "{{revision}}にする",
+    "revision_name": "{{revision}}の本文",
+    "selected_editable_revision": "Selected Revision(Editable)"
   },
   "link_edit": {
     "edit_link": "リンク編集",

packages/app/resource/locales/zh_CN/translation.json

@@ -444,7 +444,9 @@
     "reload": "重新加载",
     "resolve_conflict": "解决冲突",
     "resolve_and_save" : "解决冲突并保存",
-    "select_revision" : "选择{{revision}}"
+    "select_revision" : "选择{{revision}}",
+    "revision_name": "{{revision}}本文",
+    "selected_editable_revision": "选定的可编辑页面正文"
   },
   "link_edit": {
     "edit_link": "Edit Link",

packages/app/src/client/services/PageContainer.js

@@ -435,7 +435,6 @@ export default class PageContainer extends Container {
 
     const { pageId, path } = this.state;
     let { revisionId } = this.state;
-    console.log('save():, ', revisionId, pageId, path);
     const options = Object.assign({}, optionsToSave);
 
     if (editorMode === 'hackmd') {

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

@@ -39,14 +39,13 @@ type ConflictDiffModalProps = {
 };
 
 export const ConflictDiffModal: FC<ConflictDiffModalProps> = (props) => {
-  const resolvedRevision = useRef<string>('');
-  const [isUnselected, setIsUnselected] = useState<boolean>(false);
+  const resolvedRevision = useRef<string>(INITIAL_TEXT);
+  const [isRevisionselected, setIsRevisionselected] = useState<boolean>(false);
   const { t } = useTranslation('');
 
   const { pageContainer } = props;
   const { request, origin, latest } = pageContainer.state.revisionsOnConflict || { request: {}, origin: {}, latest: {} };
 
-
   const onCancel = () => {
     if (props.onCancel != null) {
       props.onCancel();
@@ -54,6 +53,8 @@ export const ConflictDiffModal: FC<ConflictDiffModalProps> = (props) => {
   };
 
   const onResolveConflict = () : void => {
+    // disable button after clicked
+    setIsRevisionselected(false);
     pageContainer.setState({
       revisionId: pageContainer.state.revisionsOnConflict?.latest.revisionId,
     }, async() => {
@@ -105,6 +106,7 @@ export const ConflictDiffModal: FC<ConflictDiffModalProps> = (props) => {
                     type="button"
                     className="btn btn-primary"
                     onClick={() => {
+                      setIsRevisionselected(true);
                       resolvedRevision.current = pageContainer.state.revisionsOnConflict?.request.revisionBody;
                     }}
                   >
@@ -139,6 +141,7 @@ export const ConflictDiffModal: FC<ConflictDiffModalProps> = (props) => {
                     type="button"
                     className="btn btn-primary"
                     onClick={() => {
+                      setIsRevisionselected(true);
                       resolvedRevision.current = pageContainer.state.revisionsOnConflict?.origin.revisionBody;
                     }}
                   >
@@ -173,6 +176,7 @@ export const ConflictDiffModal: FC<ConflictDiffModalProps> = (props) => {
                     type="button"
                     className="btn btn-primary"
                     onClick={() => {
+                      setIsRevisionselected(true);
                       resolvedRevision.current = pageContainer.state.revisionsOnConflict?.latest.revisionBody;
                     }}
                   >
@@ -182,7 +186,7 @@ export const ConflictDiffModal: FC<ConflictDiffModalProps> = (props) => {
                 </div>
               </div>
               <div className="col-12 border border-dark">
-                <h3 className="font-weight-bold my-2">Selected Revision(Editable)</h3>
+                <h3 className="font-weight-bold my-2">{t('selected_editable_revision')}</h3>
                 <CodeMirror
                   value={resolvedRevision.current}
                   options={{
@@ -191,11 +195,8 @@ export const ConflictDiffModal: FC<ConflictDiffModalProps> = (props) => {
                     tabSize: 2,
                     indentUnit: 2,
                   }}
-                  onChange={(editorqq, dataqq, value) => {
-                    // SetResolvedRevision(value);
-                    // console.log(value);
-                    resolvedRevision.current = value;
-                    console.log('res:', resolvedRevision.current);
+                  onChange={(editor, data, allText) => {
+                    resolvedRevision.current = allText;
                   }}
                 />
               </div>
@@ -216,7 +217,7 @@ export const ConflictDiffModal: FC<ConflictDiffModalProps> = (props) => {
           type="button"
           className="btn btn-primary ml-3"
           onClick={onResolveConflict}
-          disabled={isUnselected}
+          disabled={!isRevisionselected}
         >
           {t('modal_resolve_conflict.resolve_and_save')}
         </button>

packages/app/src/components/PageStatusAlert.jsx

@@ -113,7 +113,7 @@ class PageStatusAlert extends React.Component {
     const isHackmdDocumentOutdated = revisionIdHackmdSynced !== remoteRevisionId;
 
     let getContentsFunc = null;
-
+    console.log('isConflictingOnSave:', isConflictingOnSave);
     // when conflicting on save
     if (isConflictingOnSave) {
       getContentsFunc = this.getContentsForRevisionOutdated;
@@ -137,6 +137,9 @@ class PageStatusAlert extends React.Component {
 
     const [additionalClasses, label, btn] = getContentsFunc();
 
+    console.log('return:', additionalClasses, label, btn);
+    this.props.pageContainer.setState({ isConflictDiffModalOpen: true });
+
     return (
       <div className={`card grw-page-status-alert text-white fixed-bottom animated fadeInUp faster ${additionalClasses.join(' ')}`}>
         <div className="card-body">

packages/app/src/components/SavePageControls.jsx

@@ -49,7 +49,6 @@ class SavePageControls extends React.Component {
     }
     catch (error) {
       logger.error('failed to save', error);
-      console.log(error);
       pageContainer.showErrorToastr(error);
       if (error.code === 'conflict') {
         pageContainer.setState({