[full-ci] Update to ODS 9.3.0

__fixtures__/sharedViaLinkFiles.js

@@ -20,8 +20,8 @@ const files = {
         storage_id: 'home::admin',
         storage: 2,
         item_type: 'folder',
-        item_source: 3009,
-        file_source: 3009,
+        item_source: 3007,
+        file_source: 3007,
         file_parent: 6,
         file_target: '/Documents',
         name: 'Quick action link',
@@ -55,8 +55,8 @@ const files = {
         storage_id: 'home::admin',
         storage: 2,
         item_type: 'folder',
-        item_source: 3009,
-        file_source: 3009,
+        item_source: 3008,
+        file_source: 3008,
         file_parent: 6,
         file_target: '/.hidden-folder',
         name: 'Quick action link',

changelog/unreleased/enhancement-update-ods

@@ -0,0 +1,12 @@
+Enhancement: Update ODS to 9.3.0
+
+We updated the ownCloud Design System to version 9.3.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
+- 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
+
+https://github.com/owncloud/web/pull/5725
+https://github.com/owncloud/owncloud-design-system/releases/tag/v9.3.0

dev/docker/oc10.web.config.json

@@ -1,16 +1,12 @@
 {
-  "server" : "http://host.docker.internal:8080",
+  "server": "http://host.docker.internal:8080",
   "auth": {
     "clientId": "M8W5mo3wQV3VHWYsaYpWhkr8dwa949i4GljCkedHhl7GWqmHMkxSeJgK2PcS0jt5",
     "url": "http://host.docker.internal:8080/index.php/apps/oauth2/api/v1/token",
     "authUrl": "http://host.docker.internal:8080/index.php/apps/oauth2/authorize"
   },
-  "apps": [
-    "files",
-    "media-viewer",
-    "search"
-  ],
-  "applications" : [
+  "apps": ["files", "media-viewer", "markdown-editor", "search"],
+  "applications": [
     {
       "title": {
         "en": "Classic Design",
@@ -32,4 +28,4 @@
       "url": "http://host.docker.internal:8080/index.php/settings/personal"
     }
   ]
-}
+}

dev/docker/ocis.web.config.json

@@ -1,39 +1,35 @@
 {
-    "server": "https://host.docker.internal:9200",
-    "theme": "https://host.docker.internal:9200/themes/owncloud/theme.json",
-    "version": "0.1.0",
-    "openIdConnect": {
-        "metadata_url": "https://host.docker.internal:9200/.well-known/openid-configuration",
-        "authority": "https://host.docker.internal:9200",
-        "client_id": "web",
-        "response_type": "code",
-        "scope": "openid profile email"
+  "server": "https://host.docker.internal:9200",
+  "theme": "https://host.docker.internal:9200/themes/owncloud/theme.json",
+  "version": "0.1.0",
+  "openIdConnect": {
+    "metadata_url": "https://host.docker.internal:9200/.well-known/openid-configuration",
+    "authority": "https://host.docker.internal:9200",
+    "client_id": "web",
+    "response_type": "code",
+    "scope": "openid profile email"
+  },
+  "options": {
+    "hideSearchBar": true
+  },
+  "apps": ["files", "media-viewer", "markdown-editor", "search"],
+  "external_apps": [
+    {
+      "id": "settings",
+      "path": "https://host.docker.internal:9200/settings.js"
     },
-    "options": {
-        "hideSearchBar": true
+    {
+      "id": "accounts",
+      "path": "https://host.docker.internal:9200/accounts.js"
     },
-    "apps": [
-        "files",
-        "media-viewer",
-        "search"
-    ],
-    "external_apps": [
-        {
-            "id": "settings",
-            "path": "https://host.docker.internal:9200/settings.js"
-        },
-        {
-            "id": "accounts",
-            "path": "https://host.docker.internal:9200/accounts.js"
-        },
-        {
-            "id": "draw-io",
-            "path": "web-app-draw-io",
-            "config": {
-                "url": "https://embed.diagrams.net",
-                "autosave": false,
-                "theme": "minimal"
-            }
-        }
-    ]
-}
+    {
+      "id": "draw-io",
+      "path": "web-app-draw-io",
+      "config": {
+        "url": "https://embed.diagrams.net",
+        "autosave": false,
+        "theme": "minimal"
+      }
+    }
+  ]
+}

packages/web-app-files/src/components/AppBar/ViewOptions.vue

@@ -14,6 +14,7 @@
       <oc-icon name="tune" size="medium" />
     </oc-button>
     <oc-button
+      id="files-toggle-sidebar"
       v-oc-tooltip="toggleSidebarButtonLabel"
       :aria-label="toggleSidebarButtonLabel"
       variation="passive"

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

@@ -3,7 +3,13 @@
     <oc-icon :name="highlightedFile.icon" size="large" class="file_info__icon" />
     <div class="file_info__body">
       <h2 tabindex="-1">
-        {{ highlightedFile.name }}
+        <oc-resource-name
+          :name="highlightedFile.name"
+          :extension="highlightedFile.extension"
+          :type="highlightedFile.type"
+          :full-path="highlightedFile.path"
+          :is-path-displayed="false"
+        />
       </h2>
       <div>
         <template v-if="highlightedFile.size > -1">

packages/web-app-files/src/helpers/resources.js

@@ -117,7 +117,7 @@ export function aggregateResourceShares(
   const resources = []
   let prev = null
   for (const share of shares) {
-    if (prev && share.path === prev.path) {
+    if (prev?.storage_id === share.storage_id && prev?.file_source === share.file_source) {
       if (userShareTypes.includes(share.share_type)) {
         prev.sharedWith.push({
           username: share.share_with,

packages/web-app-files/src/mixins/actions/showActions.js

@@ -1,4 +1,4 @@
-import { mapMutations } from 'vuex'
+import { mapActions, mapMutations } from 'vuex'
 import { isTrashbinRoute } from '../../helpers/route'
 
 export default {
@@ -18,8 +18,10 @@ export default {
   },
   methods: {
     ...mapMutations('Files', ['SET_APP_SIDEBAR_ACTIVE_PANEL']),
+    ...mapActions('Files/sidebar', { openSidebar: 'open' }),
 
-    $_showActions_trigger() {
+    async $_showActions_trigger() {
+      await this.openSidebar()
       this.SET_APP_SIDEBAR_ACTIVE_PANEL(isTrashbinRoute(this.$route) ? null : 'actions-item')
     }
   }

packages/web-app-files/src/mixins/actions/showDetails.js

@@ -1,4 +1,4 @@
-import { mapMutations } from 'vuex'
+import { mapActions, mapMutations } from 'vuex'
 import { isTrashbinRoute } from '../../helpers/route'
 
 export default {
@@ -18,8 +18,10 @@ export default {
   },
   methods: {
     ...mapMutations('Files', ['SET_APP_SIDEBAR_ACTIVE_PANEL']),
+    ...mapActions('Files/sidebar', { openSidebar: 'open' }),
 
-    $_showDetails_trigger() {
+    async $_showDetails_trigger() {
+      await this.openSidebar()
       this.SET_APP_SIDEBAR_ACTIVE_PANEL(null)
     }
   }

packages/web-runtime/package.json

@@ -13,7 +13,7 @@
     "lodash-es": "^4.17.21",
     "luxon": "^1.27.0",
     "oidc-client": "1.11.5",
-    "owncloud-design-system": "^9.2.0",
+    "owncloud-design-system": "^9.3.0",
     "owncloud-sdk": "1.0.0-2296",
     "p-queue": "^6.1.1",
     "portal-vue": "^2.1.7",

tests/acceptance/expected-failures-with-oc10-server-oauth2-login.md

@@ -63,9 +63,6 @@ Other free text and markdown formatting can be used elsewhere in the document if
 -   [webUISharingNotifications/notificationLink.feature:18](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingNotifications/notificationLink.feature#L18)
 -   [webUISharingNotificationsToRoot/notificationLink.feature:17](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingNotificationsToRoot/notificationLink.feature#L17)
 
-### [Cannot determine share source path when sharing same name file from different path in shared-with pages](https://github.com/owncloud/web/issues/5302)
--   [webUISharingPublicBasic/publicLinkCreate.feature:88](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicBasic/publicLinkCreate.feature#L88)
-
 ### [impossible to navigate into a folder in the trashbin](https://github.com/owncloud/web/issues/1725)
 -   [webUITrashbinDelete/trashbinDelete.feature:29](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L29)
 

tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md

@@ -53,9 +53,6 @@ Other free text and markdown formatting can be used elsewhere in the document if
 -   [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:118](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L118)
 -   [webUIResharing1/reshareUsers.feature:230](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing1/reshareUsers.feature#L230)
 
-### [delete pending share option is not available for sharee](https://github.com/owncloud/web/issues/5435)
--   [webUIDeleteFilesFolders/deleteFilesFolders.feature:235](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature#L235)
-
 ### [file_path property is not unique for a share created with same resource name i.e already present in sharee](https://github.com/owncloud/ocis/issues/2249)
 -   [webUIRenameFiles/renameFiles.feature:205](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRenameFiles/renameFiles.feature#L205)
 
@@ -207,8 +204,8 @@ Other free text and markdown formatting can be used elsewhere in the document if
 -   [webUIPrivateLinks/accessingPrivateLinks.feature:9](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature#L9)
 -   [webUIPrivateLinks/accessingPrivateLinks.feature:17](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature#L17)
 -   [webUIPrivateLinks/accessingPrivateLinks.feature:25](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature#L25)
--   [webUIPrivateLinks/accessingPrivateLinks.feature:34](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature#L34)
--   [webUIPrivateLinks/accessingPrivateLinks.feature:44](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature#L44)
+-   [webUIPrivateLinks/accessingPrivateLinks.feature:35](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature#L34)
+-   [webUIPrivateLinks/accessingPrivateLinks.feature:45](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature#L44)
 
 ### [various sharing settings cannot be set](https://github.com/owncloud/ocis/issues/1328)
 -   [webUIRestrictSharing/disableSharing.feature:16](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRestrictSharing/disableSharing.feature#L16)
@@ -429,9 +426,6 @@ Other free text and markdown formatting can be used elsewhere in the document if
 -   [webUISharingInternalGroupsEdgeCases/shareWithGroupsEdgeCases.feature:41](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroupsEdgeCases/shareWithGroupsEdgeCases.feature#L41)
 -   [webUISharingInternalGroupsEdgeCases/shareWithGroupsEdgeCases.feature:42](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroupsEdgeCases/shareWithGroupsEdgeCases.feature#L42)
 
-### [Cannot determine share source path when sharing same name file from different path in shared-with pages](https://github.com/owncloud/web/issues/5302)
--   [webUISharingPublicBasic/publicLinkCreate.feature:88](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicBasic/publicLinkCreate.feature#L88)
-
 ### [impossible to navigate into a folder in the trashbin](https://github.com/owncloud/web/issues/1725)
 -   [webUITrashbinDelete/trashbinDelete.feature:29](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L29)
 
@@ -546,3 +540,6 @@ Other free text and markdown formatting can be used elsewhere in the document if
 ### [not possible to overwrite a received shared file](https://github.com/owncloud/ocis/issues/2267)
 -   [webUISharingInternalGroups/shareWithGroups.feature:77](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature#L77)
 -   [webUISharingInternalUsers/shareWithUsers.feature:57](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature#L57)
+
+### [shares are not listed with full paths](https://github.com/owncloud/ocis/issues/2462)
+-   [webUISharingPublicBasic/publicLinkCreate.feature:88](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicBasic/publicLinkCreate.feature#L88)

tests/acceptance/features/webUIFilesActionMenu/fileFolderActionMenu.feature

@@ -14,7 +14,6 @@ Background: prepare user and files
   Scenario: observe different actions menu options on selecting different file types or folder
     Given user "Alice" has uploaded file with content "pdf file" to "lorem.pdf"
     And the user has reloaded the current page of the webUI
-    And the app-sidebar for file "lorem.txt" has been visible on the webUI
     When the user opens the actions sidebar panel of folder "simple-folder" on the webUI
     Then the app-sidebar for folder "simple-folder" should be visible on the webUI
     And only the following items with default items should be visible in the actions menu on the webUI

tests/acceptance/features/webUIFilesDetails/fileDetails.feature

@@ -14,7 +14,7 @@ Feature: User can open the details panel for any file or folder
   Scenario: View different areas of the app-sidebar for a file in files page
     Given user "Alice" has created file "lorem.txt"
     And the user has browsed to the files page
-    When the user picks the row of file "lorem.txt" on the webUI
+    When the user opens the sidebar for file "lorem.txt" on the webUI
     Then the app-sidebar should be visible
     And the thumbnail should be visible in the app-sidebar
     And the "details" details panel should be visible
@@ -27,7 +27,7 @@ Feature: User can open the details panel for any file or folder
   Scenario: View different areas of the app-sidebar for a folder in files page
     Given user "Alice" has created folder "simple-folder"
     And the user has browsed to the files page
-    When the user picks the row of folder "simple-folder" on the webUI
+    When the user opens the sidebar for folder "simple-folder" on the webUI
     Then the app-sidebar should be visible
     And the thumbnail should be visible in the app-sidebar
     And the "details" details panel should be visible
@@ -44,7 +44,7 @@ Feature: User can open the details panel for any file or folder
     And the user has browsed to the files page
     And user "Alice" has favorited element "lorem.txt"
     And the user has browsed to the favorites page
-    When the user picks the row of file "lorem.txt" on the webUI
+    When the user opens the sidebar for file "lorem.txt" on the webUI
     Then the app-sidebar should be visible
     And the thumbnail should be visible in the app-sidebar
     And the "details" details panel should be visible
@@ -59,7 +59,7 @@ Feature: User can open the details panel for any file or folder
     And the user has browsed to the files page
     And user "Alice" has favorited element "simple-folder"
     And the user has browsed to the favorites page
-    When the user picks the row of folder "simple-folder" on the webUI
+    When the user opens the sidebar for folder "simple-folder" on the webUI
     Then the app-sidebar should be visible
     And the thumbnail should be visible in the app-sidebar
     And the "details" details panel should be visible
@@ -77,7 +77,7 @@ Feature: User can open the details panel for any file or folder
     And user "Alice" has created a public link with following settings
       | path        | simple-folder         |
     And the user has browsed to the shared-via-link page
-    When the user opens the file action menu of folder "simple-folder" using the webUI
+    When the user opens the actions sidebar panel of file "simple-folder" on the webUI
     Then the thumbnail should be visible in the app-sidebar
     When the user switches to "people" panel in details panel using the webUI
     Then the "people" details panel should be visible
@@ -93,7 +93,7 @@ Feature: User can open the details panel for any file or folder
     And user "Alice" has shared folder "simple-folder" with user "Brian"
     When the user browses to the shared-with-others page
     Then folder "simple-folder" should be listed on the webUI
-    When the user picks the row of folder "simple-folder" on the webUI
+    When the user opens the sidebar for folder "simple-folder" on the webUI
     Then the app-sidebar should be visible
     And the thumbnail should be visible in the app-sidebar
     When the user switches to "people" panel in details panel using the webUI
@@ -110,7 +110,7 @@ Feature: User can open the details panel for any file or folder
     And user "Alice" has created a new public link for resource "simple-folder"
     When the user browses to the shared-with-others page
     Then folder "simple-folder" should be listed on the webUI
-    When the user picks the row of folder "simple-folder" on the webUI
+    When the user opens the sidebar for folder "simple-folder" on the webUI
     Then the app-sidebar should be visible
     And the thumbnail should be visible in the app-sidebar
     When the user switches to "people" panel in details panel using the webUI
@@ -128,7 +128,7 @@ Feature: User can open the details panel for any file or folder
     And the user re-logs in as "Brian" using the webUI
     When the user browses to the shared-with-me page
     Then folder "simple-folder" should be listed on the webUI
-    When the user picks the row of folder "simple-folder" on the webUI
+    When the user opens the sidebar for folder "simple-folder" on the webUI
     Then the app-sidebar should be visible
     And the thumbnail should be visible in the app-sidebar
     When the user switches to "people" panel in details panel using the webUI
@@ -156,7 +156,7 @@ Feature: User can open the details panel for any file or folder
     When the user browses to the tags page
     And the user searches for tag "simple" using the webUI
     Then folder "simple-folder" should be listed on the webUI
-    When the user opens the file action menu of folder "simple-folder" using the webUI
+    When the user opens the actions sidebar panel of file "simple-folder" on the webUI
     Then the thumbnail should be visible in the app-sidebar
     When the user switches to "people" panel in details panel using the webUI
     Then the "people" details panel should be visible
@@ -171,7 +171,7 @@ Feature: User can open the details panel for any file or folder
   Scenario: the sidebar is invisible after closing
     Given user "Alice" has created file "lorem.txt"
     And the user has browsed to the files page
-    When the user picks the row of file "lorem.txt" on the webUI
+    When the user opens the sidebar for file "lorem.txt" on the webUI
     Then the app-sidebar should be visible
     When the user closes the app-sidebar using the webUI
     Then the app-sidebar should be invisible
@@ -180,6 +180,5 @@ Feature: User can open the details panel for any file or folder
   Scenario: the sidebar is invisible after opening the selected folder
     Given user "Alice" has created file "simple-folder"
     And the user has browsed to the files page
-    Given the app-sidebar for file "simple-folder" has been visible on the webUI
     When the user opens folder "simple-folder" using the webUI
     Then the app-sidebar should be invisible