fix(openalex): Add missing attribute

dataesr · Nov 8, 2024 · 9714a89 · 9714a89
1 parent b28ebd0
commit 9714a89
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 19 deletions.
diff --git a/client/src/pages/openalex-ror/export-errors-button.jsx b/client/src/pages/openalex-ror/export-errors-button.jsx
@@ -3,7 +3,7 @@ import { useSearchParams } from 'react-router-dom';
 
 import ButtonDropdown from '../../components/button-dropdown';
 
-export default function ActionsOpenalex({
+export default function ExportErrorsButton({
   allOpenalexCorrections,
 }) {
   const [searchParams] = useSearchParams();
@@ -18,7 +18,7 @@ export default function ActionsOpenalex({
   );
 }
 
-ActionsOpenalex.propTypes = {
+ExportErrorsButton.propTypes = {
   allOpenalexCorrections: PropTypes.arrayOf(PropTypes.shape({
     correctedRors: PropTypes.string.isRequired,
     rawAffiliationString: PropTypes.string.isRequired,

diff --git a/client/src/pages/openalex-ror/openalexTab.jsx b/client/src/pages/openalex-ror/openalexTab.jsx
@@ -1,26 +1,27 @@
 import {
   Button,
-  Container, Row, Col,
+  Col,
+  Container,
   Modal, ModalContent, ModalFooter, ModalTitle,
-  TagGroup, Tag,
+  Row,
   TextInput,
 } from '@dataesr/dsfr-plus';
 import PropTypes from 'prop-types';
 import { useEffect, useState } from 'react';
 
-import ExportErrorsButton from './export-errors-button';
-import SendFeedbackButton from './send-feedback-button';
 import { status } from '../../config';
 import { getAffiliationsCorrections } from '../../utils/curations';
 import { isRor } from '../../utils/ror';
 import { capitalize, removeDiacritics } from '../../utils/strings';
+import ExportErrorsButton from './export-errors-button';
 import OpenalexView from './openalexView';
+import SendFeedbackButton from './send-feedback-button';
 
 export default function OpenalexTab({
   affiliations,
+  allOpenalexCorrections,
   options,
   setAllOpenalexCorrections,
-  allOpenalexCorrections,
   undo,
 }) {
   const [action, setAction] = useState();
@@ -88,10 +89,10 @@ export default function OpenalexTab({
         <ModalContent>
           <TextInput
             label={`Which ROR do you want to ${action} ?`}
-            onChange={(e) => setRor(e.target.value)}
-            required
             message={isRor(ror) ? 'ROR valid' : 'ROR invalid'}
             messageType={isRor(ror) ? 'valid' : 'error'}
+            onChange={(e) => setRor(e.target.value)}
+            required
           />
         </ModalContent>
         <ModalFooter>
@@ -116,7 +117,6 @@ export default function OpenalexTab({
                 <span>{selectedOpenAlex.length}</span>
                 {` selected affiliation${selectedOpenAlex.length === 1 ? '' : 's'}`}
               </span>
-
               <Button
                 className="fr-ml-5w fr-mr-1w"
                 color="beige-gris-galet"
@@ -132,7 +132,6 @@ export default function OpenalexTab({
               >
                 Add ROR
               </Button>
-
               <Button
                 className="fr-mr-1w"
                 color="beige-gris-galet"
@@ -148,12 +147,10 @@ export default function OpenalexTab({
               >
                 Remove ROR
               </Button>
-
               <ExportErrorsButton
                 allOpenalexCorrections={allOpenalexCorrections}
                 options={options}
               />
-
               <SendFeedbackButton
                 allOpenalexCorrections={allOpenalexCorrections}
               />
@@ -162,7 +159,6 @@ export default function OpenalexTab({
               actions relatives au tableau du dessous
             </div>
           </div>
-
           <OpenalexView
             allAffiliations={filteredAffiliations}
             filteredAffiliationName={filteredAffiliationName}
@@ -189,6 +185,21 @@ OpenalexTab.propTypes = {
       worksNumber: PropTypes.number.isRequired,
     }),
   ).isRequired,
+  allOpenalexCorrections: PropTypes.arrayOf(PropTypes.shape({
+    correctedRors: PropTypes.string.isRequired,
+    rawAffiliationString: PropTypes.string.isRequired,
+    rorsInOpenAlex: PropTypes.arrayOf(PropTypes.shape({
+      rorCountry: PropTypes.string.isRequired,
+      rorId: PropTypes.string.isRequired,
+      rorName: PropTypes.string.isRequired,
+    })).isRequired,
+    worksExample: PropTypes.arrayOf(PropTypes.shape({
+      id_type: PropTypes.string.isRequired,
+      id_value: PropTypes.string.isRequired,
+    })).isRequired,
+    worksOpenAlex: PropTypes.arrayOf(PropTypes.string).isRequired,
+  })).isRequired,
+  options: PropTypes.object.isRequired,
   setAllOpenalexCorrections: PropTypes.func.isRequired,
   undo: PropTypes.func.isRequired,
 };
diff --git a/client/src/pages/openalex-ror/openalexView.jsx b/client/src/pages/openalex-ror/openalexView.jsx
@@ -170,26 +170,26 @@ OpenalexView.propTypes = {
   allAffiliations: PropTypes.arrayOf(
     PropTypes.shape({
       name: PropTypes.string.isRequired,
-      source: PropTypes.string.isRequired,
       nameHtml: PropTypes.string.isRequired,
+      source: PropTypes.string.isRequired,
       status: PropTypes.string.isRequired,
       works: PropTypes.arrayOf(PropTypes.string).isRequired,
       worksNumber: PropTypes.number.isRequired,
     }),
   ).isRequired,
-  setAllOpenalexCorrections: PropTypes.func.isRequired,
-  setFilteredAffiliationName: PropTypes.func.isRequired,
   filteredAffiliationName: PropTypes.string.isRequired,
   selectedOpenAlex: PropTypes.arrayOf(
     PropTypes.shape({
       name: PropTypes.string.isRequired,
-      source: PropTypes.string.isRequired,
       nameHtml: PropTypes.string.isRequired,
+      source: PropTypes.string.isRequired,
       status: PropTypes.string.isRequired,
       works: PropTypes.arrayOf(PropTypes.string).isRequired,
       worksNumber: PropTypes.number.isRequired,
     }),
   ).isRequired,
+  setAllOpenalexCorrections: PropTypes.func.isRequired,
+  setFilteredAffiliationName: PropTypes.func.isRequired,
   setSelectedOpenAlex: PropTypes.func.isRequired,
   undo: PropTypes.func.isRequired,
 };
diff --git a/client/src/pages/openalex-ror/results.jsx b/client/src/pages/openalex-ror/results.jsx
@@ -113,7 +113,6 @@ export default function Affiliations() {
             </Col>
           </Row>
         )}
-
         {!isFetching && isFetched && (
           <>
             <Row className="wm-bg">
@@ -134,6 +133,7 @@ export default function Affiliations() {
               affiliations={affiliations.filter(
                 (affiliation) => affiliation.source === 'OpenAlex',
               )}
+              allOpenalexCorrections={allOpenalexCorrections}
               options={options}
               setAllOpenalexCorrections={setAllOpenalexCorrections}
               undo={undo}