Merge pull request #3157 from owncloud/update-web-5.0.0

[full-ci] Update web to v5.0.0

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

settings/ui/app.js

@@ -4,32 +4,29 @@ 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
 }
 
 const appInfo = {
   name: $gettext('Settings'),
   id: 'settings',
-  icon: 'application',
-  isFileEditor: false,
-  extensions: []
+  icon: 'settings-4',
+  isFileEditor: false
 }
 
 const routes = [
   {
     name: 'settings',
     path: '/:extension?',
-    components: {
-      app: SettingsApp
-    }
+    component: SettingsApp
   }
 ]
 
 const navItems = [
   {
     name: $gettext('Settings'),
-    iconMaterial: appInfo.icon,
+    icon: appInfo.icon,
     route: {
       name: 'settings',
       path: `/${appInfo.id}/`

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">
-            <oc-icon name="info" class="oc-mr-s" />
+          <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:

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>

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"

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"

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

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'
   ]
 }