use ocis storageId whenever possible

use roles whenever possible
refactor share loading out of link and share panel component into parent component and load the data only once
use fileId for public link sharing
cleanup expected failures
get rid of bug demonstration test
add gherkin debug helpers
bump sdk
bump ocis

.drone.env

@@ -1,3 +1,3 @@
 # The version of OCIS to use in pipelines that test against OCIS
-OCIS_COMMITID=49541e6cc244f933e1d42b0462664eb6f1ab4ad4
+OCIS_COMMITID=2e79be6bfd92d373eb63039e66354fe9d13aaae0
 OCIS_BRANCH=master

.drone.star

@@ -2196,6 +2196,7 @@ def ocisService():
  "STORAGE_USERS_DRIVER_OWNCLOUD_DATADIR": "/srv/app/tmp/ocis/owncloud/data",
  "WEB_ASSET_PATH": "%s/dist" % dir["web"],
  "WEB_UI_CONFIG": "/srv/config/drone/config-ocis.json",
+ "FRONTEND_ENABLE_RESHARING": "true",
  },
  "commands": [
  "cd %s/ocis-build" % dir["base"],

changelog/unreleased/enhancement-ocis-resharing

@@ -0,0 +1,6 @@
+Enhancement: Re-sharing for ocis
+
+We've enhanced web to be able to re-share resources for ocis, which works from sharing jails, project and personal spaces.
+Beside that we also send roles, space-ref and path as separate values to the sharing api which simplifies the usage of it.
+
+https://github.com/owncloud/web/pull/7086

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

@@ -393,7 +393,7 @@ export default defineComponent({
  client: this.$client,
  path: this.file.path,
  $gettext: this.$gettext,
- ...(this.currentStorageId && { storageId: this.currentStorageId })
+ storageId: this.file.fileId
  })
  this.shareIndicators = getIndicators(this.file, this.sharesTree)
  },

packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue

@@ -186,9 +186,6 @@ export default {
  return this.$gettext('Invite')
  },
 
- currentStorageId() {
- return this.$route.params.storageId
- },
  resourceIsSpace() {
  return this.highlightedFile.type === 'space'
  },
@@ -326,13 +323,6 @@ export default {
  this.selectedRole.permissions(this.hasResharing || this.resourceIsSpace)
  )
 
- let storageId
- if (this.resourceIsSpace) {
- storageId = this.highlightedFile.id
- } else if (this.currentStorageId) {
- storageId = this.currentStorageId
- }
-
  this.addShare({
  client: this.$client,
  graphClient: this.graphClient,
@@ -342,8 +332,9 @@ export default {
  displayName: collaborator.label,
  shareType: collaborator.value.shareType,
  permissions: bitmask,
+ role: this.selectedRole,
  expirationDate: this.expirationDate,
- storageId
+ storageId: this.highlightedFile.fileId || this.highlightedFile.id
  })
  })
  )

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

@@ -309,7 +309,8 @@ export default {
  graphClient: this.graphClient,
  share: this.share,
  permissions: bitmask,
- expirationDate: expirationDate || ''
+ expirationDate: expirationDate || '',
+ role
  })
  }
  }

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

@@ -118,9 +118,9 @@ import { getParentPaths } from '../../../helpers/path'
 import { ShareTypes, LinkShareRoles, SharePermissions } from '../../../helpers/share'
 import { cloneStateObject } from '../../../helpers/store'
 import { showQuickLinkPasswordModal } from '../../../quickActions'
-import CreateQuickLink from './Links/CreateQuickLink.vue'
 import DetailsAndEdit from './Links/DetailsAndEdit.vue'
 import NameAndCopy from './Links/NameAndCopy.vue'
+import CreateQuickLink from './Links/CreateQuickLink.vue'
 
 export default defineComponent({
  name: 'FileLinks',
@@ -336,25 +336,8 @@ export default defineComponent({
  return this.$route.params.storageId || null
  }
  },
- watch: {
- highlightedFile(newItem, oldItem) {
- if (oldItem !== newItem) {
- this.reloadLinks()
- }
- }
- },
- mounted() {
- this.reloadLinks()
- },
-
  methods: {
- ...mapActions('Files', [
- 'addLink',
- 'updateLink',
- 'removeLink',
- 'loadSharesTree',
- 'loadCurrentFileOutgoingShares'
- ]),
+ ...mapActions('Files', ['addLink', 'updateLink', 'removeLink']),
  ...mapActions(['showMessage', 'createModal', 'hideModal']),
 
  toggleLinkListCollapsed() {
@@ -485,9 +468,9 @@ export default defineComponent({
  permissions: link.permissions,
  quicklink: link.quicklink,
  name: link.name,
+ spaceRef: this.highlightedFile.fileId,
  ...(this.currentStorageId && {
- storageId: this.currentStorageId,
- spaceRef: `${this.currentStorageId}${this.highlightedFile.path}`
+ storageId: this.currentStorageId
  })
  }
  },

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

@@ -61,7 +61,6 @@
 </template>
 
 <script lang="ts">
-import { dirname } from 'path'
 import { useTask } from 'vue-concurrency'
 import { mapGetters, mapActions, mapState } from 'vuex'
 import { watch, computed, ref, unref } from '@vue/composition-api'
@@ -295,28 +294,13 @@ export default {
  )
  }
  },
- watch: {
- highlightedFile: {
- handler: function (newItem, oldItem) {
- if (oldItem !== newItem) {
- this.$_reloadShares()
- }
- },
- immediate: true
- }
- },
- mounted() {
+ async mounted() {
  if (this.showSpaceMembers) {
  this.loadSpaceMembersTask.perform()
  }
  },
  methods: {
- ...mapActions('Files', [
- 'loadCurrentFileOutgoingShares',
- 'loadSharesTree',
- 'deleteShare',
- 'loadIncomingShares'
- ]),
+ ...mapActions('Files', ['deleteShare']),
  ...mapActions(['createModal', 'hideModal', 'showMessage']),
  toggleShareesListCollapsed() {
  this.sharesListCollapsed = !this.sharesListCollapsed
@@ -387,25 +371,6 @@ export default {
  })
  })
  },
- $_reloadShares() {
- const requestParams = {
- client: this.$client,
- $gettext: this.$gettext,
- ...(this.currentStorageId && { storageId: this.currentStorageId })
- }
- this.loadCurrentFileOutgoingShares({
- ...requestParams,
- path: this.highlightedFile.path
- })
- this.loadIncomingShares({
- ...requestParams,
- path: this.highlightedFile.path
- })
- this.loadSharesTree({
- ...requestParams,
- path: dirname(this.highlightedFile.path)
- })
- },
  getSharedParentRoute(parentShare) {
  if (!parentShare.indirect) {
  return null

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

@@ -15,6 +15,10 @@ import { defineComponent } from '@vue/composition-api'
 import FileLinks from './FileLinks.vue'
 import FileShares from './FileShares.vue'
 import SpaceMembers from './SpaceMembers.vue'
+import { mapActions, mapGetters } from 'vuex'
+import { dirname } from 'path'
+import { clientService } from 'web-pkg/src/services'
+import { useStore } from 'web-pkg/src/composables'
 
 export default defineComponent({
  name: 'SharesPanel',
@@ -26,6 +30,57 @@ export default defineComponent({
  props: {
  showSpaceMembers: { type: Boolean, default: false },
  showLinks: { type: Boolean, default: false }
+ },
+ setup() {
+ const store = useStore()
+ const graphClient = clientService.graphAuthenticated(
+ store.getters.configuration.server,
+ store.getters.getToken
+ )
+
+ return { graphClient }
+ },
+ watch: {
+ highlightedFile: {
+ handler: function (newItem, oldItem) {
+ if (oldItem !== newItem) {
+ this.$_reloadShares()
+ }
+ },
+ immediate: true
+ }
+ },
+ computed: {
+ ...mapGetters('Files', ['highlightedFile'])
+ },
+ methods: {
+ ...mapActions('Files', [
+ 'loadCurrentFileOutgoingShares',
+ 'loadSharesTree',
+ 'loadIncomingShares'
+ ]),
+ $_reloadShares() {
+ this.loadCurrentFileOutgoingShares({
+ client: this.$client,
+ graphClient: this.graphClient,
+ path: this.highlightedFile.path,
+ $gettext: this.$gettext,
+ storageId: this.highlightedFile.fileId,
+ resource: this.highlightedFile
+ })
+ this.loadIncomingShares({
+ client: this.$client,
+ path: this.highlightedFile.path,
+ $gettext: this.$gettext,
+ storageId: this.highlightedFile.fileId
+ })
+ this.loadSharesTree({
+ client: this.$client,
+ path: this.highlightedFile.path === '' ? '/' : dirname(this.highlightedFile.path),
+ $gettext: this.$gettext,
+ storageId: this.highlightedFile.fileId
+ })
+ }
  }
 })
 </script>