From 854f1fceb1e65dbdeda0c110c368b1354a78bb62 Mon Sep 17 00:00:00 2001
From: Pascal Wengerter <pascal@wengerter.info>
Date: Thu, 27 May 2021 08:47:56 +0100
Subject: [PATCH] Add aria-label (and no tooltip) for +New Button if user has
 permissions

---
 changelog/unreleased/enhancement-oc-tooltip   |   1 +
 .../web-app-files/src/components/AppBar.vue   | 155 +++++++++---------
 2 files changed, 81 insertions(+), 75 deletions(-)

diff --git a/changelog/unreleased/enhancement-oc-tooltip b/changelog/unreleased/enhancement-oc-tooltip
index 848c15b83b9..ac00a881900 100644
--- a/changelog/unreleased/enhancement-oc-tooltip
+++ b/changelog/unreleased/enhancement-oc-tooltip
@@ -8,3 +8,4 @@ https://github.com/owncloud/web/issues/2623
 https://github.com/owncloud/web/issues/4597
 https://github.com/owncloud/web/issues/4332
 https://github.com/owncloud/web/issues/4300
+https://github.com/owncloud/web/issues/5155
diff --git a/packages/web-app-files/src/components/AppBar.vue b/packages/web-app-files/src/components/AppBar.vue
index 9b36eb5bbe6..30a2ec25f0b 100644
--- a/packages/web-app-files/src/components/AppBar.vue
+++ b/packages/web-app-files/src/components/AppBar.vue
@@ -22,80 +22,78 @@
         v-if="showActions || selectedFiles.length > 0 || isTrashbinRoute"
         class="uk-flex uk-flex-middle oc-p-s"
       >
-        <template v-if="showActions">
-          <template v-if="areDefaultActionsVisible">
-            <oc-button
-              id="new-file-menu-btn"
-              key="new-file-menu-btn-enabled"
-              v-oc-tooltip="_cannotCreateDialogText"
-              :aria-label="_cannotCreateDialogText"
-              variation="primary"
-              appearance="filled"
-              :disabled="isNewBtnDisabled"
-            >
-              <oc-icon name="add" />
-              <translate>New</translate>
-            </oc-button>
-            <oc-drop
-              drop-id="new-file-menu-drop"
-              toggle="#new-file-menu-btn"
-              mode="click"
-              close-on-click
-              :options="{ delayHide: 0 }"
-            >
-              <ul class="uk-list">
-                <li>
-                  <file-upload
-                    :path="currentPath"
-                    :headers="headers"
-                    @success="onFileSuccess"
-                    @error="onFileError"
-                    @progress="onFileProgress"
-                  />
-                </li>
-                <li v-if="checkIfBrowserSupportsFolderUpload">
-                  <folder-upload
-                    v-if="!isIE11()"
-                    :root-path="currentPath"
-                    :path="currentPath"
-                    :headers="headers"
-                    @success="onFileSuccess"
-                    @error="onFileError"
-                    @progress="onFileProgress"
-                  />
-                </li>
-                <li>
-                  <div>
-                    <oc-button
-                      id="new-folder-btn"
-                      appearance="raw"
-                      class="uk-width-1-1"
-                      justify-content="left"
-                      @click="showCreateResourceModal"
-                    >
-                      <oc-icon name="create_new_folder" />
-                      <translate>New folder…</translate>
-                    </oc-button>
-                  </div>
-                </li>
-                <li v-for="(newFileHandler, key) in newFileHandlers" :key="key">
-                  <div>
-                    <oc-button
-                      appearance="raw"
-                      justify-content="left"
-                      :class="['new-file-btn-' + newFileHandler.ext, 'uk-width-1-1']"
-                      @click="
-                        showCreateResourceModal(false, newFileHandler.ext, newFileHandler.action)
-                      "
-                    >
-                      <oc-icon :name="newFileHandler.icon || 'save'" />
-                      <span>{{ newFileHandler.menuTitle($gettext) }}</span>
-                    </oc-button>
-                  </div>
-                </li>
-              </ul>
-            </oc-drop>
-          </template>
+        <template v-if="showActions && areDefaultActionsVisible">
+          <oc-button
+            id="new-file-menu-btn"
+            key="new-file-menu-btn-enabled"
+            v-oc-tooltip="newButtonTooltip"
+            :aria-label="newButtonAriaLabel"
+            variation="primary"
+            appearance="filled"
+            :disabled="isNewBtnDisabled"
+          >
+            <oc-icon name="add" />
+            <translate>New</translate>
+          </oc-button>
+          <oc-drop
+            drop-id="new-file-menu-drop"
+            toggle="#new-file-menu-btn"
+            mode="click"
+            close-on-click
+            :options="{ delayHide: 0 }"
+          >
+            <ul class="uk-list">
+              <li>
+                <file-upload
+                  :path="currentPath"
+                  :headers="headers"
+                  @success="onFileSuccess"
+                  @error="onFileError"
+                  @progress="onFileProgress"
+                />
+              </li>
+              <li v-if="checkIfBrowserSupportsFolderUpload">
+                <folder-upload
+                  v-if="!isIE11()"
+                  :root-path="currentPath"
+                  :path="currentPath"
+                  :headers="headers"
+                  @success="onFileSuccess"
+                  @error="onFileError"
+                  @progress="onFileProgress"
+                />
+              </li>
+              <li>
+                <div>
+                  <oc-button
+                    id="new-folder-btn"
+                    appearance="raw"
+                    class="uk-width-1-1"
+                    justify-content="left"
+                    @click="showCreateResourceModal"
+                  >
+                    <oc-icon name="create_new_folder" />
+                    <translate>New folder…</translate>
+                  </oc-button>
+                </div>
+              </li>
+              <li v-for="(newFileHandler, key) in newFileHandlers" :key="key">
+                <div>
+                  <oc-button
+                    appearance="raw"
+                    justify-content="left"
+                    :class="['new-file-btn-' + newFileHandler.ext, 'uk-width-1-1']"
+                    @click="
+                      showCreateResourceModal(false, newFileHandler.ext, newFileHandler.action)
+                    "
+                  >
+                    <oc-icon :name="newFileHandler.icon || 'save'" />
+                    <span>{{ newFileHandler.menuTitle($gettext) }}</span>
+                  </oc-button>
+                </div>
+              </li>
+            </ul>
+          </oc-drop>
         </template>
         <info-selected-resources v-if="selectedFiles.length > 0" class="oc-mr-s uk-visible@l" />
         <batch-actions />
@@ -147,7 +145,7 @@ export default {
     ]),
     ...mapState(['route']),
 
-    _cannotCreateDialogText() {
+    newButtonTooltip() {
       if (!this.canUpload) {
         return this.$gettext('You have no permission to upload!')
       }
@@ -156,6 +154,13 @@ export default {
       }
       return null
     },
+    newButtonAriaLabel() {
+      const tooltip = this.newButtonTooltip
+      if (tooltip) {
+        return tooltip
+      }
+      return this.$gettext('Add files or folders')
+    },
     currentPath() {
       const path = this.$route.params.item || ''
       if (path.endsWith('/')) {