From 0b4a8215e3e3e3662ebdae72d892f40b2f24d078 Mon Sep 17 00:00:00 2001
From: sballesteros <sebastien.ballesteros@gmail.com>
Date: Fri, 11 Oct 2019 16:11:56 +0200
Subject: [PATCH] poor man redux

---
 src/components/home.js          | 13 +++---
 src/components/new-preprint.js  | 80 ++++++++++++++-------------------
 src/components/shell-content.js |  5 ++-
 src/hooks/api-hooks.js          | 28 +++++++++++-
 src/stores/preprint-stores.js   |  4 +-
 src/utils/ids.js                | 27 +++++++++++
 6 files changed, 100 insertions(+), 57 deletions(-)

diff --git a/src/components/home.js b/src/components/home.js
index ba91ff9..3502e79 100644
--- a/src/components/home.js
+++ b/src/components/home.js
@@ -77,11 +77,14 @@ export default function Home() {
                   console.log(action);
                   history.push('/');
                 }}
-                onViewInContext={({ identifier, preprint, tab }) => {
-                  history.push(`/${unprefix(identifier)}`, {
-                    preprint,
-                    tab
-                  });
+                onViewInContext={({ preprint, tab }) => {
+                  history.push(
+                    `/${unprefix(preprint.doi || preprint.arXivId)}`,
+                    {
+                      preprint,
+                      tab
+                    }
+                  );
                 }}
               />
             </Modal>
diff --git a/src/components/new-preprint.js b/src/components/new-preprint.js
index 3f53aa2..9e9e545 100644
--- a/src/components/new-preprint.js
+++ b/src/components/new-preprint.js
@@ -5,6 +5,7 @@ import identifiersArxiv from 'identifiers-arxiv';
 import doiRegex from 'doi-regex';
 import { format } from 'date-fns';
 import Value from './value';
+import { createPreprintIdentifierCurie } from '../utils/ids';
 import { getId, arrayify, unprefix } from '../utils/jsonld';
 import { usePostAction, usePreprint } from '../hooks/api-hooks';
 import RapidFormFragment from './rapid-form-fragment';
@@ -45,6 +46,8 @@ export default function NewPreprint({
       : 'NEW_PREPRINT'
   );
 
+  if (!preprint) return null;
+
   return (
     <div className="new-preprint">
       {step === 'NEW_PREPRINT' ? (
@@ -61,7 +64,6 @@ export default function NewPreprint({
           onCancel={e => {
             setStep('NEW_PREPRINT');
           }}
-          identifier={identifier}
           preprint={preprint}
           onReviewed={onReviewed}
           onViewInContext={onViewInContext}
@@ -71,7 +73,6 @@ export default function NewPreprint({
           onCancel={e => {
             setStep('NEW_PREPRINT');
           }}
-          identifier={identifier}
           preprint={preprint}
           onRequested={onRequested}
           onViewInContext={onViewInContext}
@@ -159,43 +160,43 @@ function StepPreprint({
           value={value}
         />
         {/* <label
-          htmlFor="step-preprint-input"
-          className="step-preprint__input-label step-preprint__input-label--large"
-        >
-          Enter a <abbr title="Digital Object Identifier">DOI</abbr> or an arXiv
-          ID
-        </label>
+            htmlFor="step-preprint-input"
+            className="step-preprint__input-label step-preprint__input-label--large"
+            >
+            Enter a <abbr title="Digital Object Identifier">DOI</abbr> or an arXiv
+            ID
+            </label>
 
-        <input
-          id="step-preprint-input"
-          className="step-preprint__text-input"
-          type="text"
-          autoComplete="off"
-          placeholder=""
-          onChange={e => {
+            <input
+            id="step-preprint-input"
+            className="step-preprint__text-input"
+            type="text"
+            autoComplete="off"
+            placeholder=""
+            onChange={e => {
             const value = e.target.value;
             const [arxivId] = identifiersArxiv.extract(value);
             let nextIdentifier;
             if (arxivId) {
-              nextIdentifier = `arXiv:${arxivId}`;
+            nextIdentifier = `arXiv:${arxivId}`;
             } else {
-              const doiMatch = value.match(doiRegex());
-              const doi = doiMatch && doiMatch[0];
-              if (doi) {
-                nextIdentifier = `doi:${doi}`;
-              } else {
-                nextIdentifier = '';
-              }
+            const doiMatch = value.match(doiRegex());
+            const doi = doiMatch && doiMatch[0];
+            if (doi) {
+            nextIdentifier = `doi:${doi}`;
+            } else {
+            nextIdentifier = '';
+            }
             }
 
             if (nextIdentifier !== identifier) {
-              onIdentifier(nextIdentifier);
+            onIdentifier(nextIdentifier);
             }
 
             setValue(value);
-          }}
-          value={value}
-        /> */}
+            }}
+            value={value}
+            /> */}
       </div>
 
       {preprint ? (
@@ -250,13 +251,7 @@ StepPreprint.propTypes = {
   resolvePreprintStatus: PropTypes.object.isRequired
 };
 
-function StepReview({
-  identifier,
-  preprint,
-  onViewInContext,
-  onCancel,
-  onReviewed
-}) {
+function StepReview({ preprint, onViewInContext, onCancel, onReviewed }) {
   const [user] = useUser();
   const [post, postData] = usePostAction();
   const [answerMap, setAnswerMap] = useState({}); // TODO read from local storage ?
@@ -299,7 +294,7 @@ function StepReview({
                   '@type': 'RapidPREreviewAction',
                   actionStatus: 'CompletedActionStatus',
                   agent: getId(arrayify(user.hasRole)[0]),
-                  object: identifier,
+                  object: createPreprintIdentifierCurie(preprint),
                   resultReview: {
                     '@type': 'RapidPREreview',
                     reviewAnswer: getReviewAnswers(answerMap)
@@ -315,7 +310,6 @@ function StepReview({
           <Button
             onClick={e => {
               onViewInContext({
-                identifier,
                 preprint,
                 tab: 'review',
                 answerMap
@@ -331,20 +325,13 @@ function StepReview({
   );
 }
 StepReview.propTypes = {
-  identifier: PropTypes.string.isRequired,
   preprint: PropTypes.object.isRequired,
   onCancel: PropTypes.func.isRequired,
   onReviewed: PropTypes.func.isRequired,
   onViewInContext: PropTypes.func.isRequired
 };
 
-function StepRequest({
-  identifier,
-  preprint,
-  onViewInContext,
-  onCancel,
-  onRequested
-}) {
+function StepRequest({ preprint, onViewInContext, onCancel, onRequested }) {
   const [user] = useUser();
   const [post, postData] = usePostAction();
 
@@ -370,7 +357,7 @@ function StepRequest({
                 '@type': 'RequestForRapidPREreviewAction',
                 actionStatus: 'CompletedActionStatus',
                 agent: getId(arrayify(user.hasRole)[0]),
-                object: identifier
+                object: createPreprintIdentifierCurie(preprint)
               },
               onRequested
             );
@@ -381,7 +368,7 @@ function StepRequest({
         </Button>
         <Button
           onClick={e => {
-            onViewInContext({ identifier, preprint, tab: 'request' });
+            onViewInContext({ preprint, tab: 'request' });
           }}
           disabled={postData.isActive}
         >
@@ -392,7 +379,6 @@ function StepRequest({
   );
 }
 StepRequest.propTypes = {
-  identifier: PropTypes.string.isRequired,
   preprint: PropTypes.object.isRequired,
   onCancel: PropTypes.func.isRequired,
   onRequested: PropTypes.func.isRequired,
diff --git a/src/components/shell-content.js b/src/components/shell-content.js
index 9cb9d7d..052ce0c 100644
--- a/src/components/shell-content.js
+++ b/src/components/shell-content.js
@@ -8,6 +8,7 @@ import Button from './button';
 import RapidFormFragment from './rapid-form-fragment';
 import { getReviewAnswers, checkIfAllAnswered } from '../utils/actions';
 import { getId, arrayify } from '../utils/jsonld';
+import { createPreprintIdentifierCurie } from '../utils/ids';
 
 // TODO required login modal
 
@@ -137,7 +138,7 @@ function ShellContentReview({ preprint, onSubmit, disabled, error }) {
                 '@type': 'RapidPREreviewAction',
                 actionStatus: 'CompletedActionStatus',
                 agent: getId(arrayify(user.hasRole)[0]),
-                object: preprint.doi || preprint.arXivId,
+                object: createPreprintIdentifierCurie(preprint),
                 resultReview: {
                   '@type': 'RapidPREreview',
                   reviewAnswer: getReviewAnswers(answerMap)
@@ -173,7 +174,7 @@ function ShellContentRequest({ preprint, onSubmit, disabled, error }) {
               '@type': 'RequestForRapidPREreviewAction',
               actionStatus: 'CompletedActionStatus',
               agent: getId(arrayify(user.hasRole)[0]),
-              object: preprint.doi || preprint.arXivId
+              object: createPreprintIdentifierCurie(preprint)
             });
           }}
         >
diff --git a/src/hooks/api-hooks.js b/src/hooks/api-hooks.js
index ecac50e..3aa37cb 100644
--- a/src/hooks/api-hooks.js
+++ b/src/hooks/api-hooks.js
@@ -281,6 +281,32 @@ export function usePreprintSearchResults(
 
   const [results, setResults] = useState(defaultResults);
 
+  useEffect(() => {
+    // keep `results` up-to-date
+    function update(preprint) {
+      if (
+        arrayify(results.rows).some(row => getId(row.doc) === getId(preprint))
+      ) {
+        setResults(prevResults => {
+          return Object.assign({}, prevResults, {
+            rows: arrayify(prevResults.rows).map(row => {
+              if (!row.doc || getId(row.doc) !== getId(preprint)) {
+                return row;
+              }
+              return Object.assign({}, row, { doc: preprint });
+            })
+          });
+        });
+      }
+    }
+
+    preprintsWithActionsStore.addListener('SET', update);
+
+    return () => {
+      preprintsWithActionsStore.removeListener('SET', update);
+    };
+  }, [results]);
+
   useEffect(() => {
     setProgress({
       isActive: true,
@@ -310,7 +336,7 @@ export function usePreprintSearchResults(
       .then(data => {
         arrayify(data.rows).forEach(row => {
           if (row.doc) {
-            preprintsWithActionsStore.set(row.doc, { emit: !false });
+            preprintsWithActionsStore.set(row.doc, { emit: false });
           }
         });
 
diff --git a/src/stores/preprint-stores.js b/src/stores/preprint-stores.js
index 510b716..ecf3fba 100644
--- a/src/stores/preprint-stores.js
+++ b/src/stores/preprint-stores.js
@@ -61,12 +61,12 @@ class PreprintsWithActionsStore extends EventEmitter {
         action['@type'] === 'RequestForRapidPREreviewAction') &&
       getId(action.object)
     ) {
-      const preprint = this.peek(createPreprintId(getId(action.object)));
+      const preprint = this.peek(createPreprintId(action.object));
 
       if (preprint) {
         const nextPreprint = Object.assign({}, preprint, {
           potentialAction: arrayify(preprint.potentialAction)
-            .filter(_action => getId(_action) === getId(action))
+            .filter(_action => getId(_action) !== getId(action))
             .concat(action)
         });
         this.set(nextPreprint);
diff --git a/src/utils/ids.js b/src/utils/ids.js
index 5ef0b7f..27475b7 100644
--- a/src/utils/ids.js
+++ b/src/utils/ids.js
@@ -43,3 +43,30 @@ export function createPreprintId(
 
   return `preprint:${vendor}-${slug(unprefix(id).replace('/', '-'))}`;
 }
+
+export function createPreprintIdentifierCurie(
+  value // preprint or identifer (arXivId or DOI, unprefixed)
+) {
+  if (!value) {
+    throw createError(500, `invalid value for createIdentifierCurie`);
+  }
+
+  if (value.doi) {
+    return `doi:${value.doi}`;
+  } else if (value.arXivId) {
+    return `arXiv:${value.arXivId}`;
+  } else {
+    const id = getId(value);
+    if (!id) {
+      throw createError(500, `invalid value for createIdentifierCurie`);
+    }
+
+    if (doiRegex().test(id)) {
+      return `doi:${value.doi}`;
+    } else if (identifiersArxiv.extract(id)[0]) {
+      return `arXiv:${value.arXivId}`;
+    } else {
+      throw createError(500, `invalid value for createIdentifierCurie`);
+    }
+  }
+}