Merge pull request #7540 from nextcloud/backport/7510/stable31

[stable31] Fix/display labels with invalid colors

Author: grnd-alt

lib/Validators/LabelServiceValidator.php

@@ -10,12 +10,16 @@
 namespace OCA\Deck\Validators;
 
 class LabelServiceValidator extends BaseValidator {
+	protected function hex_color(string $value): bool {
+		return preg_match('/[A-Fa-f0-9]{6}/', $value) === 1;
+	}
+
 	public function rules() {
 		return [
 			'id' => ['numeric'],
 			'title' => ['not_empty', 'not_null', 'not_false', 'max:100'],
 			'boardId' => ['numeric', 'not_null'],
-			'color' => ['not_empty', 'not_null', 'not_false', 'max:6']
+			'color' => ['not_empty', 'not_null', 'not_false', 'max:6', 'hex_color']
 		];
 	}
 }

src/mixins/color.js

@@ -3,11 +3,15 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { isDarkTheme } from '@nextcloud/vue'
 import chroma from 'chroma-js'
 
 export default {
 	methods: {
 		textColor(hex) {
+			if (!this.colorIsValid(hex)) {
+				return isDarkTheme ? '#ffffff' : '#000000'
+			}
 			return chroma(hex ?? 'ffffff').get('lab.l') > 50 ? '#000000' : '#ffffff'
 		},
 		colorIsValid(hex) {