Merge pull request #625 from owncloud/phoenix-update

Phoenix update

.drone.star

@@ -20,7 +20,7 @@ config = {
   },
   'uiTests': {
     'phoenixBranch': 'master',
-    'phoenixCommit': '2ccec3966abebc7cff54cfdbd0aa9942253584a7',
+    'phoenixCommit': '3204f23746b1e958ef9eb38464949ef8107e9b1f',
     'suites': {
       'phoenixWebUI1': [
         'webUICreateFilesFolders',
@@ -471,7 +471,7 @@ def docker(ctx, arch):
         'temp': {},
       },
     ],
-    'depends_on': 
+    'depends_on':
       getTestSuiteNames() + [
       'localApiTests-owncloud-storage',
       'localApiTests-ocis-storage',

accounts/changelog/unreleased/fix-button-layout.md

@@ -0,0 +1,7 @@
+Bugfix: Fix button layout after phoenix update
+
+With the phoenix update to v0.17.0 a new ODS version was released which has a breaking change for buttons regarding
+their layouting. We adjusted the button layout in the accounts UI accordingly.
+
+https://github.com/owncloud/ocis/pull/625
+

accounts/go.sum

@@ -734,6 +734,7 @@ github.com/marten-seemann/qtls v0.4.1/go.mod h1:pxVXcHHw1pNIt8Qo0pwSYQEoZ8yYOOPX
 github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=

accounts/ui/components/accounts/AccountsBatchActions.vue

@@ -7,7 +7,7 @@
     </div>
     <oc-grid gutter="small" id="accounts-batch-actions">
       <div v-for="action in actions" :key="action.label">
-        <oc-alert v-if="isConfirmationInProgress[action.id]" :variation="action.confirmation.variation || 'default'" noClose class="tmp-alert-fixes">
+        <oc-alert v-if="isConfirmationInProgress[action.id]" :variation="action.confirmation.variation || 'default'" noClose class="uk-flex uk-flex-middle tmp-alert-fixes">
           <span>{{ action.confirmation.message }}</span>
           <oc-button size="small" :id="action.confirmation.cancel.id" @click="action.confirmation.cancel.handler" :variation="action.confirmation.cancel.variation || 'default'">
             {{ action.confirmation.cancel.label }}
@@ -117,16 +117,22 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .tmp-alert-fixes {
-  padding: 5px 10px 4px !important;
+  padding: 4px 10px !important;
   border-radius: 3px !important;
   background-color: #fff !important;
   border: 1px solid rgb(224, 0, 0) !important;
   color: rgb(224, 0, 0) !important;
 
-  font-size: 1.125rem !important;
+  font-size: 1.1rem !important;
   font-weight: 600 !important;
   line-height: 1.4 !important;
 }
+.tmp-alert-fixes > *:not(:last-child) {
+  margin-right: 8px;
+}
+.tmp-alert-fixes > button {
+  padding: 0.2rem 0.5rem;
+}
 </style>

accounts/ui/components/accounts/AccountsCreate.vue

@@ -23,7 +23,7 @@
           @keydown.enter="createAccount"
         />
       </label>
-      <label class="uk-margin-xsmall-right">
+      <label>
         <oc-text-input
           id="accounts-new-account-input-password"
           type="password"
@@ -38,14 +38,16 @@
         <oc-button
           v-text="$gettext('Cancel')"
           @click="cancelForm"
-          class="uk-margin-xsmall-right"
           :disabled="isRequestInProgress"
         />
+      </div>
+      <div>
         <oc-button
           id="accounts-new-account-button-confirm"
           variation="primary"
           :disabled="isRequestInProgress"
           @click="createAccount"
+          :class="{ 'border-ods-tmp-fix': !isRequestInProgress }"
         >
           <oc-spinner
             v-if="isRequestInProgress"
@@ -191,3 +193,9 @@ export default {
   align-items: center;
 }
 </style>
+<style scoped>
+.border-ods-tmp-fix {
+  /* TODO: somehow the primary button receives a 2px border-width. remove it until we fix it in ODS. */
+  border-width: 0 !important;
+}
+</style>

accounts/ui/components/accounts/AccountsList.vue

@@ -2,13 +2,14 @@
   <div>
     <oc-table middle divider>
       <oc-table-group>
-        <oc-table-row>
+        <oc-table-row class="fix-table-header">
           <oc-table-cell shrink type="head">
             <oc-checkbox
               :value="areAllAccountsSelected"
               :label="$gettext('Select all users')"
               hide-label
               @change="toggleSelectionAll"
+              class="uk-margin-small-left"
             />
           </oc-table-cell>
           <oc-table-cell shrink type="head" />
@@ -57,3 +58,9 @@ export default {
   }
 }
 </script>
+
+<style scoped>
+.fix-table-header > th {
+  text-transform: none;
+}
+</style>

accounts/ui/components/accounts/AccountsListRow.vue

@@ -1,7 +1,12 @@
 <template>
   <oc-table-row>
     <oc-table-cell>
-      <oc-checkbox :value="isAccountSelected" @change="TOGGLE_SELECTION_ACCOUNT(account)" :label="selectAccountLabel" hide-label />
+      <oc-checkbox
+        class="uk-margin-small-left"
+        :value="isAccountSelected"
+        @change="TOGGLE_SELECTION_ACCOUNT(account)"
+        :label="selectAccountLabel" hide-label
+      />
     </oc-table-cell>
     <oc-table-cell>
       <avatar :user-name="account.displayName || account.onPremisesSamAccountName" :userid="account.id" :width="35" />

ocis-phoenix/Makefile

@@ -4,7 +4,7 @@ IMPORT := github.com/owncloud/ocis/$(NAME)
 BIN := bin
 DIST := dist
 HUGO := hugo
-PHOENIX_ASSETS_VERSION = v0.16.0
+PHOENIX_ASSETS_VERSION = v0.17.0
 
 ifeq ($(OS), Windows_NT)
 	EXECUTABLE := $(NAME).exe

ocis-phoenix/changelog/unreleased/update-phoenix.md

@@ -0,0 +1,6 @@
+Change: update Phoenix
+
+Updated phoenix from v0.16.0 to v0.17.0
+
+https://github.com/owncloud/ocis/pull/625
+https://github.com/owncloud/phoenix/releases/tag/v0.17.0

ocis-phoenix/go.sum

@@ -844,6 +844,7 @@ github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVc
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-isatty v0.0.7 h1:UvyT9uN+3r7yLEYSlJsbQGdsaB/a0DlgWP3pql6iwOc=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
@@ -851,6 +852,7 @@ github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp
 github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
 github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54=
 github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=