Merge pull request #56942 from nextcloud/refactor/federatedfilessharing-vue3

refactor(federatedfilesharing): migrate to Typescript and Vue 3

Author: susnux

apps/federatedfilesharing/lib/AppInfo/Application.php

@@ -16,12 +16,14 @@
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
-use OCP\AppFramework\IAppContainer;
 use OCP\Federation\ICloudFederationProviderManager;
 
 class Application extends App implements IBootstrap {
+
+	public const APP_ID = 'federatedfilesharing';
+
 	public function __construct() {
-		parent::__construct('federatedfilesharing');
+		parent::__construct(self::APP_ID);
 	}
 
 	public function register(IRegistrationContext $context): void {
@@ -33,14 +35,13 @@ public function boot(IBootContext $context): void {
 		$context->injectFn(Closure::fromCallable([$this, 'registerCloudFederationProvider']));
 	}
 
-	private function registerCloudFederationProvider(ICloudFederationProviderManager $manager,
-		IAppContainer $appContainer): void {
+	private function registerCloudFederationProvider(ICloudFederationProviderManager $manager): void {
 		$fileResourceTypes = ['file', 'folder'];
 		foreach ($fileResourceTypes as $type) {
 			$manager->addCloudFederationProvider($type,
 				'Federated Files Sharing',
-				function () use ($appContainer): CloudFederationProviderFiles {
-					return $appContainer->get(CloudFederationProviderFiles::class);
+				function (): CloudFederationProviderFiles {
+					return \OCP\Server::get(CloudFederationProviderFiles::class);
 				});
 		}
 	}

apps/federatedfilesharing/lib/Listeners/LoadAdditionalScriptsListener.php

@@ -8,6 +8,7 @@
  */
 namespace OCA\FederatedFileSharing\Listeners;
 
+use OCA\FederatedFileSharing\AppInfo\Application;
 use OCA\FederatedFileSharing\FederatedShareProvider;
 use OCA\Files\Event\LoadAdditionalScriptsEvent;
 use OCP\App\IAppManager;
@@ -35,7 +36,8 @@ public function handle(Event $event): void {
 
 		if ($this->federatedShareProvider->isIncomingServer2serverShareEnabled()) {
 			$this->initialState->provideInitialState('notificationsEnabled', $this->appManager->isEnabledForUser('notifications'));
-			Util::addInitScript('federatedfilesharing', 'external');
+			Util::addStyle(Application::APP_ID, 'init-files');
+			Util::addInitScript(Application::APP_ID, 'init-files');
 		}
 	}
 }

apps/federatedfilesharing/lib/Settings/Admin.php

@@ -6,6 +6,7 @@
  */
 namespace OCA\FederatedFileSharing\Settings;
 
+use OCA\FederatedFileSharing\AppInfo\Application;
 use OCA\FederatedFileSharing\FederatedShareProvider;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Services\IInitialState;
@@ -43,7 +44,9 @@ public function getForm() {
 		$this->initialState->provideInitialState('lookupServerUploadEnabled', $this->fedShareProvider->isLookupServerUploadEnabled());
 		$this->initialState->provideInitialState('federatedTrustedShareAutoAccept', $this->fedShareProvider->isFederatedTrustedShareAutoAccept());
 
-		return new TemplateResponse('federatedfilesharing', 'settings-admin', [], '');
+		\OCP\Util::addStyle(Application::APP_ID, 'settings-admin');
+		\OCP\Util::addScript(Application::APP_ID, 'settings-admin');
+		return new TemplateResponse(Application::APP_ID, 'settings-admin', renderAs: '');
 	}
 
 	/**

apps/federatedfilesharing/lib/Settings/Personal.php

@@ -8,6 +8,7 @@
  */
 namespace OCA\FederatedFileSharing\Settings;
 
+use OCA\FederatedFileSharing\AppInfo\Application;
 use OCA\FederatedFileSharing\FederatedShareProvider;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Services\IInitialState;
@@ -41,7 +42,9 @@ public function getForm(): TemplateResponse {
 		$this->initialState->provideInitialState('cloudId', $cloudID);
 		$this->initialState->provideInitialState('docUrlFederated', $this->urlGenerator->linkToDocs('user-sharing-federated'));
 
-		return new TemplateResponse('federatedfilesharing', 'settings-personal', [], TemplateResponse::RENDER_AS_BLANK);
+		\OCP\Util::addStyle(Application::APP_ID, 'settings-personal');
+		\OCP\Util::addScript(Application::APP_ID, 'settings-personal');
+		return new TemplateResponse(Application::APP_ID, 'settings-personal', renderAs: TemplateResponse::RENDER_AS_BLANK);
 	}
 
 	/**