refactor(systemtags): properly register hotkey in the files app

Signed-off-by: Ferdinand Thiessen <[email protected]>

Author: susnux

apps/systemtags/src/files_actions/bulkSystemTagsAction.ts

@@ -1,9 +1,9 @@
-/**
+/*!
  * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import type { INode } from '@nextcloud/files'
+import type { ActionContext, ActionContextSingle } from '@nextcloud/files'
 
 import TagMultipleSvg from '@mdi/svg/svg/tag-multiple-outline.svg?raw'
 import { FileAction, Permission } from '@nextcloud/files'
@@ -15,10 +15,10 @@ import { defineAsyncComponent } from 'vue'
 /**
  * Spawn a dialog to add or remove tags from multiple nodes.
  *
- * @param nodes Nodes to modify tags for
- * @param nodes.nodes
+ * @param context - The action context
+ * @param context.nodes - Nodes to modify tags for
  */
-async function execBatch({ nodes }: { nodes: INode[] }): Promise<(null | boolean)[]> {
+async function execBatch({ nodes }: ActionContext | ActionContextSingle): Promise<(null | boolean)[]> {
 	const response = await new Promise<null | boolean>((resolve) => {
 		spawnDialog(defineAsyncComponent(() => import('../components/SystemTagPicker.vue')), {
 			nodes,
@@ -53,9 +53,15 @@ export const action = new FileAction({
 		return !nodes.some((node) => (node.permissions & Permission.UPDATE) === 0)
 	},
 
-	async exec({ nodes }) {
-		return execBatch({ nodes })[0]
+	async exec(context: ActionContextSingle) {
+		const [result] = await execBatch(context)
+		return result
 	},
 
 	execBatch,
+
+	hotkey: {
+		description: t('systemtags', 'Manage tags'),
+		key: 't',
+	},
 })

apps/systemtags/src/files_actions/inlineSystemTagsAction.ts

@@ -1,9 +1,9 @@
-/**
+/*!
  * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import type { Node } from '@nextcloud/files'
+import type { INode } from '@nextcloud/files'
 import type { TagWithId } from '../types.ts'
 
 import { subscribe } from '@nextcloud/event-bus'
@@ -44,11 +44,6 @@ export const action = new FileAction({
 	},
 
 	order: 0,
-
-	hotkey: {
-		description: t('files', 'Manage tags'),
-		key: 'T',
-	},
 })
 
 // Subscribe to the events
@@ -62,7 +57,7 @@ subscribe('systemtags:tag:updated', updateTag)
  *
  * @param node - The updated node
  */
-function updateSystemTagsHtml(node: Node) {
+function updateSystemTagsHtml(node: INode) {
 	renderInline(node).then((systemTagsHtml) => {
 		document.querySelectorAll(`[data-systemtags-fileid="${node.fileid}"]`).forEach((element) => {
 			element.replaceWith(systemTagsHtml)
@@ -113,9 +108,10 @@ function updateSystemTagsColorAttribute(tag: TagWithId) {
 }
 
 /**
+ * Render a single tag element
  *
- * @param tag
- * @param isMore
+ * @param tag - The tag to render
+ * @param isMore - Whether this is a "more" tag
  */
 function renderTag(tag: string, isMore = false): HTMLElement {
 	const tagElement = document.createElement('li')
@@ -143,10 +139,11 @@ function renderTag(tag: string, isMore = false): HTMLElement {
 }
 
 /**
+ * Render the inline system tags for a node
  *
- * @param node
+ * @param node - The node to render the tags for
  */
-async function renderInline(node: Node): Promise<HTMLElement> {
+async function renderInline(node: INode): Promise<HTMLElement> {
 	// Ensure we have the system tags as an array
 	const tags = getNodeSystemTags(node)
 

apps/systemtags/src/init.ts

@@ -10,7 +10,6 @@ import { registerFileSidebarAction } from './files_actions/filesSidebarAction.ts
 import { action as inlineSystemTagsAction } from './files_actions/inlineSystemTagsAction.ts'
 import { action as openInFilesAction } from './files_actions/openInFilesAction.ts'
 import { registerSystemTagsView } from './files_views/systemtagsView.ts'
-import { registerHotkeys } from './services/HotKeysService.ts'
 
 registerDavProperty('nc:system-tags')
 registerFileAction(bulkSystemTagsAction)
@@ -19,7 +18,3 @@ registerFileAction(openInFilesAction)
 
 registerSystemTagsView()
 registerFileSidebarAction()
-
-document.addEventListener('DOMContentLoaded', () => {
-	registerHotkeys()
-})