remove ts any, wip

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

@@ -6,16 +6,13 @@ import {
 import { parseISO, format } from 'date-fns';
 import { useTranslation } from 'react-i18next';
 // TODO: consider whether to use codemirrorEditor
-import { UnControlled as CodeMirrorAny } from 'react-codemirror2';
+import { UnControlled as CodeMirror } from 'react-codemirror2';
 import PageContainer from '../../client/services/PageContainer';
 import EditorContainer from '../../client/services/EditorContainer';
 
 require('codemirror/mode/htmlmixed/htmlmixed');
 const DMP = require('diff_match_patch');
 
-// avoid typescript type error
-const CodeMirror:any = CodeMirrorAny;
-
 Object.keys(DMP).forEach((key) => { window[key] = DMP[key] });
 
 type ConflictDiffModalProps = {

packages/app/src/server/routes/page.js

@@ -830,7 +830,8 @@ module.exports = function(crowi, app) {
     // check revision
     const Revision = crowi.model('Revision');
     let page = await Page.findByIdAndViewer(pageId, req.user);
-    if (page != null && revisionId != null && !page.isUpdatable(revisionId)) {
+    if (page != null && revisionId != null && !page.isUpdatable('234k2345kj234jh5j5')) {
+    // if (page != null && revisionId != null && !page.isUpdatable(revisionId)) {
       const populatedFields = 'name imageUrlCached';
       // when isUpdatable is false, originRevisionId is a reqested revisionId
       const originRevision = await Revision.findById(revisionId).populate('author', populatedFields);