fix(systemtags): handle null dav value

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
nextcloud · Dec 6, 2024 · 885b692 · 885b692
1 parent d114646
commit 885b692
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/apps/dav/lib/SystemTag/SystemTagPlugin.php b/apps/dav/lib/SystemTag/SystemTagPlugin.php
@@ -443,7 +443,11 @@ public function handleUpdateProperties($path, PropPatch $propPatch) {
 			}
 
 			if (isset($props[self::COLOR_PROPERTYNAME])) {
-				$color = $props[self::COLOR_PROPERTYNAME];
+				$propValue = $props[self::COLOR_PROPERTYNAME];
+				if ($propValue === '' || $propValue === 'null') {
+					$propValue = null;
+				}
+				$color = $propValue;
 				$updateTag = true;
 			}
 

diff --git a/apps/systemtags/src/services/api.ts b/apps/systemtags/src/services/api.ts
@@ -107,7 +107,7 @@ export const updateTag = async (tag: TagWithId): Promise<void> => {
 				<oc:display-name>${tag.displayName}</oc:display-name>
 				<oc:user-visible>${tag.userVisible}</oc:user-visible>
 				<oc:user-assignable>${tag.userAssignable}</oc:user-assignable>
-				<nc:color>${tag.color}</nc:color>
+				<nc:color>${tag?.color || null}</nc:color>
 			</d:prop>
 		</d:set>
 	</d:propertyupdate>`

diff --git a/dist/files-sidebar.js.map b/dist/files-sidebar.js.map
diff --git a/dist/systemtags-admin.js b/dist/systemtags-admin.js
diff --git a/dist/systemtags-admin.js.map b/dist/systemtags-admin.js.map
diff --git a/dist/systemtags-init.js b/dist/systemtags-init.js
diff --git a/dist/systemtags-init.js.map b/dist/systemtags-init.js.map