Skip to content

Fix/display labels with invalid colors #7510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
grnd-alt wants to merge 2 commits into
base: main
Choose a base branch
from
+9 −1
Open

Fix/display labels with invalid colors #7510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3a3d5d
fix: set appropriate label text if color is invalid
grnd-alt Jan 7, 2026
b88498e
fix: validate hex color in backend
grnd-alt Jan 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/Validators/LabelServiceValidator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
];
}
}
4 changes: 4 additions & 0 deletions src/mixins/color.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading