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] 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"
+    }
+  ]
 }