fix(systemtags): fix capabilities and sidebar + tag visibility

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

apps/files/src/actions/downloadAction.ts

@@ -55,7 +55,7 @@ export const action = new FileAction({
 		// some folders, we need to use the /apps/files/ajax/download.php
 		// endpoint, which only supports user root folder.
 		if (nodes.some(node => node.type === FileType.Folder)
-			&& !nodes.every(node => node.root?.startsWith('/files'))) {
+			&& nodes.some(node => !node.root?.startsWith('/files'))) {
 			return false
 		}
 

apps/files/src/views/FilesList.vue

@@ -382,8 +382,7 @@ export default Vue.extend({
 					this.pathsStore.addPath({ service: currentView.id, fileid: node.fileid, path: join(dir, node.basename) })
 				})
 			} catch (error) {
-				throw error
-				// logger.error('Error while fetching content', { error })
+				logger.error('Error while fetching content', { error })
 			} finally {
 				this.loading = false
 			}

apps/files/src/views/Sidebar.vue

@@ -91,6 +91,7 @@
 import { emit } from '@nextcloud/event-bus'
 import { encodePath } from '@nextcloud/paths'
 import { File, Folder } from '@nextcloud/files'
+import { getCapabilities } from '@nextcloud/capabilities'
 import { getCurrentUser } from '@nextcloud/auth'
 import { Type as ShareTypes } from '@nextcloud/sharing'
 import $ from 'jquery'
@@ -299,7 +300,7 @@ export default {
 		},
 
 		isSystemTagsEnabled() {
-			return OCA && 'SystemTags' in OCA
+			return getCapabilities()?.systemtags?.enabled === true
 		},
 	},
 	created() {

apps/systemtags/composer/composer/autoload_classmap.php

@@ -11,6 +11,7 @@
     'OCA\\SystemTags\\Activity\\Provider' => $baseDir . '/../lib/Activity/Provider.php',
     'OCA\\SystemTags\\Activity\\Setting' => $baseDir . '/../lib/Activity/Setting.php',
     'OCA\\SystemTags\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
+    'OCA\\SystemTags\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
     'OCA\\SystemTags\\Controller\\LastUsedController' => $baseDir . '/../lib/Controller/LastUsedController.php',
     'OCA\\SystemTags\\Search\\TagSearchProvider' => $baseDir . '/../lib/Search/TagSearchProvider.php',
     'OCA\\SystemTags\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',

apps/systemtags/composer/composer/autoload_static.php

@@ -26,6 +26,7 @@ class ComposerStaticInitSystemTags
         'OCA\\SystemTags\\Activity\\Provider' => __DIR__ . '/..' . '/../lib/Activity/Provider.php',
         'OCA\\SystemTags\\Activity\\Setting' => __DIR__ . '/..' . '/../lib/Activity/Setting.php',
         'OCA\\SystemTags\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
+        'OCA\\SystemTags\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
         'OCA\\SystemTags\\Controller\\LastUsedController' => __DIR__ . '/..' . '/../lib/Controller/LastUsedController.php',
         'OCA\\SystemTags\\Search\\TagSearchProvider' => __DIR__ . '/..' . '/../lib/Search/TagSearchProvider.php',
         'OCA\\SystemTags\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',

apps/systemtags/lib/AppInfo/Application.php

@@ -28,6 +28,7 @@
 use OCA\Files\Event\LoadAdditionalScriptsEvent;
 use OCA\SystemTags\Search\TagSearchProvider;
 use OCA\SystemTags\Activity\Listener;
+use OCA\SystemTags\Capabilities;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
@@ -45,6 +46,7 @@ public function __construct() {
 
 	public function register(IRegistrationContext $context): void {
 		$context->registerSearchProvider(TagSearchProvider::class);
+		$context->registerCapability(Capabilities::class);
 	}
 
 	public function boot(IBootContext $context): void {
@@ -77,16 +79,5 @@ function () {
 			$dispatcher->addListener(MapperEvent::EVENT_ASSIGN, $mapperListener);
 			$dispatcher->addListener(MapperEvent::EVENT_UNASSIGN, $mapperListener);
 		});
-
-		\OCA\Files\App::getNavigationManager()->add(function () {
-			$l = \OC::$server->getL10N(self::APP_ID);
-			return [
-				'id' => 'systemtagsfilter',
-				'appname' => self::APP_ID,
-				'script' => 'list.php',
-				'order' => 25,
-				'name' => $l->t('Tags'),
-			];
-		});
 	}
 }

apps/systemtags/lib/Capabilities.php

@@ -0,0 +1,40 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2023 John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+namespace OCA\SystemTags;
+
+use OCP\Capabilities\ICapability;
+
+class Capabilities implements ICapability {
+	/**
+	 * @return array{systemtags: array{enabled: true}}
+	 */
+	public function getCapabilities() {
+		$capabilities = [
+			'systemtags' => [
+				'enabled' => true,
+			]
+		];
+		return $capabilities;
+	}
+}

apps/systemtags/src/services/systemtags.ts

@@ -30,8 +30,6 @@ import { fetchTags } from './api'
 import { getClient } from '../../../files/src/services/WebdavClient'
 import { resultToNode } from '../../../files/src/services/Files'
 
-let tagsCache = [] as TagWithId[]
-
 const formatReportPayload = (tagId: number) => `<?xml version="1.0"?>
 <oc:filter-files ${getDavNameSpaces()}>
 	<d:prop>
@@ -58,7 +56,7 @@ const tagToNode = function(tag: TagWithId): Folder {
 
 export const getContents = async (path = '/'): Promise<ContentsWithRoot> => {
 	// List tags in the root
-	tagsCache = await fetchTags()
+	const tagsCache = (await fetchTags()).filter(tag => tag.userVisible) as TagWithId[]
 
 	if (path === '/') {
 		return {
@@ -67,6 +65,7 @@ export const getContents = async (path = '/'): Promise<ContentsWithRoot> => {
 				source: generateRemoteUrl('dav/systemtags'),
 				owner: getCurrentUser()?.uid as string,
 				root: '/systemtags',
+				permissions: Permission.NONE,
 			}),
 			contents: tagsCache.map(tagToNode),
 		}