Merge pull request #1047 from arawa/backport/add-capability/1041/stab…

…le3.2 Backport/add capability/1041/stable3.2
arawa · Aug 22, 2024 · 52bbf4d · 52bbf4d
2 parents fb5531a + 0f1029b
commit 52bbf4d
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 2 deletions.
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -28,12 +28,14 @@
 use OCA\Workspace\Service\SpaceService;
 use OCA\Workspace\Service\UserService;
 use OCP\AppFramework\App;
+use OCP\AppFramework\Bootstrap\IBootContext;
+use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\AppFramework\Utility\IControllerMethodReflector;
 use OCP\IRequest;
 use OCP\IURLGenerator;
 
-class Application extends App {
+class Application extends App implements IBootstrap {
 	public const APP_ID = 'workspace';
 
 	public function __construct(array $urlParams = []) {
@@ -67,5 +69,11 @@ public function register(IRegistrationContext $context): void {
 
 		$context->registerMiddleware(WorkspaceAccessControlMiddleware::class);
 		$context->registerMiddleware(IsSpaceAdminMiddleware::class);
+		$context->registerMiddleware(IsGeneralManagerMiddleware::class);
+
+		$context->registerCapability(Capabilities::class);
+	}
+
+	public function boot(IBootContext $context): void {
 	}
 }
diff --git a/lib/AppInfo/Capabilities.php b/lib/AppInfo/Capabilities.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\Workspace\AppInfo;
+
+use OCP\App\IAppManager;
+use OCP\Capabilities\ICapability;
+use OCP\IAppConfig;
+
+class Capabilities implements ICapability {
+	public function __construct(
+		private IAppManager $appManager,
+		private IAppConfig $appConfigManager
+	) {
+	}
+
+	public function getCapabilities(): array {
+		return [
+			Application::APP_ID => [
+				'version' => $this->appManager->getAppVersion(Application::APP_ID),
+				'is_enabled' => $this->appManager->isEnabledForUser(Application::APP_ID),
+				'groupfolders_version' => $this->appManager->getAppVersion('groupfolders'),
+			]
+		];
+	}
+}
diff --git a/lib/Controller/WorkspaceController.php b/lib/Controller/WorkspaceController.php
@@ -139,7 +139,7 @@ public function createWorkspace(string $spaceName,
 	 * Deletes the workspace, and the corresponding groupfolder and groups
 	 *
 	 * @NoAdminRequired
-	 * @SpaceAdminRequired
+	 * @GeneralManagerRequired
 	 * @param array $workspace
 	 *
 	 */

diff --git a/src/services/groupfoldersService.js b/src/services/groupfoldersService.js
@@ -306,6 +306,7 @@ export function rename(workspace, newSpaceName) {
 		{
 			workspace,
 			newSpaceName,
+			spaceId: workspace.id
 		})
 		.then(resp => {
 			// If space is updated...

diff --git a/src/store/actions.js b/src/store/actions.js
@@ -96,6 +96,7 @@ export default {
 					gid,
 					displayName,
 				},
+				spaceId: space.id
 			})
 			.then((resp) => {
 				addGroupToGroupfolder(space.groupfolderId, resp.data.group.gid)