bump sdk

fix currentRole in createForm
add oc10 docker dev config to enable quicklinks
fix resource quicklink detection

Add SDK bump changelog && fix fault accessing of sidebar config option

get rid uf obsolete collaborator unit test

fix oc10 resource quicklink attribute detection

fix failing acceptance tests

changelog/unreleased/enhancement-update-sdk

@@ -0,0 +1,15 @@
+Enhancement: Update SDK
+
+We've updated the ownCloud SDK to version 3.0.0-alpha.7.
+
+- Change - Pass full trash bin path to methods of FilesTrash class: https://github.com/owncloud/owncloud-sdk/pull/1021
+- Enhancement - Enforce share_type guest if applies: https://github.com/owncloud/owncloud-sdk/pull/1046
+- Enhancement - Create quicklink: https://github.com/owncloud/owncloud-sdk/pull/1041
+- Enhancement - Replace deprecated String.prototype.substr(): https://github.com/owncloud/owncloud-sdk/pull/1035
+- Enhancement - Add blob resolveType: https://github.com/owncloud/owncloud-sdk/pull/1028
+- Enhancement - Adjust share management to properly work with spaces: https://github.com/owncloud/owncloud-sdk/pull/1013
+- Bugfix - Always add X-Request-ID: https://github.com/owncloud/owncloud-sdk/pull/1016
+- Bugfix - Always add X-Requested-With header: https://github.com/owncloud/owncloud-sdk/pull/1020
+
+https://github.com/owncloud/web/pull/6820
+https://github.com/owncloud/owncloud-sdk/releases/tag/v3.0.0-alpha.7

dev/docker/oc10.config.php

@@ -2,5 +2,6 @@
 $CONFIG = [
     'web.baseUrl' => 'http://host.docker.internal:8080/index.php/apps/web',
     'web.rewriteLinks' => true,
+    'sharing.showPublicLinkQuickAction' => true,
 ];
 

dev/docker/oc10.web.config.json

@@ -14,7 +14,12 @@
   ],
   "options": {
     "disablePreviews": true,
-    "displayResourcesLazy": false
+    "displayResourcesLazy": false,
+    "sidebar": {
+      "shares": {
+        "showAllOnLoad": true
+      }
+    }
   },
   "applications": [
     {

dev/docker/ocis.web.config.json

@@ -11,7 +11,12 @@
   },
   "options": {
     "disablePreviews": true,
-    "displayResourcesLazy": false
+    "displayResourcesLazy": false,
+    "sidebar": {
+      "shares": {
+        "showAllOnLoad": true
+      }
+    }
   },
   "apps": [
     "files",

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

@@ -130,7 +130,7 @@ export default defineComponent({
       store.getters.getToken
     )
 
-    const linkListCollapsed = !store.getters.configuration.sidebar.shares.showAllOnLoad
+    const linkListCollapsed = !store.getters.configuration.options.sidebar.shares.showAllOnLoad
 
     return { graphClient, hasSpaces: useCapabilitySpacesEnabled(), linkListCollapsed }
   },

packages/web-app-files/src/components/SideBar/Shares/FileShares.vue

@@ -131,7 +131,7 @@ export default {
       })
     })
 
-    const sharesListCollapsed = !store.getters.configuration.sidebar.shares.showAllOnLoad
+    const sharesListCollapsed = !store.getters.configuration.options.sidebar.shares.showAllOnLoad
 
     return {
       loadSpaceTask,

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

@@ -182,7 +182,7 @@ export default {
 
     passwordEnforcedForRole() {
       const currentRole = this.availableRoleOptions.find(({ role }) => {
-        return this.link.role.label === role.label
+        return this.link.role.name === role.name
       })
 
       const canRead = currentRole.role.hasPermission(SharePermissions.read)

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

@@ -444,13 +444,18 @@ function _buildLink(link): Share {
     description = role.label
   }
 
-  let oc10QuickLink = false
-  if (link.attributes) {
-    const attributes = JSON.parse(link.attributes) || []
-    oc10QuickLink = attributes.find((attr) => attr.key === 'isQuickLink')?.enabled
-  }
-  const ocisQuickLink = link.quicklink === 'true'
-  const quicklink = oc10QuickLink || ocisQuickLink
+  const quicklinkOc10 = ((): boolean => {
+    if (typeof link.attributes !== 'string') {
+      return false
+    }
+
+    return (
+      JSON.parse(link.attributes || '[]').find((attr) => attr.key === 'isQuickLink')?.enabled ===
+      'true'
+    )
+  })()
+  const quicklinkOcis = link.quicklink === 'true'
+  const quicklink = quicklinkOc10 || quicklinkOcis
 
   return {
     shareType: parseInt(link.share_type),

packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js

@@ -26,7 +26,6 @@ const user = Users.alice
 const collaborators = [Collaborators[0], Collaborators[1]]
 
 const selectors = {
-  showCollaboratorButton: 'button[data-testid="collaborators-show-people"]',
   firstCollaboratorListItem: `div[data-testid="collaborator-user-item-${Collaborators[0].collaborator.name}"]`
 }
 
@@ -78,19 +77,6 @@ describe('FileShares', () => {
       expect(wrapper).toMatchSnapshot()
     })
 
-    it('can toggle the collaborators list by clicking the avatar wrapper button', async () => {
-      const wrapper = getMountedWrapper({
-        user,
-        outgoingCollaborators: collaborators
-      })
-      const button = wrapper.find(selectors.showCollaboratorButton)
-      expect(wrapper.vm.showShareesList).toBe(true)
-      await button.trigger('click')
-      expect(wrapper.vm.showShareesList).toBe(false)
-      await button.trigger('click')
-      expect(wrapper.vm.showShareesList).toBe(true)
-    })
-
     it('reacts on delete events by collaborator list items', async () => {
       const spyOnCollaboratorDeleteTrigger = jest
         .spyOn(FileShares.methods, '$_ocCollaborators_deleteShare_trigger')

tests/acceptance/features/webUIFilesList/fileList.feature

@@ -25,9 +25,9 @@ Feature: User can view files inside a folder
     Then there should be no resources listed on the webUI
 
 
-  Scenario: All files list displays public link quick action
+  Scenario: All files list displays quicklink quick action
     When the user browses to the files page
-    Then quick action "public link" should be displayed on the webUI
+    Then quick action "quicklink" should be displayed on the webUI
     And the sidebar should match the default baseline
 
   Scenario: files are not selected when the user logs in

tests/acceptance/features/webUISharingPublicBasic/publicLinkCreate.feature

@@ -179,7 +179,7 @@ Feature: Create public link shares
       | uid_owner   | Alice             |
       | permissions | read              |
       | path        | /simple-folder    |
-      | name        | Quick action link |
+      | name        | Quicklink |
     And the following success message should be displayed on the webUI
       """
       Quicklink copied into your clipboard

tests/acceptance/stepDefinitions/publicLinkContext.js

@@ -306,6 +306,6 @@ Then(
 When(
   'the user creates a public link via quick action for resource {string} using the webUI',
   function (resource) {
-    return client.page.FilesPageElement.filesList().useQuickAction(resource, 'public link')
+    return client.page.FilesPageElement.filesList().useQuickAction(resource, 'quicklink')
   }
 )

tests/drone/config-oc10-integration-app-oauth.json

@@ -15,7 +15,12 @@
   ],
   "options": {
     "disablePreviews": true,
-    "displayResourcesLazy": false
+    "displayResourcesLazy": false,
+    "sidebar": {
+      "shares": {
+        "showAllOnLoad": true
+      }
+    }
   },
   "applications": [
     {

tests/drone/config-oc10-oauth.json

@@ -8,7 +8,12 @@
     "authUrl": "http://owncloud/index.php/apps/oauth2/authorize"
   },
   "options": {
-    "displayResourcesLazy": false
+    "displayResourcesLazy": false,
+    "sidebar": {
+      "shares": {
+        "showAllOnLoad": true
+      }
+    }
   },
   "apps": [
     "files",

tests/drone/config-oc10-openid.json

@@ -10,7 +10,12 @@
     "scope": "openid profile email"
   },
   "options": {
-    "displayResourcesLazy": false
+    "displayResourcesLazy": false,
+    "sidebar": {
+      "shares": {
+        "showAllOnLoad": true
+      }
+    }
   },
   "apps": [
     "files",

tests/drone/config-ocis.json

@@ -11,7 +11,12 @@
   },
   "options": {
     "disablePreviews": true,
-    "displayResourcesLazy": false
+    "displayResourcesLazy": false,
+    "sidebar": {
+      "shares": {
+        "showAllOnLoad": true
+      }
+    }
   },
   "apps": [
     "files",

yarn.lock

@@ -2279,17 +2279,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/glob@npm:^7.1.1":
-  version: 7.1.3
-  resolution: "@types/glob@npm:7.1.3"
-  dependencies:
-    "@types/minimatch": "*"
-    "@types/node": "*"
-  checksum: e0eef12285f548f15d887145590594a04ccce7f7e645fb047cbac18cb093f25d507ffbcc725312294c224bb78cf980fce33e5807de8d6f8a868b4186253499d4
-  languageName: node
-  linkType: hard
-
-"@types/glob@npm:^7.1.3, @types/glob@npm:^7.2.0":
+"@types/glob@npm:^7.1.1, @types/glob@npm:^7.1.3, @types/glob@npm:^7.2.0":
   version: 7.2.0
   resolution: "@types/glob@npm:7.2.0"
   dependencies:
@@ -6640,21 +6630,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6":
-  version: 7.1.7
-  resolution: "glob@npm:7.1.7"
-  dependencies:
-    fs.realpath: ^1.0.0
-    inflight: ^1.0.4
-    inherits: 2
-    minimatch: ^3.0.4
-    once: ^1.3.0
-    path-is-absolute: ^1.0.0
-  checksum: b61f48973bbdcf5159997b0874a2165db572b368b931135832599875919c237fc05c12984e38fe828e69aa8a921eb0e8a4997266211c517c9cfaae8a93988bb8
-  languageName: node
-  linkType: hard
-
-"glob@npm:^7.2.0":
+"glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0":
   version: 7.2.0
   resolution: "glob@npm:7.2.0"
   dependencies: