Make contextHelpers configurable

owncloud · Apr 21, 2022 · 73e0baf · 73e0baf
1 parent 5e05d0f
commit 73e0baf
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 27 deletions.
diff --git a/config/config.json.dist b/config/config.json.dist
@@ -15,5 +15,8 @@
     "search",
     "text-editor"
   ],
-  "applications" : []
+  "applications" : [],
+  "options": {
+    "contextHelpers": true
+  },
 }
diff --git a/config/config.json.sample-oc10 b/config/config.json.sample-oc10
@@ -14,5 +14,8 @@
     "search",
     "text-editor",
     "draw-io"
-  ]
+  ],
+  "options": {
+    "contextHelpers": true
+  },
 }
diff --git a/config/config.json.sample-ocis b/config/config.json.sample-ocis
@@ -28,5 +28,8 @@
       "id": "accounts",
       "path": "https://localhost:9200/accounts.js"
     }
-  ]
+  ],
+  "options": {
+    "contextHelpers": true
+  },
 }
diff --git a/...src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue b/...src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
@@ -41,8 +41,8 @@
         class="oc-mt-xs oc-text-meta"
         v-text="inviteDescriptionMessage"
       />
-      <oc-contextual-helper v-if="resourceIsSpace" v-bind="spaceAddMemberHelp" />
-      <oc-contextual-helper v-else v-bind="inviteCollaboratorHelp" />
+      <oc-contextual-helper v-if="resourceIsSpace && helpersEnabled" v-bind="spaceAddMemberHelp" />
+      <oc-contextual-helper v-else-if="helpersEnabled" v-bind="inviteCollaboratorHelp" />
     </p>
     <div class="oc-flex oc-flex-middle oc-flex-between oc-mb-l">
       <role-dropdown
@@ -128,6 +128,10 @@ export default {
     ...mapGetters('Files', ['currentFileOutgoingCollaborators', 'highlightedFile']),
     ...mapGetters(['configuration', 'getToken', 'user']),
 
+    helpersEnabled() {
+      return this.configuration.options.contextHelpers
+    },
+
     inviteCollaboratorHelp() {
       return shareInviteCollaboratorHelp
     },

diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
@@ -14,7 +14,7 @@
               >Any external person with the respective link can access this resource. No sign-in
               required. Assign a password to avoid unintended document exposure.</span
             >
-            <oc-contextual-helper v-bind="viaLinkHelp" />
+            <oc-contextual-helper v-if="helpersEnabled" v-bind="viaLinkHelp" />
           </p>
           <oc-button
             id="files-file-link-add"
@@ -109,10 +109,14 @@ export default defineComponent({
       'currentFileOutgoingSharesLoading',
       'sharesTreeLoading'
     ]),
-    ...mapGetters(['capabilities']),
+    ...mapGetters(['capabilities', 'configuration']),
     ...mapState('Files', ['sharesTree']),
     ...mapState(['user']),
 
+    helpersEnabled() {
+      return this.configuration.options.contextHelpers
+    },
+
     viaLinkHelp() {
       return shareViaLinkHelp
     },

diff --git a/packages/web-app-files/src/views/shares/SharedViaLink.vue b/packages/web-app-files/src/views/shares/SharedViaLink.vue
@@ -11,7 +11,7 @@
       >
         <template #message>
           <span v-translate>There are no resources with a public link at the moment</span>
-          <oc-contextual-helper v-bind="quickLinkHelp" />
+          <oc-contextual-helper v-if="helpersEnabled" v-bind="quickLinkHelp" />
         </template>
       </no-content-message>
       <resource-table
@@ -103,6 +103,10 @@ export default defineComponent({
     ...mapGetters(['configuration']),
     ...mapState('Files/sidebar', { sidebarClosed: 'closed' }),
 
+    helpersEnabled() {
+      return this.configuration.options.contextHelpers
+    },
+
     quickLinkHelp() {
       return shareQuickLinkHelp
     },

diff --git a/packages/web-app-files/tests/unit/views/shares/__snapshots__/SharedViaLink.spec.js.snap b/packages/web-app-files/tests/unit/views/shares/__snapshots__/SharedViaLink.spec.js.snap
@@ -8,25 +8,7 @@ exports[`SharedViaLink view when the view is not loading anymore when there are
       <!---->
     </div>
     <div class="oc-text-muted oc-text-large"><span>There are no resources with a public link at the moment</span>
-      <div class="oc-contextual-helper"><button type="button" class="oc-button oc-rounded oc-button-m oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw" id="oc-contextual-helper-3-button"><span class="oc-icon oc-icon-s oc-icon-passive"><!----></span></button>
-        <div id="oc-contextual-helper-3" class="oc-drop oc-box-shadow-medium oc-rounded">
-          <div class="oc-card oc-card-body oc-rounded oc-background-secondary oc-p-m">
-            <div class="info-drop-content">
-              <p class="info-text">The Quick link is the link that is always copied if you</p>
-              <ul class="info-list oc-pl-l">
-                <li class="oc-pl-rm">
-                  right click on a file and choose "Get link" or
-                </li>
-                <li class="oc-pl-rm">
-                  click on the quickaction "Get link"
-                </li>
-              </ul>
-              <p class="info-text-end"></p>
-              <!---->
-            </div>
-          </div>
-        </div>
-      </div>
+      <!---->
     </div>
     <div class="oc-text-muted"></div>
   </div>