From 75009c1ed74c2f3d14186b1f0599bc4c3904df38 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Fri, 11 Feb 2022 16:19:14 +0100
Subject: [PATCH 1/3] Update web to v5.0.0

---
 .drone.env                               |  4 ++--
 changelog/unreleased/update-5.0.0.md     | 10 ++++++++++
 changelog/unreleased/update-web-4.8.0.md |  8 --------
 web/Makefile                             |  2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 changelog/unreleased/update-5.0.0.md
 delete mode 100644 changelog/unreleased/update-web-4.8.0.md

diff --git a/.drone.env b/.drone.env
index 3ee3c14b92d..9c211f96b76 100644
--- a/.drone.env
+++ b/.drone.env
@@ -3,5 +3,5 @@ CORE_COMMITID=cb9a31fd45721406ee150682d86e29e1b2e8b0d8
 CORE_BRANCH=master
 
 # The test runner source for UI tests
-WEB_COMMITID=262398e513253d3296792434ecc4a96fa1c19a73
-WEB_BRANCH=testSharesFolderAlwaysVisible
+WEB_COMMITID=e84960674723d8fb8c3c42e1ada8ef8cc1747ba6
+WEB_BRANCH=master
diff --git a/changelog/unreleased/update-5.0.0.md b/changelog/unreleased/update-5.0.0.md
new file mode 100644
index 00000000000..e55537eaa4e
--- /dev/null
+++ b/changelog/unreleased/update-5.0.0.md
@@ -0,0 +1,10 @@
+Enhancement: Update ownCloud Web to v5.0.0
+
+Tags: web
+
+We updated ownCloud Web to v5.0.0. Please refer to the changelog (linked) for details on the web release.
+
+https://github.com/owncloud/ocis/pull/2895
+https://github.com/owncloud/ocis/pull/3157
+https://github.com/owncloud/web/releases/tag/v4.8.0
+https://github.com/owncloud/web/releases/tag/v5.0.0
diff --git a/changelog/unreleased/update-web-4.8.0.md b/changelog/unreleased/update-web-4.8.0.md
deleted file mode 100644
index a4956808eb7..00000000000
--- a/changelog/unreleased/update-web-4.8.0.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Enhancement: Update ownCloud Web to v4.8.0
-
-Tags: web
-
-We updated ownCloud Web to v4.8.0. Please refer to the changelog (linked) for details on the web release.
-
-https://github.com/owncloud/ocis/pull/2895
-https://github.com/owncloud/web/releases/tag/v4.8.0
diff --git a/web/Makefile b/web/Makefile
index af5203a1cf0..1806a1b0294 100644
--- a/web/Makefile
+++ b/web/Makefile
@@ -29,7 +29,7 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target
 .PHONY: ci-node-generate
 ci-node-generate: pull-assets
 
-WEB_ASSETS_VERSION = v4.8.0
+WEB_ASSETS_VERSION = v5.0.0-rc
 
 .PHONY: pull-assets
 pull-assets:

From f90d329e85a7cf0789e87bd0a26bdf1287233800 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Fri, 11 Feb 2022 16:53:39 +0100
Subject: [PATCH 2/3] ui adjustments after ODS and Web update

---
 accounts/package.json                         |  2 +-
 accounts/ui/app.js                            |  6 +-
 accounts/ui/components/App.vue                |  4 +-
 .../ui/components/accounts/AccountsCreate.vue |  2 +-
 .../components/accounts/AccountsListRow.vue   |  6 +-
 accounts/yarn.lock                            |  2 +-
 settings/package.json                         |  2 +-
 settings/ui/app.js                            |  6 +-
 settings/ui/components/SettingsApp.vue        |  2 +-
 tests/config/drone/ocis-config.json           | 55 ++++++++++---------
 10 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/accounts/package.json b/accounts/package.json
index a0f8d54cfab..5db78147f2a 100644
--- a/accounts/package.json
+++ b/accounts/package.json
@@ -80,7 +80,7 @@
     "xml-js": "^1.6.11"
   },
   "peerDependencies": {
-    "owncloud-design-system": "^11.0.0"
+    "owncloud-design-system": "^12.1.0"
   },
   "packageManager": "yarn@3.1.0"
 }
diff --git a/accounts/ui/app.js b/accounts/ui/app.js
index 04ea46ed5e7..a4e2c963b78 100644
--- a/accounts/ui/app.js
+++ b/accounts/ui/app.js
@@ -11,7 +11,7 @@ function $gettext (msg) {
 const appInfo = {
   name: $gettext('Accounts'),
   id: 'accounts',
-  icon: 'text-vcard',
+  icon: 'team',
   isFileEditor: false,
   extensions: []
 }
@@ -20,9 +20,7 @@ const routes = [
   {
     name: 'accounts',
     path: '/',
-    components: {
-      app: App
-    }
+    component: App
   }
 ]
 
diff --git a/accounts/ui/components/App.vue b/accounts/ui/components/App.vue
index e922edb1b0b..4c36b0b8237 100644
--- a/accounts/ui/components/App.vue
+++ b/accounts/ui/components/App.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <main class="uk-flex uk-flex-column uk-height-1-1" id="accounts-app">
+    <main class="uk-flex uk-flex-column uk-height-1-1 oc-px-s" id="accounts-app">
       <template v-if="isInitialized">
         <h1 class="oc-invisible-sr">
           <translate>Accounts</translate>
@@ -21,7 +21,7 @@
       </template>
       <template v-else-if="hasFailed">
         <oc-alert variation="warning" no-close class="oc-m" id="accounts-list-loading-failed">
-          <oc-icon name="warning" variation="warning" class="uk-float-left oc-mr-s" />
+          <oc-icon name="error-warning" variation="warning" class="uk-float-left oc-mr-s" />
           <translate>You don't have permissions to manage accounts.</translate>
         </oc-alert>
       </template>
diff --git a/accounts/ui/components/accounts/AccountsCreate.vue b/accounts/ui/components/accounts/AccountsCreate.vue
index c7732ffa2a8..acfa11abfb5 100644
--- a/accounts/ui/components/accounts/AccountsCreate.vue
+++ b/accounts/ui/components/accounts/AccountsCreate.vue
@@ -65,7 +65,7 @@
           gap-size="small"
           @click="setFormInProgress(true)"
         >
-          <oc-icon name="add" />
+          <oc-icon name="user-add" />
           <translate>Create new account</translate>
         </oc-button>
       </div>
diff --git a/accounts/ui/components/accounts/AccountsListRow.vue b/accounts/ui/components/accounts/AccountsListRow.vue
index 8d836f8dbde..194a053da93 100644
--- a/accounts/ui/components/accounts/AccountsListRow.vue
+++ b/accounts/ui/components/accounts/AccountsListRow.vue
@@ -21,7 +21,7 @@
       <oc-button :id="`accounts-roles-select-trigger-${account.id}`" class="accounts-roles-select-trigger" appearance="outline">
         <span class="uk-flex uk-flex-middle accounts-roles-current-role">
           {{ currentRole ? currentRole.displayName : $gettext('Select role') }}
-          <oc-icon name="expand_more" aria-hidden="true" />
+          <oc-icon name="arrow-down-s" aria-hidden="true" />
         </span>
       </oc-button>
       <oc-drop
@@ -48,15 +48,15 @@
       <oc-icon
         v-if="account.accountEnabled"
         key="account-icon-enabled"
-        name="ready"
+        name="user-follow"
         variation="success"
         :aria-label="$gettext('Account is activated')"
         class="accounts-status-indicator-enabled"
       />
       <oc-icon
         v-else
-        name="deprecated"
         key="account-icon-disabled"
+        name="user-unfollow"
         variation="danger"
         :aria-label="$gettext('Account is blocked')"
         class="accounts-status-indicator-disabled"
diff --git a/accounts/yarn.lock b/accounts/yarn.lock
index a2c5c31dde7..d7c8ab4dfe4 100644
--- a/accounts/yarn.lock
+++ b/accounts/yarn.lock
@@ -8347,7 +8347,7 @@ __metadata:
     vuex: ^3.5.1
     xml-js: ^1.6.11
   peerDependencies:
-    owncloud-design-system: ^11.0.0
+    owncloud-design-system: ^12.1.0
   languageName: unknown
   linkType: soft
 
diff --git a/settings/package.json b/settings/package.json
index 2db14d9134b..c1ab88b767e 100644
--- a/settings/package.json
+++ b/settings/package.json
@@ -80,6 +80,6 @@
     "xml-js": "^1.6.11"
   },
   "peerDependencies": {
-    "owncloud-design-system": "^11.0.0"
+    "owncloud-design-system": "^12.1.0"
   }
 }
diff --git a/settings/ui/app.js b/settings/ui/app.js
index 1f80134b2d7..58d8a23f033 100644
--- a/settings/ui/app.js
+++ b/settings/ui/app.js
@@ -11,7 +11,7 @@ function $gettext (msg) {
 const appInfo = {
   name: $gettext('Settings'),
   id: 'settings',
-  icon: 'application',
+  icon: 'settings-4',
   isFileEditor: false,
   extensions: []
 }
@@ -20,9 +20,7 @@ const routes = [
   {
     name: 'settings',
     path: '/:extension?',
-    components: {
-      app: SettingsApp
-    }
+    component: SettingsApp
   }
 ]
 
diff --git a/settings/ui/components/SettingsApp.vue b/settings/ui/components/SettingsApp.vue
index acc0e85ad2b..1a280d0e6d8 100644
--- a/settings/ui/components/SettingsApp.vue
+++ b/settings/ui/components/SettingsApp.vue
@@ -4,7 +4,7 @@
       <template v-if="initialized">
         <oc-alert v-if="extensions.length === 0" variation="primary" no-close>
           <p class="uk-flex uk-flex-middle">
-            <oc-icon name="info" class="oc-mr-s" />
+            <oc-icon name="information" class="oc-mr-s" />
             <translate>No settings available</translate>
           </p>
         </oc-alert>
diff --git a/tests/config/drone/ocis-config.json b/tests/config/drone/ocis-config.json
index 86a064b5c47..de2ead136c9 100644
--- a/tests/config/drone/ocis-config.json
+++ b/tests/config/drone/ocis-config.json
@@ -1,29 +1,32 @@
 {
-    "server": "https://ocis-server:9200",
-    "theme": "https://ocis-server:9200/themes/owncloud/theme.json",
-    "version": "0.1.0",
-    "openIdConnect": {
-        "metadata_url": "https://ocis-server:9200/.well-known/openid-configuration",
-        "authority": "https://ocis-server:9200",
-        "client_id": "web",
-        "response_type": "code",
-        "scope": "openid profile email"
+  "server": "https://ocis-server:9200",
+  "theme": "https://ocis-server:9200/themes/owncloud/theme.json",
+  "version": "0.1.0",
+  "openIdConnect": {
+    "metadata_url": "https://ocis-server:9200/.well-known/openid-configuration",
+    "authority": "https://ocis-server:9200",
+    "client_id": "web",
+    "response_type": "code",
+    "scope": "openid profile email"
+  },
+  "options": {
+    "displayResourcesLazy": false
+  },
+  "apps": [
+    "files",
+    "draw-io",
+    "markdown-editor",
+    "media-viewer",
+    "search"
+  ],
+  "external_apps": [
+    {
+      "id": "settings",
+      "path": "https://ocis-server:9200/settings.js"
     },
-    "apps": [
-        "files",
-        "draw-io",
-        "markdown-editor",
-        "media-viewer",
-	"search"
-    ],
-    "external_apps": [
-        {
-            "id": "settings",
-            "path": "https://ocis-server:9200/settings.js"
-        },
-        {
-            "id": "accounts",
-            "path": "https://ocis-server:9200/accounts.js"
-        }
-    ]
+    {
+      "id": "accounts",
+      "path": "https://ocis-server:9200/accounts.js"
+    }
+  ]
 }

From ab82aeed730f4274422b4d0a71c7110caa43a14b Mon Sep 17 00:00:00 2001
From: Pascal Wengerter <pascal@wengerter.info>
Date: Mon, 14 Feb 2022 17:56:50 +0100
Subject: [PATCH 3/3] Handle UiKit & iconMaterial removal

Bump web-test-middleware in CI

Remove fileUpload volumes in CI, bump web to official v5.0.0

Rename web changelog & fix settings acceptance test

Add 'Spaces' to settings navBar tests

Add new profile link & quota to settings userMenu tests

Update expected failures from web v5.0.0 release

Bump web commit ID

Bump web commit ID
---
 .drone.env                                    |  2 +-
 .drone.star                                   |  8 +----
 accounts/ui/app.js                            |  5 ++-
 accounts/ui/components/App.vue                | 26 ++++++++++----
 .../accounts/AccountsBatchActions.vue         | 35 +++++++++++++++----
 .../ui/components/accounts/AccountsCreate.vue |  8 +++--
 .../ui/components/accounts/AccountsList.vue   |  9 +++--
 .../components/accounts/AccountsListRow.vue   | 18 +++++++---
 .../{update-5.0.0.md => update-web-5.0.0.md}  |  0
 settings/ui/app.js                            |  7 ++--
 settings/ui/components/SettingsApp.vue        | 10 +++---
 settings/ui/components/SettingsBundle.vue     | 27 ++++++++------
 .../ui/components/settings/SettingNumber.vue  |  2 +-
 .../ui/components/settings/SettingString.vue  |  2 +-
 .../acceptance/features/settings.feature      |  2 +-
 .../ui/tests/acceptance/helpers/language.js   | 24 ++++++++-----
 ...expected-failures-webUI-on-OCIS-storage.md | 33 ++++++++---------
 web/Makefile                                  |  2 +-
 18 files changed, 138 insertions(+), 82 deletions(-)
 rename changelog/unreleased/{update-5.0.0.md => update-web-5.0.0.md} (100%)

diff --git a/.drone.env b/.drone.env
index 9c211f96b76..b8af3d5550b 100644
--- a/.drone.env
+++ b/.drone.env
@@ -3,5 +3,5 @@ CORE_COMMITID=cb9a31fd45721406ee150682d86e29e1b2e8b0d8
 CORE_BRANCH=master
 
 # The test runner source for UI tests
-WEB_COMMITID=e84960674723d8fb8c3c42e1ada8ef8cc1747ba6
+WEB_COMMITID=905b4e342db0202cdbaa8c21096bf87f179b25f6
 WEB_BRANCH=master
diff --git a/.drone.star b/.drone.star
index 17242bf6a37..f0f0991d8ef 100644
--- a/.drone.star
+++ b/.drone.star
@@ -7,7 +7,7 @@ OC_CI_GOLANG = "owncloudci/golang:1.17"
 OC_CI_NODEJS = "owncloudci/nodejs:14"
 OC_CI_PHP = "owncloudci/php:7.4"
 OC_CI_WAIT_FOR = "owncloudci/wait-for:latest"
-OC_TESTING_MIDDLEWARE = "owncloud/owncloud-test-middleware:1.3.0"
+OC_TESTING_MIDDLEWARE = "owncloud/owncloud-test-middleware:1.3.1"
 MINIO_MC = "minio/mc:RELEASE.2021-10-07T04-19-58Z"
 REDIS = "redis:6-alpine"
 
@@ -635,16 +635,10 @@ def uiTestPipeline(ctx, filterTags, early_fail, runPart = 1, numberOfParts = 1,
                     "git clone -b $WEB_BRANCH --single-branch --no-tags https://github.com/owncloud/web.git /srv/app/web",
                     "cd /srv/app/web",
                     "git checkout $WEB_COMMITID",
-                    "cp -r tests/acceptance/filesForUpload/* /uploads",
                     "cd tests/acceptance/",
                     "yarn install --immutable",
                     "./run.sh",
                 ],
-                "volumes": [stepVolumeOC10Tests] +
-                           [{
-                               "name": "uploads",
-                               "path": "/uploads",
-                           }],
             },
         ] + failEarly(ctx, early_fail),
         "services": selenium() + middlewareService(),
diff --git a/accounts/ui/app.js b/accounts/ui/app.js
index a4e2c963b78..82d3b7d3c1f 100644
--- a/accounts/ui/app.js
+++ b/accounts/ui/app.js
@@ -12,8 +12,7 @@ const appInfo = {
   name: $gettext('Accounts'),
   id: 'accounts',
   icon: 'team',
-  isFileEditor: false,
-  extensions: []
+  isFileEditor: false
 }
 
 const routes = [
@@ -27,7 +26,7 @@ const routes = [
 const navItems = [
   {
     name: $gettext('Accounts'),
-    iconMaterial: appInfo.icon,
+    icon: appInfo.icon,
     route: {
       name: 'accounts',
       path: `/${appInfo.id}/`
diff --git a/accounts/ui/components/App.vue b/accounts/ui/components/App.vue
index 4c36b0b8237..d99688cc02b 100644
--- a/accounts/ui/components/App.vue
+++ b/accounts/ui/components/App.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <main class="uk-flex uk-flex-column uk-height-1-1 oc-px-s" id="accounts-app">
+    <main class="oc-flex oc-flex-column oc-height-1-1 oc-p-m" id="accounts-app">
       <template v-if="isInitialized">
         <h1 class="oc-invisible-sr">
           <translate>Accounts</translate>
@@ -13,15 +13,24 @@
           />
           <accounts-create v-else />
         </div>
-        <oc-grid class="uk-flex-1 uk-overflow-auto">
-          <div class="uk-width-expand">
+        <oc-grid class="oc-flex-1 oc-overflow-auto">
+          <div class="oc-width-expand">
             <accounts-list :accounts="accounts" />
           </div>
         </oc-grid>
       </template>
       <template v-else-if="hasFailed">
-        <oc-alert variation="warning" no-close class="oc-m" id="accounts-list-loading-failed">
-          <oc-icon name="error-warning" variation="warning" class="uk-float-left oc-mr-s" />
+        <oc-alert
+          variation="warning"
+          no-close
+          class="oc-m"
+          id="accounts-list-loading-failed"
+        >
+          <oc-icon
+            name="error-warning"
+            variation="warning"
+            class="oc-float-left oc-mr-s"
+          />
           <translate>You don't have permissions to manage accounts.</translate>
         </oc-alert>
       </template>
@@ -40,7 +49,12 @@ export default {
   name: 'App',
   components: { AccountsBatchActions, AccountsList, AccountsCreate },
   computed: {
-    ...mapGetters('Accounts', ['isInitialized', 'hasFailed', 'getAccountsSorted', 'isAnyAccountSelected']),
+    ...mapGetters('Accounts', [
+      'isInitialized',
+      'hasFailed',
+      'getAccountsSorted',
+      'isAnyAccountSelected'
+    ]),
     ...mapState('Accounts', ['selectedAccounts']),
 
     accounts () {
diff --git a/accounts/ui/components/accounts/AccountsBatchActions.vue b/accounts/ui/components/accounts/AccountsBatchActions.vue
index 8161b45a198..da636bb7eed 100644
--- a/accounts/ui/components/accounts/AccountsBatchActions.vue
+++ b/accounts/ui/components/accounts/AccountsBatchActions.vue
@@ -1,22 +1,45 @@
 <template>
-  <oc-grid key="selected-accounts-info" gutter="small" class="uk-flex-middle">
+  <oc-grid key="selected-accounts-info" gutter="small" class="oc-flex-middle">
     <span v-text="selectionInfoText" />
     <span>|</span>
     <div>
-      <oc-button v-text="$gettext('Clear selection')" appearance="raw" @click="RESET_ACCOUNTS_SELECTION" />
+      <oc-button
+        v-text="$gettext('Clear selection')"
+        appearance="raw"
+        @click="RESET_ACCOUNTS_SELECTION"
+      />
     </div>
     <oc-grid gutter="small" id="accounts-batch-actions">
       <div v-for="action in actions" :key="action.label">
-        <div v-if="isConfirmationInProgress[action.id]" :variation="action.confirmation.variation || 'primary'" noClose class="uk-flex uk-flex-middle tmp-alert-fixes">
+        <div
+          v-if="isConfirmationInProgress[action.id]"
+          :variation="action.confirmation.variation || 'primary'"
+          noClose
+          class="oc-flex oc-flex-middle tmp-alert-fixes"
+        >
           <span>{{ action.confirmation.message }}</span>
-          <oc-button :id="action.confirmation.cancel.id" @click="action.confirmation.cancel.handler" :variation="action.confirmation.cancel.variation || 'passive'">
+          <oc-button
+            :id="action.confirmation.cancel.id"
+            @click="action.confirmation.cancel.handler"
+            :variation="action.confirmation.cancel.variation || 'passive'"
+          >
             {{ action.confirmation.cancel.label }}
           </oc-button>
-          <oc-button :id="action.confirmation.confirm.id" @click="action.confirmation.confirm.handler" :variation="action.confirmation.confirm.variation || 'primary'">
+          <oc-button
+            :id="action.confirmation.confirm.id"
+            @click="action.confirmation.confirm.handler"
+            :variation="action.confirmation.confirm.variation || 'primary'"
+          >
             {{ action.confirmation.confirm.label }}
           </oc-button>
         </div>
-        <oc-button v-else :id="action.id" @click="action.handler" :variation="action.variation || 'primary'" :icon="action.icon">
+        <oc-button
+          v-else
+          :id="action.id"
+          @click="action.handler"
+          :variation="action.variation || 'primary'"
+          :icon="action.icon"
+        >
           {{ action.label }}
         </oc-button>
       </div>
diff --git a/accounts/ui/components/accounts/AccountsCreate.vue b/accounts/ui/components/accounts/AccountsCreate.vue
index acfa11abfb5..20305c61d12 100644
--- a/accounts/ui/components/accounts/AccountsCreate.vue
+++ b/accounts/ui/components/accounts/AccountsCreate.vue
@@ -28,7 +28,7 @@
         :disabled="isRequestInProgress"
         @keydown.enter="createAccount"
       />
-      <div class="uk-flex">
+      <div class="oc-flex">
         <oc-button
           class="oc-mr-s oc-mb-s"
           v-text="$gettext('Cancel')"
@@ -51,7 +51,11 @@
             size="small"
             aria-hidden="true"
           />
-          <span v-text="isRequestInProgress ? $gettext('Creating') : $gettext('Create')" />
+          <span
+            v-text="
+              isRequestInProgress ? $gettext('Creating') : $gettext('Create')
+            "
+          />
         </oc-button>
       </div>
     </oc-grid>
diff --git a/accounts/ui/components/accounts/AccountsList.vue b/accounts/ui/components/accounts/AccountsList.vue
index 33ed3836dc4..051080e2dff 100644
--- a/accounts/ui/components/accounts/AccountsList.vue
+++ b/accounts/ui/components/accounts/AccountsList.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <oc-table-simple id="accounts-user-list">
+    <oc-table-simple id="accounts-user-list" class="oc-mt-l">
       <oc-thead>
         <oc-tr>
           <oc-th shrink type="head" align-h="center">
@@ -17,7 +17,12 @@
           <oc-th type="head" v-text="$gettext('Display name')" />
           <oc-th type="head" v-text="$gettext('Email')" />
           <oc-th type="head" v-text="$gettext('Role')" />
-          <oc-th shrink type="head" v-text="$gettext('Activated')" align-h="center"/>
+          <oc-th
+            shrink
+            type="head"
+            v-text="$gettext('Activated')"
+            align-h="center"
+          />
         </oc-tr>
       </oc-thead>
       <oc-tbody>
diff --git a/accounts/ui/components/accounts/AccountsListRow.vue b/accounts/ui/components/accounts/AccountsListRow.vue
index 194a053da93..76bb7cb048d 100644
--- a/accounts/ui/components/accounts/AccountsListRow.vue
+++ b/accounts/ui/components/accounts/AccountsListRow.vue
@@ -12,15 +12,23 @@
       />
     </oc-td>
     <oc-td>
-      <avatar :user-name="account.displayName || account.onPremisesSamAccountName" :userid="account.id" :width="35" />
+      <avatar
+        :user-name="account.displayName || account.onPremisesSamAccountName"
+        :userid="account.id"
+        :width="35"
+      />
     </oc-td>
     <oc-td v-text="account.onPremisesSamAccountName" />
     <oc-td v-text="account.displayName || '-'" />
     <oc-td v-text="account.mail" />
     <oc-td>
-      <oc-button :id="`accounts-roles-select-trigger-${account.id}`" class="accounts-roles-select-trigger" appearance="outline">
-        <span class="uk-flex uk-flex-middle accounts-roles-current-role">
-          {{ currentRole ? currentRole.displayName : $gettext('Select role') }}
+      <oc-button
+        :id="`accounts-roles-select-trigger-${account.id}`"
+        class="accounts-roles-select-trigger"
+        appearance="outline"
+      >
+        <span class="oc-flex oc-flex-middle accounts-roles-current-role">
+          {{ currentRole ? currentRole.displayName : $gettext("Select role") }}
           <oc-icon name="arrow-down-s" aria-hidden="true" />
         </span>
       </oc-button>
@@ -31,7 +39,7 @@
         close-on-click
         :options="{ delayHide: 0 }"
       >
-        <ul class="uk-list">
+        <ul class="oc-list">
           <li v-for="role in roles" :key="role.id">
             <oc-radio
               class="accounts-roles-dropdown-role"
diff --git a/changelog/unreleased/update-5.0.0.md b/changelog/unreleased/update-web-5.0.0.md
similarity index 100%
rename from changelog/unreleased/update-5.0.0.md
rename to changelog/unreleased/update-web-5.0.0.md
diff --git a/settings/ui/app.js b/settings/ui/app.js
index 58d8a23f033..217e347a653 100644
--- a/settings/ui/app.js
+++ b/settings/ui/app.js
@@ -4,7 +4,7 @@ import store from './store'
 import translations from './../l10n/translations.json'
 
 // just a dummy function to trick gettext tools
-function $gettext (msg) {
+function $gettext(msg) {
   return msg
 }
 
@@ -12,8 +12,7 @@ const appInfo = {
   name: $gettext('Settings'),
   id: 'settings',
   icon: 'settings-4',
-  isFileEditor: false,
-  extensions: []
+  isFileEditor: false
 }
 
 const routes = [
@@ -27,7 +26,7 @@ const routes = [
 const navItems = [
   {
     name: $gettext('Settings'),
-    iconMaterial: appInfo.icon,
+    icon: appInfo.icon,
     route: {
       name: 'settings',
       path: `/${appInfo.id}/`
diff --git a/settings/ui/components/SettingsApp.vue b/settings/ui/components/SettingsApp.vue
index 1a280d0e6d8..4e7d81ff07b 100644
--- a/settings/ui/components/SettingsApp.vue
+++ b/settings/ui/components/SettingsApp.vue
@@ -1,16 +1,16 @@
 <template>
   <div class="oc-p">
-    <main class="uk-flex uk-flex-column" id="settings-app">
+    <main class="oc-flex oc-flex-column" id="settings-app">
       <template v-if="initialized">
         <oc-alert v-if="extensions.length === 0" variation="primary" no-close>
-          <p class="uk-flex uk-flex-middle">
+          <p class="oc-flex oc-flex-middle">
             <oc-icon name="information" class="oc-mr-s" />
             <translate>No settings available</translate>
           </p>
         </oc-alert>
         <template v-else>
           <template v-if="selectedExtensionName">
-            <div class="uk-flex uk-flex-between uk-flex-middle">
+            <div class="oc-flex oc-flex-between oc-flex-middle">
               <h1 class="oc-page-title">
                 {{ selectedExtensionName }}
               </h1>
@@ -96,7 +96,7 @@ export default {
          */
         const navItem = {
           name: this.getExtensionName(extension),
-          iconMaterial: this.getExtensionIcon(extension),
+          icon: this.getExtensionIcon(extension),
           route: {
             name: 'settings',
             path: `/settings/${extension}`
@@ -126,7 +126,7 @@ export default {
       extension = extension || ''
       switch (extension) {
         case 'ocis-accounts':
-          return 'account_circle'
+          return 'team'
         case 'ocis-hello':
           return 'tag_faces'
         default:
diff --git a/settings/ui/components/SettingsBundle.vue b/settings/ui/components/SettingsBundle.vue
index 07307cf6d7f..c62d22bf6eb 100644
--- a/settings/ui/components/SettingsBundle.vue
+++ b/settings/ui/components/SettingsBundle.vue
@@ -1,19 +1,26 @@
 <template>
-  <div class="uk-width-1-1 uk-width-2-3@m uk-width-1-2@l uk-width-1-3@xl">
+  <div class="oc-width-1-1 oc-width-2-3@m oc-width-1-2@l oc-width-1-3@xl">
     <h2 class="oc-mb-s">
       <translate>{{ bundle.displayName }}</translate>
     </h2>
     <oc-grid gutter="small">
       <template>
-        <div class="uk-width-1-1" v-for="setting in bundle.settings" :key="setting.id">
-          <label class="oc-label" :for="setting.id">{{ setting.displayName }}</label>
-          <div class="uk-position-relative"
-               :is="getSettingComponent(setting)"
-               :id="setting.id"
-               :bundle="bundle"
-               :setting="setting"
-               :persisted-value="getValue(setting)"
-               @onSave="onSaveValue"
+        <div
+          class="oc-width-1-1"
+          v-for="setting in bundle.settings"
+          :key="setting.id"
+        >
+          <label class="oc-label" :for="setting.id">{{
+            setting.displayName
+          }}</label>
+          <div
+            class="oc-position-relative"
+            :is="getSettingComponent(setting)"
+            :id="setting.id"
+            :bundle="bundle"
+            :setting="setting"
+            :persisted-value="getValue(setting)"
+            @onSave="onSaveValue"
           />
         </div>
       </template>
diff --git a/settings/ui/components/settings/SettingNumber.vue b/settings/ui/components/settings/SettingNumber.vue
index 07b0b075db9..e6f1cadb096 100644
--- a/settings/ui/components/settings/SettingNumber.vue
+++ b/settings/ui/components/settings/SettingNumber.vue
@@ -1,6 +1,6 @@
 <template>
   <oc-grid flex>
-    <div class="uk-width-expand">
+    <div class="oc-width-expand">
       <oc-text-input
         type="number"
         v-model="value"
diff --git a/settings/ui/components/settings/SettingString.vue b/settings/ui/components/settings/SettingString.vue
index aa80fa078b7..8579f9c0d1e 100644
--- a/settings/ui/components/settings/SettingString.vue
+++ b/settings/ui/components/settings/SettingString.vue
@@ -1,6 +1,6 @@
 <template>
   <oc-grid flex>
-    <div class="uk-width-expand">
+    <div class="oc-width-expand">
       <oc-text-input
         v-model="value"
         :placeholder="setting.stringValue.placeholder"
diff --git a/settings/ui/tests/acceptance/features/settings.feature b/settings/ui/tests/acceptance/features/settings.feature
index bbf05dea126..37c081987eb 100644
--- a/settings/ui/tests/acceptance/features/settings.feature
+++ b/settings/ui/tests/acceptance/features/settings.feature
@@ -8,7 +8,7 @@ Feature: Set user specific settings
 			| username |
 			| user1    |
 			| user2    |
-		And user "user1" has created folder "simple-folder"
+		And user "user1" has created folder "simple-folder" in the server
 
 	Scenario: Check the default settings
 		Given user "user1" has logged in using the webUI
diff --git a/settings/ui/tests/acceptance/helpers/language.js b/settings/ui/tests/acceptance/helpers/language.js
index 59032e2b246..e0226b7df5a 100644
--- a/settings/ui/tests/acceptance/helpers/language.js
+++ b/settings/ui/tests/acceptance/helpers/language.js
@@ -4,6 +4,7 @@ const filesMenu = {
     'Shared with me',
     'Shared with others',
     'Shared via link',
+    'Spaces',
     'Deleted files'
   ],
   Deutsch: [
@@ -11,6 +12,7 @@ const filesMenu = {
     'Mit mir geteilt',
     'Mit anderen geteilt',
     'Per Link geteilt',
+    'Spaces',
     'Gelöschte Dateien'
   ],
   Español: [
@@ -18,6 +20,7 @@ const filesMenu = {
     'Compartido conmigo',
     'Compartido con otros',
     'Shared via link',
+    'Spaces',
     'Archivos borrados'
   ],
   Français: [
@@ -25,30 +28,35 @@ const filesMenu = {
     'Partagé avec moi',
     'Partagé avec autres',
     'Shared via link',
+    'Spaces',
     'Fichiers supprimés'
   ]
 }
 
 const accountMenu = {
   English: [
-    'Profile',
+    'N\nnull\nuser1@example.com',
     'Settings',
-    'Log out'
+    'Log out',
+    'Personal storage (0.2% used)\n5.06 GB of 2.85 TB used'
   ],
   Deutsch: [
-    'Profil',
+    'N\nnull\nuser1@example.com',
     'Einstellungen',
-    'Abmelden'
+    'Abmelden',
+    'Persönlicher Speicher (0.2% benutzt)\n5.06 GB von 2.85 TB benutzt'
   ],
   Español: [
-    'Profile',
+    'N\nnull\nuser1@example.com',
     'Configuración',
-    'Salir'
+    'Salir',
+    'Personal storage (0.2% used)\n5.06 GB of 2.85 TB used'
   ],
   Français: [
-    'Profil',
+    'N\nnull\nuser1@example.com',
     'Settings',
-    'Se déconnecter'
+    'Se déconnecter',
+    'Personal storage (0.2% used)\n5.06 GB of 2.85 TB used'
   ]
 }
 
diff --git a/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md b/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md
index 8fd16b9169a..cb8afc016d5 100644
--- a/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md
+++ b/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md
@@ -113,7 +113,7 @@ Other free text and markdown formatting can be used elsewhere in the document if
 -   [webUIFilesActionMenu/versions.feature:63](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesActionMenu/versions.feature#L63)
 
 ### [downloading an old version of a file returns 501](https://github.com/owncloud/ocis/issues/2261)
--   [webUIFilesActionMenu/versions.feature:107](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesActionMenu/versions.feature#L107)
+-   [webUIFilesActionMenu/versions.feature:105](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesActionMenu/versions.feature#L105)
 
 ### [No occ command in ocis](https://github.com/owncloud/ocis/issues/1317)
 -   [webUIRestrictSharing/restrictReSharing.feature:23](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRestrictSharing/restrictReSharing.feature#L23)
@@ -196,10 +196,10 @@ Other free text and markdown formatting can be used elsewhere in the document if
 -   [webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:313](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature#L313)
 -   [webUIMoveFilesFolders/moveFiles.feature:97](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIMoveFilesFolders/moveFiles.feature#L97)
 -   [webUIMoveFilesFolders/moveFolders.feature:72](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIMoveFilesFolders/moveFolders.feature#L72)
--   [webUIFilesActionMenu/versions.feature:94](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesActionMenu/versions.feature#L94)
+-   [webUIFilesActionMenu/versions.feature:93](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesActionMenu/versions.feature#L93)
 
 ### [Accepting different shares with same filename from different users overwrites one file](https://github.com/owncloud/ocis/issues/713)
--   [webUISharingAcceptShares/acceptShares.feature:212](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L212)
+-   [webUISharingAcceptShares/acceptShares.feature:228](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L228)
 
 ### [Deletion of a selected user/group as a collaborator has unusual behavior in UI](https://github.com/owncloud/web/issues/5857)
 -   [webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature:63](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature#L63)
@@ -315,7 +315,6 @@ Other free text and markdown formatting can be used elsewhere in the document if
 -   [webUITrashbinRestore/trashbinRestore.feature:138](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature#L138)
 
 ### [Conflict / overwrite issues with TUS](https://github.com/owncloud/ocis/issues/1294)
--   [webUIUpload/uploadEdgecases.feature:109](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/uploadEdgecases.feature#L109)
 -   [webUIUpload/uploadFileGreaterThanQuotaSize.feature:12](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/uploadFileGreaterThanQuotaSize.feature#L12)
 
 ### [restoring a file deleted from a received shared folder is not possible](https://github.com/owncloud/ocis/issues/1124)
@@ -355,12 +354,12 @@ Other free text and markdown formatting can be used elsewhere in the document if
 -   [webUISharingInternalGroupsSharingIndicator/shareWithGroups.feature:80](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroupsSharingIndicator/shareWithGroups.feature#L80)
 
 ### [Deletion of a recursive folder from trashbin is not possible](https://github.com/owncloud/product/issues/188)
--   [webUITrashbinDelete/trashbinDelete.feature:86](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L86)
--   [webUITrashbinDelete/trashbinDelete.feature:72](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L72)
--   [webUITrashbinDelete/trashbinDelete.feature:49](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L49)
+-   [webUITrashbinDelete/trashbinDelete.feature:85](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L85)
+-   [webUITrashbinDelete/trashbinDelete.feature:71](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L71)
+-   [webUITrashbinDelete/trashbinDelete.feature:48](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L48)
 
 ### [Tags page not implemented yet](https://github.com/owncloud/web/issues/5017)
--   [webUIDeleteFilesFolders/deleteFilesFolders.feature:131](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature#L131)
+-   [webUIDeleteFilesFolders/deleteFilesFolders.feature:145](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature#L145)
 -   [webUIFilesSearch/search.feature:63](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L63)
 -   [webUIFilesSearch/search.feature:71](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L71)
 -   [webUIFilesSearch/search.feature:84](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L84)
@@ -467,9 +466,9 @@ Other free text and markdown formatting can be used elsewhere in the document if
 -   [webUISharingExternal/federationSharing.feature:166](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingExternal/federationSharing.feature#L166)
 
 ### [Uploading a file with a name that already exists is confusing](https://github.com/owncloud/web/issues/5106)
--   [webUIUpload/upload.feature:108](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/upload.feature#L108)
--   [webUIUpload/upload.feature:121](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/upload.feature#L121)
--   [webUIUpload/upload.feature:138](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/upload.feature#L138)
+-   [webUIUpload/upload.feature:129](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/upload.feature#L129)
+-   [webUIUpload/upload.feature:142](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/upload.feature#L142)
+-   [webUIUpload/upload.feature:159](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/upload.feature#L159)
 -   [webUIUpload/uploadEdgecases.feature:67](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/uploadEdgecases.feature#L67)
 
 ### [browsing directly to a details 'tab' is not possible](https://github.com/owncloud/web/issues/5464)
@@ -485,8 +484,8 @@ Other free text and markdown formatting can be used elsewhere in the document if
 
 ### [[oCIS] Received share cannot be deleted/unshared if not shared with full permissions](https://github.com/owncloud/web/issues/5531)
 -   [webUISharingAcceptShares/acceptShares.feature:50](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L50)
--   [webUISharingAcceptShares/acceptShares.feature:146](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L146)
--   [webUISharingAcceptShares/acceptShares.feature:185](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L185)
+-   [webUISharingAcceptShares/acceptShares.feature:162](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L162)
+-   [webUISharingAcceptShares/acceptShares.feature:201](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L201)
 
 ### [not possible to overwrite a received shared file](https://github.com/owncloud/ocis/issues/2267)
 -   [webUISharingInternalGroups/shareWithGroups.feature:77](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature#L77)
@@ -495,12 +494,8 @@ Other free text and markdown formatting can be used elsewhere in the document if
 ### [shares are not listed with full paths](https://github.com/owncloud/ocis/issues/2462)
 -   [webUISharingPublicBasic/publicLinkCreate.feature:88](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicBasic/publicLinkCreate.feature#L88)
 
-### Shares folder cannot be deleted and is always visible
--   [webUIDeleteFilesFolders/deleteFilesFolders.feature:77](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature#L77)
--   [webUIDeleteFilesFolders/deleteFilesFolders.feature:89](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature#L89)
--   [webUISharingAcceptShares/acceptShares.feature:72](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L72)
-
-
 ### [web config update is not properly reflected after the ocis start](https://github.com/owncloud/ocis/issues/2944)
 -   [webUIFiles/breadcrumb.feature:50](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFiles/breadcrumb.feature#L50)
 
+### [empty subfolder inside a folder to be uploaded is not created on the server](https://github.com/owncloud/web/issues/6348)
+-   [webUIUpload/upload.feature:42](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/upload.feature#L42)
diff --git a/web/Makefile b/web/Makefile
index 1806a1b0294..e36d4afa1d4 100644
--- a/web/Makefile
+++ b/web/Makefile
@@ -29,7 +29,7 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target
 .PHONY: ci-node-generate
 ci-node-generate: pull-assets
 
-WEB_ASSETS_VERSION = v5.0.0-rc
+WEB_ASSETS_VERSION = v5.0.0
 
 .PHONY: pull-assets
 pull-assets: