Merge pull request #5002 from owncloud/22042021_bump-ods-6.1.0

Bump ODS to 6.2.0 & add necessary changes
owncloud · Apr 26, 2021 · de8b9e6 · de8b9e6
2 parents 93e37df + 5207099
commit de8b9e6
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 15 deletions.
diff --git a/changelog/unreleased/enhancement-bump-ods-version b/changelog/unreleased/enhancement-bump-ods-version
@@ -0,0 +1,7 @@
+Enhancement: Update owncloud Design System to v6.2.0
+
+- Lots of updates regarding accessibility topics
+- Removal of home icon in breadcrumbs, changed to "All files" link as breadcrumb root
+- Added aria-label to sidebar and proper logo-alt attribute to image in sidebar
+
+https://github.com/owncloud/web/pull/5002
diff --git a/packages/web-app-files/src/components/AppBar.vue b/packages/web-app-files/src/components/AppBar.vue
@@ -16,7 +16,7 @@
         id="files-breadcrumb"
         class="oc-p-s"
         :items="breadcrumbs"
-        home
+        variation="lead"
       />
       <h1 class="oc-invisible-sr" v-text="pageTitle" />
       <div
@@ -192,14 +192,14 @@ export default {
         baseUrl = '/files/list/all/'
         pathItems.push('/') // as of now we need to add the url encoded root path `/`, otherwise we'll land in the configured homeFolder
         breadcrumbs.push({
-          text: this.$gettext('Home'),
+          text: this.$gettext('All files'),
           to: baseUrl + encodeURIComponent(pathUtil.join(...pathItems))
         })
       } else {
         baseUrl = '/files/public/list/'
         pathItems.push(pathSegments.splice(0, 1)[0])
         breadcrumbs.push({
-          text: this.$gettext('Home'),
+          text: this.$gettext('Public link'),
           to: baseUrl + encodeURIComponent(pathUtil.join(...pathItems))
         })
       }

diff --git a/packages/web-app-files/src/views/LocationPicker.vue b/packages/web-app-files/src/views/LocationPicker.vue
@@ -180,7 +180,7 @@ export default {
           breadcrumbs.push(this.createBreadcrumbNode(i + 1, pathSegments[i], itemPath))
         }
       } else {
-        breadcrumbs.push(this.createBreadcrumbNode(0, this.$gettext('Home'), '/'))
+        breadcrumbs.push(this.createBreadcrumbNode(0, this.$gettext('All files'), '/'))
         for (let i = 0; i < pathSegments.length; i++) {
           const itemPath = encodeURIComponent(join.apply(null, pathSegments.slice(0, i + 1)))
           breadcrumbs.push(this.createBreadcrumbNode(i + 1, pathSegments[i], itemPath))

diff --git a/packages/web-runtime/package.json b/packages/web-runtime/package.json
@@ -12,7 +12,7 @@
     "luxon": "^1.22.0",
     "moment": "^2.24.0",
     "oidc-client": "1.10.1",
-    "owncloud-design-system": "^6.0.1",
+    "owncloud-design-system": "^6.2.0",
     "owncloud-sdk": "^1.0.0-740",
     "p-queue": "^6.1.1",
     "tus-js-client": "^1.8.0",

diff --git a/packages/web-runtime/src/App.vue b/packages/web-runtime/src/App.vue
@@ -24,11 +24,12 @@
             v-touch:swipe.left="handleNavSwipe"
             class="oc-app-navigation"
             :logo-img="logoImage"
-            :product-name="productName"
+            :logo-alt="sidebarLogoAlt"
             :nav-items="sidebarNavItems"
             :hide-nav="sidebar.navigationHidden"
             :class="sidebarClasses"
             :fixed="isSidebarFixed"
+            :accessible-label="accessibleLabel"
             @close="toggleAppNavigationVisibility"
           >
             <template v-if="sidebar.mainContentComponent" v-slot:mainContent>
@@ -153,8 +154,12 @@ export default {
       return this.configuration.theme.logo.sidebar
     },
 
-    productName() {
-      return this.configuration.theme.general.name
+    accessibleLabel() {
+      return this.$gettext('Sidebar navigation menu')
+    },
+
+    sidebarLogoAlt() {
+      return this.$gettext('Navigate to all files page')
     },
 
     sidebarNavItems() {

diff --git a/tests/acceptance/pageObjects/personalPage.js b/tests/acceptance/pageObjects/personalPage.js
@@ -394,15 +394,15 @@ module.exports = {
       locateStrategy: 'xpath'
     },
     resourceBreadcrumb: {
-      selector: '//div[@id="files-breadcrumb"]//*[(self::a or self::span) and contains(text(),%s)]',
+      selector: '//nav[@id="files-breadcrumb"]//*[(self::a or self::span) and contains(text(),%s)]',
       locateStrategy: 'xpath'
     },
     resourceBreadcrumbClickable: {
-      selector: '//div[@id="files-breadcrumb"]//a[contains(text(),%s)]',
+      selector: '//nav[@id="files-breadcrumb"]//a[contains(text(),%s)]',
       locateStrategy: 'xpath'
     },
     resourceBreadcrumbNonClickable: {
-      selector: '//div[@id="files-breadcrumb"]//span[contains(text(),%s)]',
+      selector: '//nav[@id="files-breadcrumb"]//span[contains(text(),%s)]',
       locateStrategy: 'xpath'
     },
     fileUploadButton: {

diff --git a/yarn.lock b/yarn.lock
@@ -7604,10 +7604,10 @@ [email protected]:
   dependencies:
     glob "^7.1.3"
 
-owncloud-design-system@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/owncloud-design-system/-/owncloud-design-system-6.0.1.tgz#bfa8a797fd35b38d320ec7e8e74683c9dd1278be"
-  integrity sha512-nLcXRMYdcX7UDS3UkWim7urLOx00u2VUP+01SSpeN5Liuufh8UR88ENLIRW+fqcIPPGhu15qlr1JsV5+0MDgEA==
+owncloud-design-system@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/owncloud-design-system/-/owncloud-design-system-6.2.0.tgz#e8b69705e3418257b4b34cfb72915ffbb23b8172"
+  integrity sha512-7PmS2l9vQWvS0rLPLysqfiRwwLaIkpAeSP2BiCQ4aZ0WMzu4FBcRvbzPzoSbe38e393+ZsLrKymAnSNYxXl6Gg==
 
 owncloud-sdk@^1.0.0-740:
   version "1.0.0-1716"