Enable optional chaining on configuration access (#6891)

* Enable optional chaining on configuration access * Add changelog item
owncloud · May 6, 2022 · ddb1880 · ddb1880
1 parent 92f5fc3
commit ddb1880
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 16 deletions.
diff --git a/changelog/unreleased/bugfix-configuration-options-optional-chaining b/changelog/unreleased/bugfix-configuration-options-optional-chaining
@@ -0,0 +1,6 @@
+Bugfix: Enable optional chaining on configuration options access
+
+We've optional chaining on configuration options access to prevent unwanted access on
+undefined properties which might cause errors.
+
+https://github.com/owncloud/web/pull/6891
diff --git a/packages/web-app-files/src/components/Search/List.vue b/packages/web-app-files/src/components/Search/List.vue
@@ -83,7 +83,7 @@ export default defineComponent({
     ...mapGetters(['configuration']),
     ...mapGetters('Files', ['totalFilesCount', 'totalFilesSize']),
     displayThumbnails() {
-      return !this.configuration.options.disablePreviews
+      return !this.configuration?.options?.disablePreviews
     }
   },
   watch: {

diff --git a/packages/web-app-files/src/components/Search/Preview.vue b/packages/web-app-files/src/components/Search/Preview.vue
@@ -73,7 +73,7 @@ export default {
       return this.$gettext('Personal')
     },
     displayThumbnails() {
-      return !this.configuration.options.disablePreviews
+      return !this.configuration?.options?.disablePreviews
     }
   },
   beforeMount() {

diff --git a/...src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue b/...src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
@@ -143,7 +143,7 @@ export default {
     ...mapGetters(['configuration', 'getToken', 'user']),
 
     helpersEnabled() {
-      return this.configuration.options.contextHelpers
+      return this.configuration?.options?.contextHelpers
     },
 
     inviteCollaboratorHelp() {
@@ -197,7 +197,7 @@ export default {
           query,
           'folder',
           1,
-          this.configuration.options.sharingRecipientsPerPage
+          this.configuration?.options?.sharingRecipientsPerPage
         )
 
         const users = recipients.exact.users

diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
@@ -228,7 +228,7 @@ export default defineComponent({
     },
 
     helpersEnabled() {
-      return this.configuration.options.contextHelpers
+      return this.configuration?.options?.contextHelpers
     },
 
     viaLinkHelp() {

diff --git a/packages/web-app-files/src/views/Favorites.vue b/packages/web-app-files/src/views/Favorites.vue
@@ -104,7 +104,7 @@ export default defineComponent({
     },
 
     displayThumbnails() {
-      return !this.configuration.options.disablePreviews
+      return !this.configuration?.options?.disablePreviews
     }
   },
 

diff --git a/packages/web-app-files/src/views/Personal.vue b/packages/web-app-files/src/views/Personal.vue
@@ -167,7 +167,7 @@ export default defineComponent({
     },
 
     displayThumbnails() {
-      return !this.configuration.options.disablePreviews
+      return !this.configuration?.options?.disablePreviews
     }
   },
 

diff --git a/packages/web-app-files/src/views/PublicFiles.vue b/packages/web-app-files/src/views/PublicFiles.vue
@@ -145,7 +145,7 @@ export default defineComponent({
     },
 
     displayThumbnails() {
-      return !this.configuration.options.disablePreviews
+      return !this.configuration?.options?.disablePreviews
     }
   },
 

diff --git a/packages/web-app-files/src/views/shares/SharedViaLink.vue b/packages/web-app-files/src/views/shares/SharedViaLink.vue
@@ -104,7 +104,7 @@ export default defineComponent({
     ...mapState('Files/sidebar', { sidebarClosed: 'closed' }),
 
     helpersEnabled() {
-      return this.configuration.options.contextHelpers
+      return this.configuration?.options?.contextHelpers
     },
 
     quickLinkHelp() {
@@ -116,7 +116,7 @@ export default defineComponent({
     },
 
     displayThumbnails() {
-      return !this.configuration.options.disablePreviews
+      return !this.configuration?.options?.disablePreviews
     }
   },
 

diff --git a/packages/web-app-files/src/views/shares/SharedWithMe.vue b/packages/web-app-files/src/views/shares/SharedWithMe.vue
@@ -366,7 +366,7 @@ export default defineComponent({
       }
     },
     displayThumbnails() {
-      return !this.configuration.options.disablePreviews && this.viewMode === ShareStatus.accepted
+      return !this.configuration?.options?.disablePreviews && this.viewMode === ShareStatus.accepted
     }
   },
 

diff --git a/packages/web-app-files/src/views/shares/SharedWithOthers.vue b/packages/web-app-files/src/views/shares/SharedWithOthers.vue
@@ -107,7 +107,7 @@ export default defineComponent({
     },
 
     displayThumbnails() {
-      return !this.configuration.options.disablePreviews
+      return !this.configuration?.options?.disablePreviews
     }
   },
 

diff --git a/packages/web-app-files/src/views/spaces/Project.vue b/packages/web-app-files/src/views/spaces/Project.vue
@@ -225,7 +225,7 @@ export default defineComponent({
         : this.$gettext('Show less')
     },
     displayThumbnails() {
-      return !this.configuration.options.disablePreviews
+      return !this.configuration?.options?.disablePreviews
     },
     memberCount() {
       return this.space.spaceMemberIds.length

diff --git a/packages/web-runtime/src/components/Topbar/TopBar.vue b/packages/web-runtime/src/components/Topbar/TopBar.vue
@@ -80,11 +80,11 @@ export default {
     },
 
     isFeedbackLinkEnabled() {
-      return !this.configuration.options.disableFeedbackLink
+      return !this.configuration?.options?.disableFeedbackLink
     },
 
     feedbackLinkOptions() {
-      const feedback = this.configuration.options.feedbackLink
+      const feedback = this.configuration?.options?.feedbackLink
       if (!this.isFeedbackLinkEnabled || !feedback) {
         return {}
       }

diff --git a/packages/web-runtime/src/components/UploadInfo.vue b/packages/web-runtime/src/components/UploadInfo.vue
@@ -95,7 +95,7 @@ export default {
       )
     },
     displayThumbnails() {
-      return !this.configuration.options.disablePreviews
+      return !this.configuration?.options?.disablePreviews
     }
   },
   mounted() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -104,7 +104,7 @@ export default defineComponent({ @@
         },
         displayThumbnails() {
-          return !this.configuration.options.disablePreviews
+          return !this.configuration?.options?.disablePreviews
         }
       },
@@ Expand Down @@