Make file actions available on share routes

owncloud · Apr 27, 2022 · 7c4d100 · 7c4d100
1 parent 2f412bd
commit 7c4d100
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git a/packages/web-app-files/src/mixins/actions/createPublicLink.js b/packages/web-app-files/src/mixins/actions/createPublicLink.js
@@ -20,7 +20,6 @@ export default {
               if (resources[0].status !== ShareStatus.accepted) {
                 return false
               }
-              // FIXME: also check via capabilities if resharing is enabled + resharing is allowed on the share
             }
             return canShare(resources[0], this.$store)
           },

diff --git a/packages/web-app-files/src/mixins/actions/delete.js b/packages/web-app-files/src/mixins/actions/delete.js
@@ -18,6 +18,7 @@ export default {
             if (
               !isLocationSpacesActive(this.$router, 'files-spaces-personal-home') &&
               !isLocationSpacesActive(this.$router, 'files-spaces-project') &&
+              !isLocationSpacesActive(this.$router, 'files-spaces-share') &&
               !isLocationPublicActive(this.$router, 'files-public-files')
             ) {
               return false

diff --git a/packages/web-app-files/src/mixins/actions/downloadArchive.js b/packages/web-app-files/src/mixins/actions/downloadArchive.js
@@ -25,6 +25,7 @@ export default {
               this.$_isFilesAppActive &&
               !isLocationSpacesActive(this.$router, 'files-spaces-personal-home') &&
               !isLocationSpacesActive(this.$router, 'files-spaces-project') &&
+              !isLocationSpacesActive(this.$router, 'files-spaces-share') &&
               !isLocationPublicActive(this.$router, 'files-public-files') &&
               !isLocationCommonActive(this.$router, 'files-common-favorites')
             ) {

diff --git a/packages/web-app-files/src/mixins/actions/downloadFile.js b/packages/web-app-files/src/mixins/actions/downloadFile.js
@@ -22,6 +22,7 @@ export default {
               this.$_isFilesAppActive &&
               !isLocationSpacesActive(this.$router, 'files-spaces-personal-home') &&
               !isLocationSpacesActive(this.$router, 'files-spaces-project') &&
+              !isLocationSpacesActive(this.$router, 'files-spaces-share') &&
               !isLocationPublicActive(this.$router, 'files-public-files') &&
               !isLocationCommonActive(this.$router, 'files-common-favorites')
             ) {

diff --git a/packages/web-app-files/src/mixins/actions/showShares.js b/packages/web-app-files/src/mixins/actions/showShares.js
@@ -33,7 +33,6 @@ export default {
               if (resources[0].status !== ShareStatus.accepted) {
                 return false
               }
-              // FIXME: also check via capabilities if resharing is enabled + resharing is allowed on the share
             }
             return canShare(resources[0], this.$store)
           },

diff --git a/packages/web-app-files/src/quickActions.js b/packages/web-app-files/src/quickActions.js
@@ -55,11 +55,18 @@ export async function openSpaceMembersPanel(ctx) {
 }
 
 export function canShare(item, store) {
-  return (
-    store.state.user.capabilities.files_sharing &&
-    store.state.user.capabilities.files_sharing.api_enabled &&
-    item.canShare()
-  )
+  const { capabilities } = store.state.user
+  if (
+    !capabilities.files_sharing ||
+    !capabilities.files_sharing.api_enabled ||
+    !capabilities.files_sharing.can_share
+  ) {
+    return false
+  }
+  if (item.isReceivedShare() && !capabilities.resharing) {
+    return false
+  }
+  return item.canShare()
 }
 
 export default {