From 5441ec1aacf0b34ec86ebabc5db3806f8d222974 Mon Sep 17 00:00:00 2001
From: Pascal Wengerter <pascal@wengerter.info>
Date: Thu, 22 Apr 2021 17:53:27 +0100
Subject: [PATCH] Bump ODS to 6.2.0 & add necessary changes

---
 changelog/unreleased/enhancement-bump-ods-version   |  7 +++++++
 packages/web-app-files/src/components/AppBar.vue    |  2 +-
 packages/web-app-files/src/views/LocationPicker.vue |  2 +-
 packages/web-runtime/package.json                   |  2 +-
 packages/web-runtime/src/App.vue                    | 11 ++++++++---
 yarn.lock                                           |  8 ++++----
 6 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 changelog/unreleased/enhancement-bump-ods-version

diff --git a/changelog/unreleased/enhancement-bump-ods-version b/changelog/unreleased/enhancement-bump-ods-version
new file mode 100644
index 00000000000..62bfd185bc6
--- /dev/null
+++ b/changelog/unreleased/enhancement-bump-ods-version
@@ -0,0 +1,7 @@
+Enhancement: Update owncloud Design System to v6.1.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
index 97e78562b75..1a83f8cb06a 100644
--- a/packages/web-app-files/src/components/AppBar.vue
+++ b/packages/web-app-files/src/components/AppBar.vue
@@ -192,7 +192,7 @@ 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 {
diff --git a/packages/web-app-files/src/views/LocationPicker.vue b/packages/web-app-files/src/views/LocationPicker.vue
index 209af16008b..56af7e09f42 100644
--- a/packages/web-app-files/src/views/LocationPicker.vue
+++ b/packages/web-app-files/src/views/LocationPicker.vue
@@ -165,7 +165,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
index ed30500678f..cb966d66bfa 100644
--- 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
index cc654db2e6d..f38e40a1a82 100644
--- 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>
@@ -151,8 +152,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/yarn.lock b/yarn.lock
index f13e3d11788..cbccfb435ed 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7604,10 +7604,10 @@ ospec@3.1.0:
   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"