diff --git a/.drone.env b/.drone.env index 2c03052e226..789e876e2f3 100644 --- a/.drone.env +++ b/.drone.env @@ -3,5 +3,5 @@ CORE_COMMITID=0fd7346bfb7de34ed9c9b6ca22bf1f90ac50eb1d CORE_BRANCH=master # The test runner source for UI tests -WEB_COMMITID=b7b084cd06278c5f02cdf67fe8665959d0c5c13d +WEB_COMMITID=8062d6324081a3cfaafd0a4ad780cfbd905e5c94 WEB_BRANCH=master diff --git a/.drone.star b/.drone.star index 3c33f15bde7..5a675d19d88 100644 --- a/.drone.star +++ b/.drone.star @@ -563,7 +563,7 @@ def uiTestPipeline(ctx, suiteName, storage = 'owncloud', accounts_hash_difficult 'BACKEND_HOST': 'https://ocis-server:9200', 'RUN_ON_OCIS': 'true', 'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/ocis/owncloud/data', - 'OCIS_SKELETON_DIR': '/srv/app/testing/data/webUISkeleton', + 'TESTING_DATA_DIR': '/srv/app/testing/data', 'WEB_UI_CONFIG': '/drone/src/tests/config/drone/ocis-config.json', 'TEST_TAGS': 'not @skipOnOCIS and not @skip and not @notToImplementOnOCIS', 'LOCAL_UPLOAD_DIR': '/uploads', diff --git a/accounts/package.json b/accounts/package.json index c0f252c9dd1..f8de2a96810 100644 --- a/accounts/package.json +++ b/accounts/package.json @@ -8,7 +8,7 @@ "author": "ownCloud GmbH ", "repository": "https://github.com/owncloud/ocis-accounts.git", "bugs": { - "url": "https://github.com/owncloud/ocis/accounts/issues", + "url": "https://github.com/owncloud/ocis/issues", "email": "support@owncloud.com" }, "scripts": { @@ -76,7 +76,7 @@ "not dead" ], "peerDependencies": { - "owncloud-design-system": "^1.7.0" + "owncloud-design-system": "^6.0.1" }, "dependencies": { "validator": "^13.1.1" diff --git a/accounts/ui/components/App.vue b/accounts/ui/components/App.vue index c3a134a6a12..e922edb1b0b 100644 --- a/accounts/ui/components/App.vue +++ b/accounts/ui/components/App.vue @@ -1,7 +1,10 @@ @@ -55,17 +58,3 @@ export default { } } - - diff --git a/accounts/ui/components/accounts/AccountsBatchActions.vue b/accounts/ui/components/accounts/AccountsBatchActions.vue index 969249d5cf2..8161b45a198 100644 --- a/accounts/ui/components/accounts/AccountsBatchActions.vue +++ b/accounts/ui/components/accounts/AccountsBatchActions.vue @@ -3,20 +3,20 @@ |
- +
- +
{{ action.confirmation.message }} - + {{ action.confirmation.cancel.label }} - + {{ action.confirmation.confirm.label }} - - +
+ {{ action.label }}
@@ -78,6 +78,7 @@ export default { id: idDeleteAction, label: this.$gettext('Delete'), icon: 'delete', + variation: 'danger', handler: () => this.showConfirmationRequest(idDeleteAction), confirmation: { variation: 'danger', @@ -89,7 +90,6 @@ export default { cancel: { id: 'accounts-batch-action-delete-cancel', label: this.$gettext('Cancel'), - variation: 'secondary', handler: () => this.hideConfirmationRequest(idDeleteAction) }, confirm: { @@ -119,13 +119,9 @@ export default { - diff --git a/accounts/ui/components/accounts/AccountsList.vue b/accounts/ui/components/accounts/AccountsList.vue index c5bf5e91522..33ed3836dc4 100644 --- a/accounts/ui/components/accounts/AccountsList.vue +++ b/accounts/ui/components/accounts/AccountsList.vue @@ -2,7 +2,7 @@
- + - - diff --git a/accounts/ui/components/accounts/AccountsListRow.vue b/accounts/ui/components/accounts/AccountsListRow.vue index aa431ebb8c7..8d836f8dbde 100644 --- a/accounts/ui/components/accounts/AccountsListRow.vue +++ b/accounts/ui/components/accounts/AccountsListRow.vue @@ -18,7 +18,7 @@ - + {{ currentRole ? currentRole.displayName : $gettext('Select role') }}
+ diff --git a/settings/ui/components/SettingsBundle.vue b/settings/ui/components/SettingsBundle.vue index 69bc29575b1..3456bef9e26 100644 --- a/settings/ui/components/SettingsBundle.vue +++ b/settings/ui/components/SettingsBundle.vue @@ -1,8 +1,8 @@