[DT-252][risk=no] Refactor user properties (#2567)

DataBiosphere · Feb 24, 2025 · 744f90f · 744f90f
1 parent 6311d8c
commit 744f90f
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/cypress/component/DataAccessRequest/data_access_request_validation.spec.jsx b/cypress/component/DataAccessRequest/data_access_request_validation.spec.jsx
@@ -23,7 +23,7 @@ const user = {
   email: 'janedoe@gmail.com',
   eraCommonsId: 'asdg',
   libraryCards: [{}],
-  researcherProperties: [
+  properties: [
     {
       propertyId: 10350,
       userId: 5,
@@ -45,7 +45,7 @@ const userNoLibraryCard = {
   email: 'janedoe@gmail.com',
   eraCommonsId: 'asdg',
   libraryCards: [],
-  researcherProperties: [
+  properties: [
     {
       propertyId: 10350,
       userId: 5,

diff --git a/cypress/component/ERACommons/era_commons.spec.jsx b/cypress/component/ERACommons/era_commons.spec.jsx
@@ -82,13 +82,13 @@ describe('ERA Commons Component', function () {
     clonedResearcher.eraCommonsId = 'testing';
     const iat = new Date().getTime();
     const exp = iat + (30 * 24 * 60 * 60 * 1000); // iat + 30 days
-    clonedResearcher.researcherProperties = [
+    clonedResearcher.properties = [
       {propertyKey:'eraAuthorized', propertyValue: true},
       {propertyKey:'eraExpiration', propertyValue: exp}
     ];
     cy.stub(User, 'getMe').returns(clonedResearcher);
     // The saveNihUsr function only returns the user's properties, not the entire user object
-    cy.stub(AuthenticateNIH, 'saveNihUsr').returns(clonedResearcher.researcherProperties);
+    cy.stub(AuthenticateNIH, 'saveNihUsr').returns(clonedResearcher.properties);
     mount(<ERACommons
       isAuthorized={true}
       className={''}

diff --git a/src/components/ERACommons.jsx b/src/components/ERACommons.jsx
@@ -75,7 +75,7 @@ export default function ERACommons(props) {
     const deleteResponse = await AuthenticateNIH.deleteAccountLinkage();
     if (deleteResponse) {
       const response = await User.getMe();
-      const eraAuthState = extractEraAuthenticationState(response.researcherProperties);
+      const eraAuthState = extractEraAuthenticationState(response.properties);
       setAuthorized(eraAuthState.isAuthorized);
       setExpirationCount(eraAuthState.expirationCount);
       setEraCommonsId(researcherProfile.eraCommonsId);

diff --git a/src/components/ResearcherReview.jsx b/src/components/ResearcherReview.jsx
@@ -8,23 +8,23 @@ export const ResearcherReview = (props) => {
     value: '',
     user: {},
     institution: {},
-    researcherProperties: {
+    properties: {
       eraCommonsId: ''
     }
   });
 
   useEffect(() => {
     const user = props.user;
-    let researcherProps = getPropertyValuesFromUser(user);
+    let userProps = getPropertyValuesFromUser(user);
     setState((prev) => ({
       ...prev,
       user: user,
       institution: !isEmpty(user.institution) ? user.institution : null,
-      researcherProperties: researcherProps
+      properties: userProps
     }));
   }, [props.user]);
 
-  const { researcherProperties, user, institution } = state;
+  const { properties, user, institution } = state;
 
   return (
     <div className="container">
@@ -49,7 +49,7 @@ export const ResearcherReview = (props) => {
             <div className="col-lg-6 col-md-6 col-sm-6 col-xs-12">
               <label className="control-label">NIH User Name</label>
               <div id="lbl_profileeraCommonsId" className="control-data" name="profileeraCommonsId" readOnly={true}>
-                {researcherProperties.eraCommonsId}
+                {properties.eraCommonsId}
               </div>
             </div>
             <div className="col-lg-6 col-md-6 col-sm-6 col-xs-12">

diff --git a/src/libs/models.js b/src/libs/models.js
@@ -10,6 +10,7 @@ export const Models = {
     associatedDaa: null
   },
   dar: {
+    properties: [],
     researcherProperties: [],
     researcherId: '',
     rus: '',

diff --git a/src/libs/utils.js b/src/libs/utils.js
@@ -91,9 +91,10 @@ export const goToPage = (value, pageCount, setCurrentPage) => {
 };
 
 export const findPropertyValue = (propName, researcher) => {
-  const prop = isNil(researcher.researcherProperties) ?
+  const props = researcher.properties;
+  const prop = isNil(props) ?
     null
-    : find({propertyKey: propName})(researcher.researcherProperties);
+    : find({propertyKey: propName})(props);
   return isNil(prop) ? '' : prop.propertyValue;
 };