[full-ci] Release 4.2.0

.drone.env

@@ -1,5 +1,5 @@
 # The version of OCIS to use in pipelines that test against OCIS
-OCIS_COMMITID=35c27afcb6a086ab0e393f356cfd4b005840b146
+OCIS_COMMITID=47c2c3ad4f0990ffa6456777cfd46af090bd4120
 OCIS_BRANCH=master
 
 # The test runner source for API tests

changelog/4.2.0_2021-09-10/enhancement-show-sharees-as-avatars

@@ -0,0 +1,8 @@
+Enhancement: Show sharees as collapsed list of avatars
+
+We've introduced a collapsed list of avatars of sharees in the `People` panel of the right sidebar.
+On click we switch to showing the full list of sharees. With this additional intermediate state we
+were able to clean up the UI a bit for easier cognitive load.
+
+https://github.com/owncloud/web/pull/5758/files
+https://github.com/owncloud/web/issues/5736

changelog/4.2.0_2021-09-10/enhancement-update-ods

@@ -0,0 +1,19 @@
+Enhancement: Update ODS to 10.0.0
+
+We updated the ownCloud Design System to version 10.0.0. Please refer to the full changelog in the ODS release (linked) for more details. Summary:
+- Bugfix - Fix search for options provided as objects: https://github.com/owncloud/owncloud-design-system/pull/1602
+- Bugfix - Contextmenu button triggered wrong event: https://github.com/owncloud/owncloud-design-system/pull/1610
+- Bugfix - Use pointer cursor for OcSelect actions: https://github.com/owncloud/owncloud-design-system/pull/1604
+- Bugfix - Reset droptarget background color in OcTableFiles: https://github.com/owncloud/owncloud-design-system/pull/1625
+- Enhancement - OcTableFiles Contextmenu Tooltip: https://github.com/owncloud/owncloud-design-system/pull/1610
+- Enhancement - Highlight droptarget in OcTableFiles: https://github.com/owncloud/owncloud-design-system/pull/1610
+- Enhancement - Remove "Showdetails" button in OcTableFiles: https://github.com/owncloud/owncloud-design-system/pull/1610
+- Enhancement - Switch filesize calculation base: https://github.com/owncloud/owncloud-design-system/pull/1598
+- Change - Use route query to store active page: https://github.com/owncloud/owncloud-design-system/pull/1626
+- Change - Refactor OcAvatarGroup and rename to OcAvatars: https://github.com/owncloud/owncloud-design-system/pull/5736
+- Change - Add label prop to OcSelect: https://github.com/owncloud/owncloud-design-system/pull/1633
+
+https://github.com/owncloud/web/pull/5725
+https://github.com/owncloud/web/pull/5769
+https://github.com/owncloud/owncloud-design-system/releases/tag/v9.3.0
+https://github.com/owncloud/owncloud-design-system/releases/tag/v10.0.0

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.1.0",
+  "version": "4.2.0",
   "private": true,
   "homepage": "https://github.com/owncloud/web",
   "license": "AGPL-3.0",

packages/web-app-files/src/App.vue

@@ -66,10 +66,6 @@ export default {
           this.closeSidebar()
         }
       }
-    },
-    sidebarClosed(hidden) {
-      if (!hidden) return
-      this.SET_APP_SIDEBAR_ACTIVE_PANEL(null)
     }
   },
   created() {
@@ -86,7 +82,6 @@ export default {
     ...mapActions('Files', ['dragOver', 'resetFileSelection']),
     ...mapActions('Files/sidebar', { closeSidebar: 'close' }),
     ...mapActions(['showMessage']),
-    ...mapMutations('Files', ['SET_APP_SIDEBAR_ACTIVE_PANEL']),
     ...mapMutations(['SET_SIDEBAR_FOOTER_CONTENT_COMPONENT']),
 
     trace() {

packages/web-app-files/src/components/SideBar/Actions/FileActions.vue

@@ -27,7 +27,7 @@ import { mapGetters } from 'vuex'
 import FileActions from '../../../mixins/fileActions'
 
 export default {
-  name: 'ActionsAccordion',
+  name: 'FileActions',
   title: $gettext => {
     return $gettext('Actions')
   },

packages/web-app-files/src/components/SideBar/Details/FileDetails.vue

@@ -24,7 +24,7 @@
           appearance="raw"
           class="oc-mr-xs"
           :aria-label="peopleSharesLabel"
-          @click="expandPeoplesAccordion"
+          @click="expandPeoplesPanel"
         >
           <oc-icon name="group" />
         </oc-button>
@@ -34,7 +34,7 @@
           appearance="raw"
           class="oc-mr-xs"
           :aria-label="linkSharesLabel"
-          @click="expandLinksAccordion"
+          @click="expandLinksPanel"
         >
           <oc-icon name="link" />
         </oc-button>
@@ -49,16 +49,16 @@
               v-oc-tooltip="seeVersionsLabel"
               appearance="raw"
               :aria-label="seeVersionsLabel"
-              @click="expandVersionsAccordion"
+              @click="expandVersionsPanel"
               v-text="capitalizedTimestamp"
             />
             <span v-else v-text="capitalizedTimestamp" />
           </td>
         </tr>
-        <tr v-if="showSharedBy" data-testid="shared-by">
-          <th scope="col" class="oc-pr-s" v-text="sharedByLabel" />
+        <tr v-if="showShareDate" data-testid="shared-date">
+          <th scope="col" class="oc-pr-s" v-text="shareDateLabel" />
           <td>
-            <span v-text="sharedWithUserDisplayName" />
+            <span v-oc-tooltip="shareDateTooltip" v-text="displayShareDate" />
           </td>
         </tr>
         <tr v-if="showSharedVia" data-testid="shared-via">
@@ -69,17 +69,17 @@
             </router-link>
           </td>
         </tr>
-        <tr v-if="showShareDate" data-testid="shared-date">
-          <th scope="col" class="oc-pr-s" v-text="shareDateLabel" />
+        <tr v-if="showSharedBy" data-testid="shared-by">
+          <th scope="col" class="oc-pr-s" v-text="sharedByLabel" />
           <td>
-            <span v-oc-tooltip="shareDateTooltip" v-text="displayShareDate" />
+            <span v-text="sharedByDisplayName" />
           </td>
         </tr>
-        <tr v-if="ownerName" data-testid="ownerName">
+        <tr v-if="ownerDisplayName" data-testid="ownerDisplayName">
           <th scope="col" class="oc-pr-s" v-text="ownerTitle" />
           <td>
             <p class="oc-m-rm">
-              {{ ownerName }}
+              {{ ownerDisplayName }}
               <span v-if="ownedByCurrentUser" v-translate>(me)</span>
               <span v-if="!ownedByCurrentUser && ownerAdditionalInfo"
                 >({{ ownerAdditionalInfo }})</span
@@ -98,7 +98,7 @@
               v-oc-tooltip="seeVersionsLabel"
               appearance="raw"
               :aria-label="seeVersionsLabel"
-              @click="expandVersionsAccordion"
+              @click="expandVersionsPanel"
               v-text="versions.length"
             />
           </td>
@@ -113,7 +113,7 @@ import Mixins from '../../../mixins'
 import MixinResources from '../../../mixins/resources'
 import MixinRoutes from '../../../mixins/routes'
 import { shareTypes, userShareTypes } from '../../../helpers/shareTypes'
-import { mapActions, mapGetters, mapMutations } from 'vuex'
+import { mapActions, mapGetters } from 'vuex'
 import { ImageDimension } from '../../../constants'
 import { loadPreview } from '../../../helpers/resource'
 import intersection from 'lodash-es/intersection'
@@ -132,7 +132,8 @@ export default {
 
   data: () => ({
     loading: false,
-    sharedWithUserDisplayName: '',
+    sharedByName: '',
+    sharedByDisplayName: '',
     sharedTime: 0,
     sharedParentDir: null,
     sharedItem: null
@@ -147,7 +148,11 @@ export default {
 
     hasContent() {
       return (
-        this.hasTimestamp || this.ownerName || this.showSize || this.showShares || this.showVersions
+        this.hasTimestamp ||
+        this.ownerDisplayName ||
+        this.showSize ||
+        this.showShares ||
+        this.showVersions
       )
     },
     noContentText() {
@@ -157,7 +162,7 @@ export default {
       return this.$gettext('Overview of the information about the selected file')
     },
     shareDateLabel() {
-      return this.$gettext('Shared on:')
+      return this.$gettext('Shared:')
     },
     sharedViaLabel() {
       return this.$gettext('Shared via:')
@@ -183,7 +188,13 @@ export default {
       }
     },
     showSharedBy() {
-      return this.showShares && !this.ownedByCurrentUser && !this.sharesTreeLoading
+      return (
+        this.showShares &&
+        !this.ownedByCurrentUser &&
+        !this.sharesTreeLoading &&
+        this.sharedByDisplayName &&
+        this.sharedByName !== this.file.ownerId
+      )
     },
     showSharedVia() {
       return (
@@ -231,7 +242,7 @@ export default {
     ownerTitle() {
       return this.$gettext('Owner:')
     },
-    ownerName() {
+    ownerDisplayName() {
       return (
         this.file.ownerDisplayName ||
         this.file.shareOwnerDisplayname ||
@@ -306,9 +317,16 @@ export default {
       if (current !== false) return
       const sharePathParentOrCurrent = this.getParentSharePath(this.file.path, this.sharesTree)
       if (sharePathParentOrCurrent === null) return
-      this.sharedItem = this.sharesTree[sharePathParentOrCurrent][0]
-      const fileOwner = this.sharedItem.fileOwner
-      this.sharedWithUserDisplayName = fileOwner ? fileOwner.displayName : null
+      const userShares = this.sharesTree[sharePathParentOrCurrent]?.filter(s =>
+        userShareTypes.includes(s.shareType)
+      )
+      if (userShares.length === 0) return
+      this.sharedItem = userShares[0]
+      this.sharedByName = this.sharedItem.owner?.name
+      this.sharedByDisplayName = this.sharedItem.owner?.displayName
+      if (this.sharedItem.owner?.additionalInfo) {
+        this.sharedByDisplayName += ' (' + this.sharedItem.owner.additionalInfo + ')'
+      }
       this.sharedTime = this.sharedItem.stime
       this.sharedParentDir = sharePathParentOrCurrent
     }
@@ -337,7 +355,7 @@ export default {
   },
   methods: {
     ...mapActions('Files', ['loadPreview', 'loadVersions', 'loadSharesTree']),
-    ...mapMutations('Files', ['SET_APP_SIDEBAR_ACTIVE_PANEL']),
+    ...mapActions('Files/sidebar', { setSidebarPanel: 'setActivePanel' }),
     refreshShareDetailsTree() {
       this.loadSharesTree({
         client: this.$client,
@@ -354,14 +372,14 @@ export default {
       }
       return null
     },
-    expandPeoplesAccordion() {
-      this.SET_APP_SIDEBAR_ACTIVE_PANEL('sharing-item')
+    expandPeoplesPanel() {
+      this.setSidebarPanel('sharing-item')
     },
-    expandLinksAccordion() {
-      this.SET_APP_SIDEBAR_ACTIVE_PANEL('links-item')
+    expandLinksPanel() {
+      this.setSidebarPanel('links-item')
     },
-    expandVersionsAccordion() {
-      this.SET_APP_SIDEBAR_ACTIVE_PANEL('versions-item')
+    expandVersionsPanel() {
+      this.setSidebarPanel('versions-item')
     },
     async loadData() {
       this.loading = true

packages/web-app-files/src/components/SideBar/Details/FileDetailsMultiple.vue

@@ -3,7 +3,7 @@
     <div class="files-preview oc-mb">
       <div class="files-preview-body">
         <oc-icon class="preview-icon" size="xxlarge" variation="passive" name="file_copy" />
-        <span class="preview-text" data-testid="selectedFilesText" v-text="selectedFilesString" />
+        <p class="preview-text" data-testid="selectedFilesText" v-text="selectedFilesString" />
       </div>
     </div>
     <div>

packages/web-app-files/src/components/SideBar/FileInfo.vue

@@ -2,19 +2,19 @@
   <div class="file_info">
     <oc-icon :name="file.icon" size="large" class="file_info__icon" />
     <div class="file_info__body">
-      <h2 tabindex="-1">
+      <h3 tabindex="-1">
         <oc-resource-name
           :name="file.name"
           :extension="file.extension"
           :type="file.type"
           :full-path="file.path"
           :is-path-displayed="false"
         />
-      </h2>
-      <div>
+      </h3>
+      <p class="oc-my-rm">
         <template v-if="file.size > -1">{{ getResourceSize(file.size) }},</template>
         {{ modificationTime }}
-      </div>
+      </p>
     </div>
     <oc-button
       v-if="!publicPage() && isFavoritesEnabled"
@@ -92,14 +92,11 @@ export default {
   align-items: center;
   grid-gap: 5px;
 
-  &__icon {
-  }
-
   &__body {
     text-align: left;
     font-size: 0.75rem;
 
-    h2 {
+    h3 {
       font-size: 0.9rem;
       font-weight: 600;
       margin: 0;

packages/web-app-files/src/components/SideBar/Links/FileLinks.vue

@@ -8,7 +8,7 @@
       <oc-loader v-if="linksLoading" :aria-label="$gettext('Loading list of file links')" />
       <template v-else>
         <private-link-item v-if="privateLinkEnabled" />
-        <h4 v-translate class="oc-text-bold oc-m-rm oc-text-initial">Public Links</h4>
+        <h3 v-translate class="oc-text-bold oc-m-rm oc-text-initial">Public Links</h3>
         <div v-if="canCreatePublicLinks" class="oc-my-s">
           <p v-translate class="oc-text-muted">
             Any external person with the respective link can access this resource. No sign-in

packages/web-app-files/src/components/SideBar/Links/PublicLinks/LinkActions.vue

@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import { mapActions, mapMutations } from 'vuex'
+import { mapActions, mapGetters, mapMutations } from 'vuex'
 
 export default {
   name: 'LinkActions',
@@ -42,6 +42,8 @@ export default {
   }),
 
   computed: {
+    ...mapGetters('Files', ['highlightedFile']),
+
     editButtonLabel() {
       return this.$gettext('Edit public link')
     },
@@ -65,18 +67,20 @@ export default {
         cancelText: this.$gettext('Cancel'),
         confirmText: this.$gettext('Delete'),
         onCancel: this.hideModal,
-        onConfirm: this.deleteLink
+        onConfirm: () =>
+          this.deleteLink({
+            client: this.$client,
+            share: this.link,
+            resource: this.highlightedFile
+          })
       }
 
       this.createModal(modal)
     },
 
-    deleteLink() {
+    deleteLink({ client, share, resource }) {
       this.hideModal()
-      this.removeLink({
-        client: this.$client,
-        share: this.link
-      })
+      this.removeLink({ client, share, resource })
 
       this.showMessage({
         title: this.$gettext('Public link was successfully deleted'),