feat: reintroduce editor tab to decision page

app/components/component-review/src/components/DecisionPage.js

@@ -10,20 +10,20 @@ import AssignEditorsReviewers from './assignEditors/AssignEditorsReviewers'
 import AssignEditor from './assignEditors/AssignEditor'
 import ReviewMetadata from './metadata/ReviewMetadata'
 import Decision from './decision/Decision'
-// import EditorSection from './EditorSection'
+import EditorSection from './decision/EditorSection'
 import { AdminSection, Columns, Manuscript, Chat } from './style'
 
-// const addEditor = (manuscript, label) => ({
-//   content: <EditorSection manuscript={manuscript} />,
-//   key: manuscript.id,
-//   label,
-// })
-
 import { Spinner } from '../../../shared'
 
 import { getCommentContent } from './review/util'
 import MessageContainer from '../../../component-chat/src'
 
+const addEditor = (manuscript, label) => ({
+  content: <EditorSection manuscript={manuscript} />,
+  key: `editor_${manuscript.id}`,
+  label,
+})
+
 const reviewFields = `
   id
   created
@@ -86,6 +86,7 @@ const fragmentFields = `
   }
   status
   meta {
+    manuscriptId
     title
     source
     abstract
@@ -245,10 +246,48 @@ const decisionSections = ({
     })
   }, [])
 
+  const decisionSection = {
+    content: (
+      <>
+        <AdminSection key="assign-editors">
+          <AssignEditorsReviewers
+            AssignEditor={AssignEditor}
+            manuscript={manuscript}
+          />
+        </AdminSection>
+        <AdminSection key="review-metadata">
+          <ReviewMetadata manuscript={manuscript} />
+        </AdminSection>
+        <AdminSection key="decision-review">
+          <DecisionReviews manuscript={manuscript} />
+        </AdminSection>
+        <AdminSection key="decision-form">
+          <DecisionForm
+            handleSubmit={handleSubmit}
+            isValid={isValid}
+            updateReview={updateReview}
+            uploadFile={uploadFile}
+          />
+        </AdminSection>
+      </>
+    ),
+    key: manuscript.id,
+    label: 'Metadata',
+  }
+
+  const editorSection = addEditor(manuscript, 'Content')
+
   if (manuscript.status !== 'revising') {
     decisionSections.push({
       content: (
-        <>
+        <Tabs
+          activeKey={manuscript.id}
+          sections={[decisionSection, editorSection]}
+          title="Manuscript"
+        />
+      ),
+      /*
+
           <AdminSection key="assign-editors">
             <AssignEditorsReviewers
               AssignEditor={AssignEditor}
@@ -270,7 +309,8 @@ const decisionSections = ({
             />
           </AdminSection>
         </>
-      ),
+      ), */
+
       key: manuscript.id,
       label: dateLabel(),
     })
@@ -289,6 +329,8 @@ const decisionSections = ({
 //   if (manuscript.status !== 'revising') {
 //     editorSections.push(addEditor(manuscript, dateLabel()))
 //   }
+
+//   return editorSections
 // }
 
 const DecisionPage = ({ match }) => {
@@ -385,37 +427,6 @@ const DecisionPage = ({ match }) => {
       },
     })
   }
-  // const manuscriptFragment = cache.readFragment({
-  //   id: cache.identify(manuscript),
-  //   fragment: gql`
-  //     fragment MyManuscript on Manuscript {
-  //       id
-  //       reviews
-  //     }
-  //   `,
-  // })
-
-  // cache.writeFragment()
-
-  // const reviewIndex = data.manuscript.reviews.findIndex(
-  //   review => review.id === updateReview.id,
-  // )
-  // if (reviewIndex < 0) {
-  //   data.manuscript.reviews.push(updateReview)
-  // } else {
-  //   data.manuscript.reviews[reviewIndex] = updateReview
-  // }
-  // cache.writeQuery({ query, data })
-  //   },
-  // },
-  //   }).then(() => {
-  //     history.push('/dashboard')
-  //   })
-  // }
-
-  //
-
-  // console.log(props)
 
   const initialValues = (manuscript.reviews &&
     manuscript.reviews.find(review => review.isDecision)) || {
@@ -423,6 +434,8 @@ const DecisionPage = ({ match }) => {
     recommendation: null,
   }
 
+  // const editorSectionsResult = editorSections({ manuscript })
+
   return (
     <Columns>
       <Manuscript>
@@ -460,30 +473,34 @@ const DecisionPage = ({ match }) => {
         >
           {props => (
             // Temp
-            /* <Tabs
-              activeKey={editorSections[editorSections.length - 1].key}
-              sections={editorSections}
-              title="Versions"
-            /> */
-            <Tabs
-              activeKey={
-                decisionSections({
+            <>
+              {/* <Tabs
+                activeKey={
+                  editorSectionsResult[editorSectionsResult.length - 1].key
+                }
+                sections={editorSectionsResult}
+                title="Versions"
+              /> */}
+              <Tabs
+                activeKey={
+                  decisionSections({
+                    manuscript,
+                    handleSubmit: props.handleSubmit,
+                    isValid: props.isValid,
+                    updateReview,
+                    uploadFile,
+                  })[decisionSections.length - 1].key
+                }
+                sections={decisionSections({
                   manuscript,
                   handleSubmit: props.handleSubmit,
                   isValid: props.isValid,
                   updateReview,
                   uploadFile,
-                })[decisionSections.length - 1].key
-              }
-              sections={decisionSections({
-                manuscript,
-                handleSubmit: props.handleSubmit,
-                isValid: props.isValid,
-                updateReview,
-                uploadFile,
-              })}
-              title="Versions"
-            />
+                })}
+                title="Versions"
+              />
+            </>
           )}
         </Formik>
       </Manuscript>

app/components/component-review/src/components/ReviewPage.js

@@ -87,6 +87,7 @@ const fragmentFields = `
   }
   status
   meta {
+    manuscriptId
     title
     source
     abstract

app/components/component-review/src/components/decision/EditorSection.js

 import React from 'react'
-import { Wax /*, CreateSchema */ } from 'wax-prosemirror-core'
+import Wax from '../../../../wax-collab/src/Editoria'
 // import { XpubSchema } from 'wax-prosemirror-schema'
 // import 'wax-prosemirror-themes/themes/default-theme.css'
 
 import { EditorWrapper, Info } from '../style'
 
-const options = {
-  // schema: new CreateSchema(XpubSchema),
-}
+// const options = {
+//   // schema: new CreateSchema(XpubSchema),
+// }
 
 export default ({ manuscript }) =>
   ((manuscript.files || []).find(file => file.fileType === 'manuscript') || '')
@@ -15,11 +15,10 @@ export default ({ manuscript }) =>
   'application/vnd.openxmlformats-officedocument.wordprocessingml.document' ? (
     <EditorWrapper>
       <Wax
-        key={manuscript.id}
-        options={options}
+        // fileUpload={fileUpload}
+        // onChange={source => updateManuscript({ source })}
+        content={manuscript.meta.source}
         readonly
-        theme="default"
-        value={manuscript.meta.source}
       />
     </EditorWrapper>
   ) : (