Merge pull request #28209 from nextcloud/backport/27751/stable22

Author: skjnldsv

apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php

@@ -60,6 +60,7 @@
 use OCP\Share\IManager;
 use OCP\Share\IShare;
 use OCP\Util;
+use Psr\Log\LoggerInterface;
 
 class CloudFederationProviderFiles implements ICloudFederationProvider {
 
@@ -251,7 +252,8 @@ public function shareReceived(ICloudFederationShare $share) {
 				\OC::$server->getGroupManager(),
 				\OC::$server->getUserManager(),
 				$shareWith,
-				\OC::$server->query(IEventDispatcher::class)
+				\OC::$server->query(IEventDispatcher::class),
+				\OC::$server->get(LoggerInterface::class)
 			);
 
 			try {

apps/files/js/fileactions.js

@@ -155,6 +155,9 @@
 			if (_.isFunction(action.render)) {
 				actionSpec.render = action.render;
 			}
+			if (_.isFunction(action.shouldRender)) {
+				actionSpec.shouldRender = action.shouldRender;
+			}
 			if (!this.actions[mime]) {
 				this.actions[mime] = {};
 			}
@@ -397,6 +400,11 @@
 		 * @param {OCA.Files.FileActionContext} context rendering context
 		 */
 		_renderInlineAction: function(actionSpec, isDefault, context) {
+			if (actionSpec.shouldRender) {
+				if (!actionSpec.shouldRender(context)) {
+					return;
+				}
+			}
 			var renderFunc = actionSpec.render || _.bind(this._defaultRenderAction, this);
 			var $actionEl = renderFunc(actionSpec, isDefault, context);
 			if (!$actionEl || !$actionEl.length) {

apps/files/js/gotoplugin.js

@@ -29,6 +29,11 @@
 			if (this.disallowedLists.indexOf(fileList.id) !== -1) {
 				return;
 			}
+			// lists where the "Open" default action is disabled should
+			// also have the goto action disabled
+			if (fileList._defaultFileActionsDisabled) {
+				return
+			}
 			var fileActions = fileList.fileActions;
 
 			fileActions.registerAction({

apps/files_sharing/js/app.js

@@ -141,6 +141,8 @@ OCA.Sharing.App = {
 			{
 				id: 'shares.pending',
 				showPending: true,
+				detailsViewEnabled: false,
+				defaultFileActionsDisabled: true,
 				sharedWithUser: true,
 				fileActions: this._acceptShareAction(),
 				config: OCA.Files.App.getFilesConfig(),
@@ -296,7 +298,11 @@ OCA.Sharing.App = {
 			type: OCA.Files.FileActions.TYPE_INLINE,
 			actionHandler(fileName, context) {
 				const shareId = context.$file.data('shareId')
-				$.post(OC.linkToOCS('apps/files_sharing/api/v1/shares/pending', 2) + shareId)
+				let shareBase = 'shares/pending'
+				if (context.$file.attr('data-remote-id')) {
+					shareBase = 'remote_shares/pending'
+				}
+				$.post(OC.linkToOCS('apps/files_sharing/api/v1/' + shareBase, 2) + shareId)
 					.success(function(result) {
 						context.fileList.remove(context.fileInfoModel.attributes.name)
 					}).fail(function() {
@@ -311,10 +317,23 @@ OCA.Sharing.App = {
 			permissions: OC.PERMISSION_ALL,
 			iconClass: 'icon-close',
 			type: OCA.Files.FileActions.TYPE_INLINE,
+			shouldRender(context) {
+				// disable rejecting group shares from the pending list because they anyway
+				// land back into that same list
+				if (context.$file.attr('data-remote-id') && parseInt(context.$file.attr('data-share-type'), 10) === OC.Share.SHARE_TYPE_REMOTE_GROUP) {
+					return false
+				}
+				return true
+			},
 			actionHandler(fileName, context) {
 				const shareId = context.$file.data('shareId')
+				let shareBase = 'shares'
+				if (context.$file.attr('data-remote-id')) {
+					shareBase = 'remote_shares/pending'
+				}
+
 				$.ajax({
-					url: OC.linkToOCS('apps/files_sharing/api/v1/shares', 2) + shareId,
+					url: OC.linkToOCS('apps/files_sharing/api/v1/' + shareBase, 2) + shareId,
 					type: 'DELETE',
 				}).success(function(result) {
 					context.fileList.remove(context.fileInfoModel.attributes.name)

apps/files_sharing/js/dist/additionalScripts.js

@@ -96,6 +96,14 @@
 					$tr.attr('data-share-permissions', permission)
 				}
 
+				if (fileData.remoteId) {
+					$tr.attr('data-remote-id', fileData.remoteId)
+				}
+
+				if (fileData.shareType) {
+					$tr.attr('data-share-type', fileData.shareType)
+				}
+
 				// add row with expiration date for link only shares - influenced by _createRow of filelist
 				if (this._linksOnly) {
 					var expirationTimestamp = 0
@@ -212,6 +220,18 @@
 					}
 				}
 
+				var pendingRemoteShares = {
+					url: OC.linkToOCS('apps/files_sharing/api/v1/remote_shares', 2) + 'pending',
+					/* jshint camelcase: false */
+					data: {
+						format: 'json'
+					},
+					type: 'GET',
+					beforeSend: function(xhr) {
+						xhr.setRequestHeader('OCS-APIREQUEST', 'true')
+					}
+				}
+
 				var shares = {
 					url: OC.linkToOCS('apps/files_sharing/api/v1') + 'shares',
 					/* jshint camelcase: false */
@@ -245,6 +265,7 @@
 					promises.push($.ajax(deletedShares))
 				} else if (this._showPending) {
 					promises.push($.ajax(pendingShares))
+					promises.push($.ajax(pendingRemoteShares))
 				} else {
 					promises.push($.ajax(shares))
 
@@ -292,7 +313,12 @@
 				}
 
 				if (additionalShares && additionalShares.ocs && additionalShares.ocs.data) {
-					files = files.concat(this._makeFilesFromShares(additionalShares.ocs.data, !this._sharedWithUser))
+					if (this._showPending) {
+						// in this case the second callback is about pending remote shares
+						files = files.concat(this._makeFilesFromRemoteShares(additionalShares.ocs.data))
+					} else {
+						files = files.concat(this._makeFilesFromShares(additionalShares.ocs.data, !this._sharedWithUser))
+					}
 				}
 
 				this.setFiles(files)
@@ -311,12 +337,29 @@
 							mtime: share.mtime * 1000,
 							mimetype: share.mimetype,
 							type: share.type,
+							// remote share types are different and need to be mapped
+							shareType: (parseInt(share.share_type, 10) === 1) ? OC.Share.SHARE_TYPE_REMOTE_GROUP : OC.Share.SHARE_TYPE_REMOTE,
 							id: share.file_id,
 							path: OC.dirname(share.mountpoint),
 							permissions: share.permissions,
 							tags: share.tags || []
 						}
 
+						if (share.remote_id) {
+							// remote share
+							if (share.accepted !== '1') {
+								file.name = OC.basename(share.name)
+								file.path = '/'
+							}
+							file.remoteId = share.remote_id
+							file.shareOwnerId = share.owner
+						}
+
+						if (!file.mimetype) {
+							// pending shares usually have no type, so default to showing a directory icon
+							file.mimetype = 'dir-shared'
+						}
+
 						file.shares = [{
 							id: share.id,
 							type: OC.Share.SHARE_TYPE_REMOTE

apps/files_sharing/js/dist/additionalScripts.js.map

@@ -60,6 +60,7 @@
 use OCP\Share\IManager;
 use OCP\Util;
 use Psr\Container\ContainerInterface;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\GenericEvent;
 
@@ -98,7 +99,8 @@ public function __construct(array $urlParams = []) {
 				$server->getGroupManager(),
 				$server->getUserManager(),
 				$uid,
-				$server->query(IEventDispatcher::class)
+				$server->query(IEventDispatcher::class),
+				$server->get(LoggerInterface::class)
 			);
 		});