Provide undefined fallback to undefined objectsfix/profile-empty-profileParameters

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>

4 files changed, 10 insertions, 9 deletions

diff --git a/apps/settings/src/components/PersonalInfo/EmailSection/EmailSection.vue b/apps/settings/src/components/PersonalInfo/EmailSection/EmailSection.vue
index 2a9aefd4162..07826b41181 100644
--- a/apps/settings/src/components/PersonalInfo/EmailSection/EmailSection.vue
+++ b/apps/settings/src/components/PersonalInfo/EmailSection/EmailSection.vue
@@ -81,7 +81,7 @@ import { validateEmail } from '../../../utils/validate'
 
 const { emailMap: { additionalEmails, primaryEmail, notificationEmail } } = loadState('settings', 'personalInfoParameters', {})
 const { displayNameChangeSupported } = loadState('settings', 'accountParameters', {})
-const { profileConfig: { email: { visibility } } } = loadState('settings', 'profileParameters', {})
+const { profileConfig } = loadState('settings', 'profileParameters', {})
 
 export default {
 	name: 'EmailSection',
@@ -101,7 +101,7 @@ export default {
 			primaryEmail,
 			savePrimaryEmailScope,
 			notificationEmail,
-			visibility,
+			visibility: profileConfig?.role?.visibility,
 		}
 	},
 
diff --git a/apps/settings/src/components/PersonalInfo/RoleSection/RoleSection.vue b/apps/settings/src/components/PersonalInfo/RoleSection/RoleSection.vue
index 62ddefece81..1b5f71d786a 100644
--- a/apps/settings/src/components/PersonalInfo/RoleSection/RoleSection.vue
+++ b/apps/settings/src/components/PersonalInfo/RoleSection/RoleSection.vue
@@ -47,8 +47,8 @@ import VisibilityDropdown from '../shared/VisibilityDropdown'
 
 import { ACCOUNT_PROPERTY_ENUM, ACCOUNT_PROPERTY_READABLE_ENUM } from '../../../constants/AccountPropertyConstants'
 
-const { roleMap: { primaryRole } } = loadState('settings', 'personalInfoParameters', {})
-const { profileConfig: { role: { visibility } } } = loadState('settings', 'profileParameters', {})
+const { roleMap } = loadState('settings', 'personalInfoParameters', {})
+const { profileConfig } = loadState('settings', 'profileParameters', {})
 
 export default {
 	name: 'RoleSection',
@@ -63,8 +63,8 @@ export default {
 		return {
 			accountProperty: ACCOUNT_PROPERTY_READABLE_ENUM.ROLE,
 			accountPropertyId: ACCOUNT_PROPERTY_ENUM.ROLE,
-			primaryRole,
-			visibility,
+			primaryRole: roleMap?.primaryRole,
+			visibility: profileConfig?.role?.visibility,
 		}
 	},
 }
diff --git a/apps/settings/src/components/PersonalInfo/shared/VisibilityDropdown.vue b/apps/settings/src/components/PersonalInfo/shared/VisibilityDropdown.vue
index 23c02d360bc..66c9436e9df 100644
--- a/apps/settings/src/components/PersonalInfo/shared/VisibilityDropdown.vue
+++ b/apps/settings/src/components/PersonalInfo/shared/VisibilityDropdown.vue
@@ -75,9 +75,9 @@ export default {
 
 	data() {
 		return {
-			initialVisibility: profileConfig[this.paramId].visibility,
+			initialVisibility: profileConfig[this.paramId]?.visibility,
 			profileEnabled,
-			visibility: profileConfig[this.paramId].visibility,
+			visibility: profileConfig[this.paramId]?.visibility,
 		}
 	},
 
diff --git a/apps/settings/src/main-personal-info.js b/apps/settings/src/main-personal-info.js
index 95169aee7e6..fafcb755d9d 100644
--- a/apps/settings/src/main-personal-info.js
+++ b/apps/settings/src/main-personal-info.js
@@ -82,7 +82,8 @@ const visibilityDropdownParamIds = [
 ]
 
 for (const paramId of visibilityDropdownParamIds) {
-	const { displayId } = profileConfig[paramId]
+	const displayId = profileConfig[paramId]?.displayId
+
 	new VisibilityDropdownView({
 		propsData: {
 			paramId,