Merge pull request KelvinTegelaar#2221 from JohnDuprey/dev

Add null safe operator to default settings
ACCIPP · Mar 15, 2024 · 3697f63 · 3697f63
2 parents e17aa34 + 8197a11
commit 3697f63
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "5.2.1",
+  "version": "5.3.1",
   "description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.",
   "homepage": "https://cipp.app/",
   "bugs": {

diff --git a/public/version_latest.txt b/public/version_latest.txt
@@ -1 +1 @@
-5.3.0
+5.3.1
diff --git a/src/views/identity/administration/AddUser.jsx b/src/views/identity/administration/AddUser.jsx
@@ -330,7 +330,7 @@ const AddUser = () => {
                         </CCol>
                       </CRow>
                       <>
-                        {currentSettings.userSettingsDefaults.defaultAttributes.map(
+                        {currentSettings?.userSettingsDefaults?.defaultAttributes.map(
                           (attribute, idx) => (
                             <CRow key={idx}>
                               <CCol>

diff --git a/src/views/identity/administration/EditUser.jsx b/src/views/identity/administration/EditUser.jsx
@@ -137,7 +137,7 @@ const EditUser = () => {
     },
     license: precheckedLicenses,
     //if currentSettings.defaultAttributes exists. Set each of the keys inside of currentSettings.defaultAttributes.label to the value of the user attribute found in the user object.
-    defaultAttributes: currentSettings.userSettingsDefaults.defaultAttributes.reduce(
+    defaultAttributes: currentSettings?.userSettingsDefaults?.defaultAttributes.reduce(
       (o, key) => Object.assign(o, { [key.label]: { Value: user[key.label] } }),
       {},
     ),
@@ -410,7 +410,7 @@ const EditUser = () => {
                             </CCol>
                           </CRow>
                           <>
-                            {currentSettings.userSettingsDefaults.defaultAttributes.map(
+                            {currentSettings?.userSettingsDefaults?.defaultAttributes.map(
                               (attribute, idx) => (
                                 <CRow key={idx}>
                                   <CCol>

diff --git a/src/views/identity/administration/OffboardingWizard.jsx b/src/views/identity/administration/OffboardingWizard.jsx
@@ -92,7 +92,7 @@ const OffboardingWizard = () => {
 
   return (
     <CippWizard
-      initialValues={currentSettings.userSettingsDefaults}
+      initialValues={currentSettings?.userSettingsDefaults}
       onSubmit={handleSubmit}
       wizardTitle="Offboarding Wizard"
     >
@@ -132,7 +132,7 @@ const OffboardingWizard = () => {
         <hr className="my-4" />
       </CippWizard.Page>
       <CippWizard.Page
-        initialvalues={currentSettings.userSettingsDefaults}
+        initialvalues={currentSettings?.userSettingsDefaults}
         title="Offboarding Settings"
         description="Select the offboarding options."
       >

diff --git a/src/views/tenant/administration/TenantOffboardingWizard.jsx b/src/views/tenant/administration/TenantOffboardingWizard.jsx
@@ -74,7 +74,7 @@ const TenantOffboardingWizard = () => {
 
   return (
     <CippWizard
-      initialValues={currentSettings.userSettingsDefaults}
+      initialValues={currentSettings?.userSettingsDefaults}
       onSubmit={handleSubmit}
       wizardTitle="Tenant Offboarding Wizard"
     >
@@ -88,7 +88,7 @@ const TenantOffboardingWizard = () => {
         <hr className="my-4" />
       </CippWizard.Page>
       <CippWizard.Page
-        initialvalues={currentSettings.tenantuserSettingsDefaults}
+        initialvalues={currentSettings?.tenantuserSettingsDefaults}
         title="Tenant Offboarding Settings"
         description="Select the tenant offboarding actions you wish to take."
       >

diff --git a/version_latest.txt b/version_latest.txt
@@ -1 +1 @@
-5.3.0
+5.3.1