[stable29] fix(systemtags): support new attribute parsing of webdav props

apps/systemtags/src/actions/inlineSystemTagsAction.ts

@@ -23,16 +23,7 @@ import { FileAction, Node, registerDavProperty, registerFileAction } from '@next
 import { translate as t } from '@nextcloud/l10n'
 
 import '../css/fileEntryInlineSystemTags.scss'
-
-const getNodeSystemTags = function(node: Node): string[] {
-	const tags = node.attributes?.['system-tags']?.['system-tag'] as string|string[]|undefined
-
-	if (tags === undefined) {
-		return []
-	}
-
-	return [tags].flat()
-}
+import { getNodeSystemTags } from '../utils'
 
 const renderTag = function(tag: string, isMore = false): HTMLElement {
 	const tagElement = document.createElement('li')

apps/systemtags/src/utils.spec.ts

@@ -24,7 +24,8 @@ import type { DAVResultResponseProps } from 'webdav'
 import type { ServerTag, Tag } from './types.js'
 
 import { describe, it, expect } from '@jest/globals'
-import { formatTag, parseIdFromLocation, parseTags } from './utils'
+import { formatTag, getNodeSystemTags, parseIdFromLocation, parseTags } from './utils'
+import { Folder } from '@nextcloud/files'
 
 describe('systemtags - utils', () => {
 	describe('parseTags', () => {
@@ -102,4 +103,92 @@ describe('systemtags - utils', () => {
 			})
 		})
 	})
+
+	describe('getNodeSystemTags', () => {
+		it('parses a plain tag', () => {
+			const node = new Folder({
+				owner: 'test',
+				source: 'https://example.com/remote.php/dav/files/test/folder',
+				attributes: {
+					'system-tags': {
+						'system-tag': 'tag',
+					},
+				},
+			})
+			expect(getNodeSystemTags(node)).toStrictEqual(['tag'])
+		})
+
+		it('parses plain tags', () => {
+			const node = new Folder({
+				owner: 'test',
+				source: 'https://example.com/remote.php/dav/files/test/folder',
+				attributes: {
+					'system-tags': {
+						'system-tag': [
+							'tag',
+							'my-tag',
+						],
+					},
+				},
+			})
+			expect(getNodeSystemTags(node)).toStrictEqual(['tag', 'my-tag'])
+		})
+
+		it('parses tag with attributes', () => {
+			const node = new Folder({
+				owner: 'test',
+				source: 'https://example.com/remote.php/dav/files/test/folder',
+				attributes: {
+					'system-tags': {
+						'system-tag': {
+							text: 'tag',
+							'@can-assign': true,
+						},
+					},
+				},
+			})
+			expect(getNodeSystemTags(node)).toStrictEqual(['tag'])
+		})
+
+		it('parses tags with attributes', () => {
+			const node = new Folder({
+				owner: 'test',
+				source: 'https://example.com/remote.php/dav/files/test/folder',
+				attributes: {
+					'system-tags': {
+						'system-tag': [
+							{
+								text: 'tag',
+								'@can-assign': true,
+							},
+							{
+								text: 'my-tag',
+								'@can-assign': false,
+							},
+						],
+					},
+				},
+			})
+			expect(getNodeSystemTags(node)).toStrictEqual(['tag', 'my-tag'])
+		})
+
+		it('parses tags mixed with and without attributes', () => {
+			const node = new Folder({
+				owner: 'test',
+				source: 'https://example.com/remote.php/dav/files/test/folder',
+				attributes: {
+					'system-tags': {
+						'system-tag': [
+							'tag',
+							{
+								text: 'my-tag',
+								'@can-assign': false,
+							},
+						],
+					},
+				},
+			})
+			expect(getNodeSystemTags(node)).toStrictEqual(['tag', 'my-tag'])
+		})
+	})
 })

apps/systemtags/src/utils.ts

@@ -24,6 +24,7 @@ import camelCase from 'camelcase'
 
 import type { DAVResultResponseProps } from 'webdav'
 
+import type { Node } from '@nextcloud/files'
 import type { BaseTag, ServerTag, Tag, TagWithId } from './types.js'
 
 export const defaultBaseTag: BaseTag = {
@@ -71,3 +72,22 @@ export const formatTag = (initialTag: Tag | ServerTag): ServerTag => {
 
 	return tag
 }
+
+export const getNodeSystemTags = function(node: Node): string[] {
+	const attribute = node.attributes?.['system-tags']?.['system-tag']
+	if (attribute === undefined) {
+		return []
+	}
+
+	// if there is only one tag it is a single string or prop object
+	// if there are multiple then its an array - so we flatten it to be always an array of string or prop objects
+	return [attribute]
+		.flat()
+		.map((tag: string|{ text: string }) => (
+			typeof tag === 'string'
+				// its a plain text prop (the tag name) without prop attributes
+				? tag
+				// its a prop object with attributes, the tag name is in the 'text' attribute
+				: tag.text
+		))
+}