feat(files_sharing): Add toggle to control display area for federated shares

apps/files_sharing/composer/composer/autoload_classmap.php

@@ -29,6 +29,7 @@
     'OCA\\Files_Sharing\\Command\\ExiprationNotification' => $baseDir . '/../lib/Command/ExiprationNotification.php',
     'OCA\\Files_Sharing\\Command\\FixShareOwners' => $baseDir . '/../lib/Command/FixShareOwners.php',
     'OCA\\Files_Sharing\\Command\\ListShares' => $baseDir . '/../lib/Command/ListShares.php',
+    'OCA\\Files_Sharing\\Config\\ConfigLexicon' => $baseDir . '/../lib/Config/ConfigLexicon.php',
     'OCA\\Files_Sharing\\Controller\\AcceptController' => $baseDir . '/../lib/Controller/AcceptController.php',
     'OCA\\Files_Sharing\\Controller\\DeletedShareAPIController' => $baseDir . '/../lib/Controller/DeletedShareAPIController.php',
     'OCA\\Files_Sharing\\Controller\\ExternalSharesController' => $baseDir . '/../lib/Controller/ExternalSharesController.php',

apps/files_sharing/composer/composer/autoload_static.php

@@ -44,6 +44,7 @@ class ComposerStaticInitFiles_Sharing
         'OCA\\Files_Sharing\\Command\\ExiprationNotification' => __DIR__ . '/..' . '/../lib/Command/ExiprationNotification.php',
         'OCA\\Files_Sharing\\Command\\FixShareOwners' => __DIR__ . '/..' . '/../lib/Command/FixShareOwners.php',
         'OCA\\Files_Sharing\\Command\\ListShares' => __DIR__ . '/..' . '/../lib/Command/ListShares.php',
+        'OCA\\Files_Sharing\\Config\\ConfigLexicon' => __DIR__ . '/..' . '/../lib/Config/ConfigLexicon.php',
         'OCA\\Files_Sharing\\Controller\\AcceptController' => __DIR__ . '/..' . '/../lib/Controller/AcceptController.php',
         'OCA\\Files_Sharing\\Controller\\DeletedShareAPIController' => __DIR__ . '/..' . '/../lib/Controller/DeletedShareAPIController.php',
         'OCA\\Files_Sharing\\Controller\\ExternalSharesController' => __DIR__ . '/..' . '/../lib/Controller/ExternalSharesController.php',

apps/files_sharing/lib/AppInfo/Application.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -12,6 +13,7 @@
 use OCA\Files\Event\LoadAdditionalScriptsEvent;
 use OCA\Files\Event\LoadSidebar;
 use OCA\Files_Sharing\Capabilities;
+use OCA\Files_Sharing\Config\ConfigLexicon;
 use OCA\Files_Sharing\External\Manager;
 use OCA\Files_Sharing\External\MountProvider as ExternalMountProvider;
 use OCA\Files_Sharing\Helper;
@@ -106,6 +108,8 @@ function () use ($c) {
 
 		// File request auth
 		$context->registerEventListener(BeforeTemplateRenderedEvent::class, LoadPublicFileRequestAuthListener::class);
+
+		$context->registerConfigLexicon(ConfigLexicon::class);
 	}
 
 	public function boot(IBootContext $context): void {

apps/files_sharing/lib/Config/ConfigLexicon.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Files_Sharing\Config;
+
+use NCU\Config\Lexicon\ConfigLexiconEntry;
+use NCU\Config\Lexicon\ConfigLexiconStrictness;
+use NCU\Config\Lexicon\IConfigLexicon;
+use NCU\Config\ValueType;
+
+/**
+ * Config Lexicon for files_sharing.
+ *
+ * Please Add & Manage your Config Keys in that file and keep the Lexicon up to date!
+ *
+ * {@see IConfigLexicon}
+ */
+class ConfigLexicon implements IConfigLexicon {
+	public const SHOW_FEDERATED_AS_INTERNAL = 'show_federated_shares_as_internal';
+
+	public function getStrictness(): ConfigLexiconStrictness {
+		return ConfigLexiconStrictness::IGNORE;
+	}
+
+	public function getAppConfigs(): array {
+		return [
+			new ConfigLexiconEntry(self::SHOW_FEDERATED_AS_INTERNAL, ValueType::BOOL, false, 'shows federated shares as internal shares', true),
+		];
+	}
+
+	public function getUserConfigs(): array {
+		return [];
+	}
+}

apps/files_sharing/lib/Listener/LoadSidebarListener.php

@@ -11,9 +11,12 @@
 
 use OCA\Files\Event\LoadSidebar;
 use OCA\Files_Sharing\AppInfo\Application;
+use OCA\Files_Sharing\Config\ConfigLexicon;
 use OCP\AppFramework\Services\IInitialState;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
+use OCP\IAppConfig;
+use OCP\Server;
 use OCP\Share\IManager;
 use OCP\Util;
 
@@ -33,6 +36,8 @@ public function handle(Event $event): void {
 			return;
 		}
 
+		$appConfig = Server::get(IAppConfig::class);
+		$this->initialState->provideInitialState('showFederatedSharesAsInternal', $appConfig->getValueBool('files_sharing', ConfigLexicon::SHOW_FEDERATED_AS_INTERNAL));
 		Util::addScript(Application::APP_ID, 'files_sharing_tab', 'files');
 	}
 }

apps/files_sharing/src/components/SharingInput.vue

@@ -194,11 +194,11 @@ export default {
 
 			let shareType = []
 
-			if (this.isExternal) {
-				shareType.push(ShareType.Remote)
-				shareType.push(ShareType.RemoteGroup)
+			const remoteTypes = [ShareType.Remote, ShareType.RemoteGroup]
+
+			if (this.isExternal && !this.config.showFederatedSharesAsInternal) {
+				shareType.push(...remoteTypes)
 			} else {
-				// Merge shareType array
 				shareType = shareType.concat([
 					ShareType.User,
 					ShareType.Group,
@@ -209,6 +209,9 @@ export default {
 					ShareType.ScienceMesh,
 				])
 
+				if (this.config.showFederatedSharesAsInternal) {
+					shareType.push(...remoteTypes)
+				}
 			}
 
 			if (getCapabilities().files_sharing.public.enabled === true && this.isExternal) {

apps/files_sharing/src/services/ConfigService.ts

@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 import { getCapabilities } from '@nextcloud/capabilities'
+import { loadState } from '@nextcloud/initial-state'
 
 type PasswordPolicyCapabilities = {
 	enforceNonCommonPassword: boolean
@@ -306,4 +307,12 @@ export default class Config {
 		return this._capabilities?.files_sharing?.public?.custom_tokens
 	}
 
+	/**
+	 * Show federated shares as internal shares
+	 * @return {boolean}
+	 */
+	get showFederatedSharesAsInternal(): boolean {
+		return loadState('files_sharing', 'showFederatedSharesAsInternal', false)
+	}
+
 }

apps/files_sharing/src/views/SharingTab.vue

@@ -50,7 +50,7 @@
 					:link-shares="linkShares"
 					:reshare="reshare"
 					:shares="shares"
-					:placeholder="t('files_sharing', 'Share with accounts and teams')"
+					:placeholder="internalShareInputPlaceholder"
 					@open-sharing-details="toggleShareDetailsView" />
 
 				<!-- other shares list -->
@@ -90,7 +90,7 @@
 					:file-info="fileInfo"
 					:link-shares="linkShares"
 					:is-external="true"
-					:placeholder="t('files_sharing', 'Email, federated cloud id')"
+					:placeholder="externalShareInputPlaceholder"
 					:reshare="reshare"
 					:shares="shares"
 					@open-sharing-details="toggleShareDetailsView" />
@@ -249,6 +249,18 @@ export default {
 			return !!(this.fileInfo.permissions & OC.PERMISSION_SHARE)
 				|| !!(this.reshare && this.reshare.hasSharePermission && this.config.isResharingAllowed)
 		},
+
+		internalShareInputPlaceholder() {
+			return this.config.showFederatedSharesAsInternal
+				? t('files_sharing', 'Share with accounts, teams, federated cloud id')
+				: t('files_sharing', 'Share with accounts and teams')
+		},
+
+		externalShareInputPlaceholder() {
+			return this.config.showFederatedSharesAsInternal
+				? t('files_sharing', 'Email')
+				: t('files_sharing', 'Email, federated cloud id')
+		},
 	},
 
 	methods: {
@@ -369,7 +381,11 @@ export default {
 					if ([ShareType.Link, ShareType.Email].includes(share.type)) {
 						this.linkShares.push(share)
 					} else if ([ShareType.Remote, ShareType.RemoteGroup].includes(share.type)) {
-						this.externalShares.push(share)
+						if (this.config.showFederatedSharesAsInternal) {
+							this.shares.push(share)
+						} else {
+							this.externalShares.push(share)
+						}
 					} else {
 						this.shares.push(share)
 					}
@@ -439,7 +455,11 @@ export default {
 			if (share.type === ShareType.Email) {
 				this.linkShares.unshift(share)
 			} else if ([ShareType.Remote, ShareType.RemoteGroup].includes(share.type)) {
-				this.externalShares.unshift(share)
+				if (this.config.showFederatedSharesAsInternal) {
+					this.shares.unshift(share)
+				} else {
+					this.externalShares.unshift(share)
+				}
 			} else {
 				this.shares.unshift(share)
 			}

dist/1092-1092.js.map.license

@@ -0,0 +1 @@
+1092-1092.js.license