Merge branch 'dev' of github.com:OPIDoR/dmp_opidor_react into dev

OPIDoR · Nov 26, 2024 · 9635bf6 · 9635bf6
2 parents 51856e4 + c33f958
commit 9635bf6
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/src/components/ExternalImport/OrcidList.jsx b/src/components/ExternalImport/OrcidList.jsx
@@ -114,7 +114,7 @@ function OrcidList({ fragment, setFragment, mapping = {} }) {
 
   return (
     <div style={{ position: "relative" }}>
-      {error && <CustomError />}
+      {error && <CustomError error={error} />}
       {!error && (
         <>
           <div className="row" style={{ margin: "10px" }}>

diff --git a/src/components/ExternalImport/RorList.jsx b/src/components/ExternalImport/RorList.jsx
@@ -148,7 +148,7 @@ function RorList({ fragment, setFragment, mapping = {} }) {
 
   return (
     <div style={{ position: 'relative' }}>
-      {error && <CustomError />}
+      {error && <CustomError error={error} />}
       {!error && (
         <>
           <div className="row" style={{ margin: '10px' }}>

diff --git a/src/components/FormComponents/SelectContributorSingle.jsx b/src/components/FormComponents/SelectContributorSingle.jsx
@@ -194,7 +194,12 @@ function SelectContributorSingle({
     service.createFragment(data, template.id, dmpId).then(res => {
       const savedFragment = res.data.fragment;
       savedFragment.action = 'update';
-      field.onChange({ ...contributor, person: savedFragment, role: defaultRole, action: 'update' })
+      field.onChange({ 
+        ...contributor,
+        person: savedFragment,
+        role: defaultRole,
+        action: contributor ? 'update' : 'create'
+      })
       setPersons([...persons, { ...savedFragment, to_string: parsePattern(savedFragment, template?.schema?.to_string) }]);
     }).catch(error => setError(error));
     handleClose();

diff --git a/src/components/WritePlan/GuidanceChoice.jsx b/src/components/WritePlan/GuidanceChoice.jsx
@@ -30,6 +30,7 @@ function GuidanceChoice({ planId, currentOrgId, currentOrgName, isClassic }) {
   const [checkboxStates, setCheckboxStates] = useState({});
   const [isOpen, setIsOpen] = useState(false);
   const {
+    displayedResearchOutput,
     setQuestionsWithGuidance,
     setCurrentOrg,
     currentOrg,
@@ -62,7 +63,7 @@ function GuidanceChoice({ planId, currentOrgId, currentOrgName, isClassic }) {
       })
       .catch((error) => setError(error))
       .finally(() => setLoading(false));
-  }, [planId]);
+  }, [planId, locale]);
 
   const sortGuidances = (guidances) => guidances.sort((a, b) => a.name.localeCompare(b.name));
 
@@ -137,7 +138,7 @@ function GuidanceChoice({ planId, currentOrgId, currentOrgName, isClassic }) {
 
     let response;
     try {
-      response = await guidances.postGuidanceGroups({ guidance_group_ids: selectedGuidancesIds }, planId, locale);
+      response = await guidances.postGuidanceGroups({ guidance_group_ids: selectedGuidancesIds, ro_id: displayedResearchOutput.id }, planId, locale);
     } catch (error) {
       return toast.error(t("An error occurred while saving the recommendations"));
     }

diff --git a/src/components/context/Global.jsx b/src/components/context/Global.jsx
@@ -31,7 +31,7 @@ export const GlobalContext = createContext();
  * @returns The GlobalContext.Provider is being returned.
  */
 function Global({ children }) {
-  const [locale, setLocale] = useState('en');
+  const [locale, setLocale] = useState('fr_FR');
   const [dmpId, setDmpId] = useState(null);
   const [persons, setPersons] = useState([]);
   // Plan Creation

diff --git a/src/utils/GeneratorUtils.js b/src/utils/GeneratorUtils.js
@@ -109,13 +109,13 @@ export function formatDefaultValues(defaults) {
 }
 
 export function generateEmptyDefaults(properties = {}) {
-  const emtpyDefaults = {};
+  const emptyDefaults = {};
   for (const [key, prop] of Object.entries(properties)) {
     if(prop.type === 'array' && prop.items?.type === 'object') {
-      emtpyDefaults[key] = []
+      emptyDefaults[key] = []
     }
   };
-  return emtpyDefaults;
+  return emptyDefaults;
 }
 
 export function researchOutputTypeToDataType(type) {