Merge branch 'staging'

dataesr · Aug 21, 2024 · bbaa78b · bbaa78b
2 parents f1b23c0 + 5b9e606
commit bbaa78b
Show file tree

Hide file tree

Showing 12 changed files with 125 additions and 60 deletions.
diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
@@ -70,7 +70,7 @@ jobs:
           config_file: .github/config/changelog.js
 
       - name: 📦 Create release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

diff --git a/client/src/components/button-dropdown/index.jsx b/client/src/components/button-dropdown/index.jsx
@@ -34,7 +34,7 @@ export default function ButtonDropdown({ className, data, label, searchParams })
         icon="save-line"
         size="sm"
       >
-        {`Export ${label}`}
+        {`Export ${label} (${data.length})`}
       </Button>
       <div className="dropdown-content">
         <Button

diff --git a/client/src/config.js b/client/src/config.js
@@ -33,7 +33,11 @@ const status = {
 const correction = {
   corrected: {
     badgeType: 'error',
-    label: 'CORRECTION',
+    label: 'MODIFIED',
+  },
+  reset: {
+    badgeType: 'info',
+    label: 'CANCEL',
   },
   notcorrected: {
     badgeType: 'info',

diff --git a/client/src/pages/actions/actionsOpenalexFeedback.jsx b/client/src/pages/actions/actionsOpenalexFeedback.jsx
@@ -75,12 +75,13 @@ export default function ActionsOpenalexFeedback({ allOpenalexCorrections }) {
 }
 
 ActionsOpenalexFeedback.propTypes = {
-  allOpenalexCorrections: PropTypes.arrayOf(PropTypes.shape({
-    affiliations: PropTypes.arrayOf(PropTypes.object),
-    allIds: PropTypes.arrayOf(PropTypes.object).isRequired,
-    datasource: PropTypes.arrayOf(PropTypes.string).isRequired,
-    id: PropTypes.string.isRequired,
-    status: PropTypes.string.isRequired,
-    type: PropTypes.string.isRequired,
-  })).isRequired,
+  allOpenalexCorrections: PropTypes.arrayOf(
+    PropTypes.shape({
+      rawAffiliationString: PropTypes.string.isRequired,
+      rorsInOpenAlex: PropTypes.arrayOf(PropTypes.object).isRequired,
+      correctedRors: PropTypes.string.isRequired,
+      worksExample: PropTypes.arrayOf(PropTypes.object).isRequired,
+      worksOpenAlex: PropTypes.arrayOf(PropTypes.string).isRequired,
+    }),
+  ).isRequired,
 };
diff --git a/client/src/pages/openalexTab.jsx b/client/src/pages/openalexTab.jsx
@@ -4,6 +4,7 @@ import { useEffect, useState } from 'react';
 
 import { status } from '../config';
 import OpenalexView from './openalexView';
+import { getCorrections } from '../utils/openalex';
 import { removeDiacritics } from '../utils/strings';
 
 export default function OpenalexTab({ affiliations, setAllOpenalexCorrections }) {
@@ -21,6 +22,11 @@ export default function OpenalexTab({ affiliations, setAllOpenalexCorrections })
         const regex = new RegExp(removeDiacritics(filteredAffiliationName));
         return regex.test(affiliation.key.replace('[ source: ', '').replace(' ]', ''));
       });
+      // recompute corrections only when the array has changed
+      if (filteredAffiliationsTmp.length !== filteredAffiliations.length) {
+        const newCorrections = getCorrections(filteredAffiliationsTmp);
+        setAllOpenalexCorrections(newCorrections);
+      }
       setFilteredAffiliations(filteredAffiliationsTmp);
     }, 500);
     setTimer(timerTmp);

diff --git a/client/src/pages/openalexView.jsx b/client/src/pages/openalexView.jsx
@@ -1,11 +1,12 @@
-import { Col, Row, Toggle } from '@dataesr/dsfr-plus';
+import { Button, Col, Row, Toggle } from '@dataesr/dsfr-plus';
 import { Column } from 'primereact/column';
 import { DataTable } from 'primereact/datatable';
 import { InputTextarea } from 'primereact/inputtextarea';
 import PropTypes from 'prop-types';
 import { useState } from 'react';
 
 import useToast from '../hooks/useToast';
+import { getCorrections } from '../utils/openalex';
 import { isRor } from '../utils/ror';
 import {
   correctionTemplate,
@@ -24,11 +25,27 @@ export default function OpenalexView({
   const [selectionPageOnly, setSelectionPageOnly] = useState(true);
 
   const cellEditor = (options) => (
-    <InputTextarea
-      type="text"
-      value={options.value}
-      onChange={(e) => options.editorCallback(e.target.value)}
-    />
+    <Row gutters>
+      <Col>
+        <InputTextarea
+          type="text"
+          id="mytext"
+          value={options.value}
+          onChange={(e) => options.editorCallback(e.target.value)}
+        />
+      </Col>
+      <Col>
+        <Button
+          variant="info"
+          size="sm"
+          disabled={options.rowData.rors.map((r) => r.rorId).join(';') === options.value}
+          icon="delete-line"
+          onClick={() => { options.editorCallback(options.rowData.rors.map((r) => r.rorId).join(';')); }}
+        >
+          UNDO
+        </Button>
+      </Col>
+    </Row>
   );
   const { toast } = useToast();
 
@@ -50,19 +67,12 @@ export default function OpenalexView({
       });
       if (isValid) {
         data.rorsToCorrect = newValue;
-        data.hasCorrection = true;
-        const newCorrections = [];
-        allAffiliations
-          .filter((aff) => aff.hasCorrection)
-          .forEach((aff) => {
-            const correction = {
-              rawAffiliationString: aff.name,
-              rorsInOpenAlex: aff.rors,
-              correctedRors: aff.rorsToCorrect,
-              worksExample: aff.worksExample,
-            };
-            newCorrections.push(correction);
-          });
+        if (data.rors.map((r) => r.rorId).join(';') !== newValue) {
+          data.hasCorrection = true;
+        } else {
+          data.hasCorrection = false;
+        }
+        const newCorrections = getCorrections(allAffiliations);
         setAllOpenalexCorrections(newCorrections);
       }
     }
@@ -111,7 +121,7 @@ export default function OpenalexView({
       paginatorLeft={paginatorLeft}
       paginatorPosition="top bottom"
       paginatorTemplate="RowsPerPageDropdown FirstPageLink PrevPageLink CurrentPageReport NextPageLink LastPageLink"
-      rows={100}
+      rows={50}
       rowsPerPageOptions={[50, 100, 200, 500]}
       scrollable
       selectionPageOnly={selectionPageOnly}
@@ -131,39 +141,38 @@ export default function OpenalexView({
       />
       <Column
         field="rorHtml"
+        sortField="rorsNumber"
         header="RoR computed by OpenAlex"
         body={rorTemplate}
         style={{ maxWidth: '200px' }}
+        sortable
       />
       <Column
         field="rorsToCorrect"
         header="Click to improve / edit RoRs"
         body={correctionTemplate}
-        style={{ maxWidth: '200px' }}
+        style={{ maxWidth: '190px' }}
         editor={(options) => cellEditor(options)}
       />
       <Column
         rowEditor
         headerStyle={{ width: '10%', minWidth: '8rem' }}
         bodyStyle={{ textAlign: 'center' }}
+        style={{ maxWidth: '80px' }}
       />
       <Column
         field="hasCorrection"
         header="Modified by user?"
         body={hasCorrectionTemplate}
-        style={{ maxWidth: '120px' }}
+        style={{ maxWidth: '110px' }}
         sortable
       />
       <Column
         field="worksExamples"
-        header="Examples of works"
+        sortField="worksNumber"
+        header="Works"
         body={worksExampleTemplate}
-        style={{ maxWidth: '200px' }}
-      />
-      <Column
-        field="worksNumber"
-        header="Number of works"
-        style={{ maxWidth: '100px' }}
+        style={{ maxWidth: '150px' }}
         sortable
       />
     </DataTable>

diff --git a/client/src/pages/views/openalex.jsx b/client/src/pages/views/openalex.jsx
@@ -61,14 +61,15 @@ Openalex.propTypes = {
     works: PropTypes.arrayOf(PropTypes.string).isRequired,
     worksNumber: PropTypes.number.isRequired,
   })).isRequired,
-  allOpenalexCorrections: PropTypes.arrayOf(PropTypes.shape({
-    affiliations: PropTypes.arrayOf(PropTypes.object),
-    allIds: PropTypes.arrayOf(PropTypes.object).isRequired,
-    datasource: PropTypes.arrayOf(PropTypes.string).isRequired,
-    id: PropTypes.string.isRequired,
-    status: PropTypes.string.isRequired,
-    type: PropTypes.string.isRequired,
-  }).isRequired).isRequired,
+  allOpenalexCorrections: PropTypes.arrayOf(
+    PropTypes.shape({
+      rawAffiliationString: PropTypes.string.isRequired,
+      rorsInOpenAlex: PropTypes.arrayOf(PropTypes.object).isRequired,
+      correctedRors: PropTypes.string.isRequired,
+      worksExample: PropTypes.arrayOf(PropTypes.object).isRequired,
+      worksOpenAlex: PropTypes.arrayOf(PropTypes.string).isRequired,
+    }),
+  ).isRequired,
   setAllOpenalexCorrections: PropTypes.func.isRequired,
   options: PropTypes.object.isRequired,
 };
diff --git a/client/src/utils/openalex.jsx b/client/src/utils/openalex.jsx
@@ -0,0 +1,20 @@
+const getCorrections = (affiliations) => {
+  const newCorrections = [];
+  affiliations
+    .filter((aff) => aff.hasCorrection)
+    .forEach((aff) => {
+      const correction = {
+        rawAffiliationString: aff.name,
+        rorsInOpenAlex: aff.rors,
+        correctedRors: aff.rorsToCorrect,
+        worksExample: aff.worksExample,
+        worksOpenAlex: aff.worksOpenAlex,
+      };
+      newCorrections.push(correction);
+    });
+  return newCorrections;
+};
+
+export {
+  getCorrections,
+};
diff --git a/client/src/utils/templates.jsx b/client/src/utils/templates.jsx
@@ -39,9 +39,13 @@ const statusRowFilterTemplate = (options) => (
 const getIdsTemplate = (ids) => {
   let html = '<ul>';
   ids.forEach((id) => {
-    html += `<li key="${id.id_value}">${id.id_type}: `;
+    html += `<li key="${id.id_value}"> `;
     const idLink = getIdLink(id.id_type, id.id_value);
-    html += idLink ? `<a target="_blank" href="${idLink}">${id.id_value}</a>` : `<span>${id.id_value}</span>`;
+    let idValueDisplay = '';
+    if (id.id_value.length > 18) {
+      idValueDisplay = id.id_value.slice(0, 18).concat('..');
+    }
+    html += idLink ? `<a target="_blank" href="${idLink}">${idValueDisplay}</a>` : `<span>${id.id_value}</span>`;
     html += '</li>';
   });
   html += '</ul>';
@@ -118,16 +122,18 @@ const datasourceTemplate = (rowData) => {
 
 const correctionTemplate = (rowData) => {
   let html = '';
+  html = html.concat('<ul>');
   const rorsToCorrect = rowData.rorsToCorrect.split(';').map((item) => item.trim()).filter((item) => item.length > 0);
   if (rorsToCorrect.length > 0) {
-    html = html.concat('<ul>');
     rorsToCorrect.forEach((ror) => {
       html = html.concat(`<li key="ror-${ror}">${ror}</li>`);
     });
-    html = html.concat('</ul>');
-    if (rowData.hasCorrection) {
-      html = `<strong>${ html }</strong>`;
-    }
+  } else {
+    html = html.concat('<li key="noror"> </li>');
+  }
+  html = html.concat('</ul>');
+  if (rowData.hasCorrection) {
+    html = `<strong>${ html }</strong>`;
   }
   return <span dangerouslySetInnerHTML={{ __html: html }} />;
 };
@@ -136,8 +142,17 @@ const nameTemplate = (rowData) => <span dangerouslySetInnerHTML={{ __html: rowDa
 
 const statusTemplate = (rowData) => <Badge variant={status[rowData?.status ?? rowData]?.badgeType}>{status[rowData?.status ?? rowData]?.label}</Badge>;
 
+const resetCorrection = (rowData, allAffiliations) => {
+  console.log('ttt', rowData);
+  const row = { rowData };
+  row.rowData.hasCorrection = false;
+  row.rowData.rorsToCorrect = rowData.rors.map((e) => e.rorId).join(';');
+};
+
 const hasCorrectionTemplate = (rowData) => (rowData?.hasCorrection
-  ? <Badge variant={correction.corrected.badgeType}>{correction.corrected.label}</Badge>
+  ? (
+    <Badge variant={correction.corrected.badgeType}>{correction.corrected.label}</Badge>
+  )
   : '');
 
 export {

diff --git a/server/src/routes/github.routes.js b/server/src/routes/github.routes.js
@@ -24,7 +24,10 @@ const createIssue = (issue, email) => {
   body += `new_rors: ${issue.correctedRors}\n`;
   const previousRoRs = issue.rorsInOpenAlex.map((e) => e.rorId).join(';');
   body += `previous_rors: ${previousRoRs}\n`;
-  const workIds = issue.worksExample.filter((e) => e.id_type === 'openalex').map((e) => e.id_value).join(';');
+  let workIds = issue.worksExample.filter((e) => e.id_type === 'openalex').map((e) => e.id_value).join(';');
+  if (issue.worksOpenAlex) {
+    workIds = issue.worksOpenAlex.join(';');
+  }
   body += `works_examples: ${workIds}\n`;
   body += `contact: ${encrypt(email.split('@')[0])} @ ${email.split('@')[1]}\n`;
   octokit.rest.issues.create({

diff --git a/server/src/routes/works.routes.js b/server/src/routes/works.routes.js
@@ -7,6 +7,7 @@ import { chunkArray, countUniqueValues, range } from '../utils/utils';
 import { datasetsType, deduplicateWorks, getFosmWorks, getOpenAlexPublications, groupByAffiliations } from '../utils/works';
 
 const SEED_MAX = 2048;
+const USE_CACHE = true;
 
 const router = new express.Router();
 
@@ -48,7 +49,10 @@ const getData = async ({ options, resetCache = false }) => {
   const searchId = shasum.digest('hex');
   const queryId = Math.floor(Math.random() * SEED_MAX);
   console.time(`0. Query ${queryId} | Retrieve cache if exists ${options.affiliationStrings}`);
-  const cache = await getCache({ searchId });
+  let cache = false;
+  if (USE_CACHE) {
+    cache = await getCache({ searchId });
+  }
   console.timeEnd(`0. Query ${queryId} | Retrieve cache if exists ${options.affiliationStrings}`);
   if (cache && !resetCache) {
     const extractionDate = new Date(cache.extractionDate);

diff --git a/server/src/utils/works.js b/server/src/utils/works.js
@@ -467,7 +467,7 @@ const groupByAffiliations = ({ options, works }) => {
       if (toKeep[normalizedAffiliation]?.keepAffiliation) {
         if (deduplicatedAffiliations?.[normalizedAffiliation]) {
           deduplicatedAffiliations[normalizedAffiliation].works.push(id);
-          if (deduplicatedAffiliations[normalizedAffiliation].worksExample.length < 10) {
+          if (deduplicatedAffiliations[normalizedAffiliation].worksExample.length < 999) {
             deduplicatedAffiliations[normalizedAffiliation].worksExample.push(work.allIds);
           }
         } else {
@@ -478,6 +478,7 @@ const groupByAffiliations = ({ options, works }) => {
             name: affiliation.rawAffiliation,
             nameHtml: toKeep[normalizedAffiliation].displayAffiliation,
             rors: affiliation.rors || [],
+            rorsNumber: affiliation.rors?.length || 0,
             rorsToCorrect: (affiliation.rorsToCorrect || []).join(';'),
             source: affiliation.source,
             status: 'tobedecided',
@@ -498,8 +499,9 @@ const groupByAffiliations = ({ options, works }) => {
         ...affiliation,
         id: index.toString(),
         works: uniqueWorks,
-        worksExample: uniqueWorksExample,
+        worksExample: uniqueWorksExample.slice(0, 10),
         worksNumber: uniqueWorks.length,
+        worksOpenAlex: uniqueWorksExample.filter((w) => w.id_type === 'openalex').map((w) => w.id_value || 0).filter((w) => w !== 0),
       });
     });
   return allAffiliationsTmp;