From 26784a532551b5e52bc3868a102a5e594a6110eb Mon Sep 17 00:00:00 2001 From: jayme-github Date: Thu, 3 Dec 2020 20:12:55 +0100 Subject: [PATCH 01/20] Add automatic coloring of tags Please see this as proposal on how to implement automatic/random colors for tags while keeping the current set of hard coded colors in place (at least in the frontend). Bear with me as I have even less Angular knowledge than Django and just tried to get away with as few changes as possible. :-) AIUI you want to change to a color picking system anyways in the future, which could also play well with this. fixes #51 --- Pipfile | 1 + .../components/common/tag/tag.component.html | 4 +- .../components/common/tag/tag.component.ts | 6 +- .../tag-edit-dialog.component.html | 2 +- .../tag-edit-dialog.component.ts | 6 +- .../manage/tag-list/tag-list.component.html | 2 +- .../manage/tag-list/tag-list.component.ts | 8 ++- src-ui/src/app/data/paperless-tag.ts | 31 ++++---- .../migrations/1006_migrate_tag_colour.py | 70 +++++++++++++++++++ src/documents/models.py | 28 +++----- 10 files changed, 116 insertions(+), 42 deletions(-) create mode 100644 src/documents/migrations/1006_migrate_tag_colour.py diff --git a/Pipfile b/Pipfile index c0728fddf..1cf5a312f 100644 --- a/Pipfile +++ b/Pipfile @@ -40,6 +40,7 @@ whoosh="~=2.7.4" inotifyrecursive = ">=0.3.4" ocrmypdf = "*" tqdm = "*" +colorhash = "*" [dev-packages] coveralls = "*" diff --git a/src-ui/src/app/components/common/tag/tag.component.html b/src-ui/src/app/components/common/tag/tag.component.html index 8b9632a65..29c554142 100644 --- a/src-ui/src/app/components/common/tag/tag.component.html +++ b/src-ui/src/app/components/common/tag/tag.component.html @@ -1,2 +1,2 @@ -{{tag.name}} -{{tag.name}} \ No newline at end of file +{{tag.name}} +{{tag.name}} \ No newline at end of file diff --git a/src-ui/src/app/components/common/tag/tag.component.ts b/src-ui/src/app/components/common/tag/tag.component.ts index c032c51db..163960f3d 100644 --- a/src-ui/src/app/components/common/tag/tag.component.ts +++ b/src-ui/src/app/components/common/tag/tag.component.ts @@ -23,7 +23,11 @@ export class TagComponent implements OnInit { } getColour() { - return TAG_COLOURS.find(c => c.id == this.tag.colour) + var color = TAG_COLOURS.find(c => c.id == this.tag.colour) + if (color) { + return color + } + return { id: this.tag.colour, name: this.tag.colour, textColor: "#ffffff" } } } diff --git a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html index 8048b0c80..2f6dded52 100644 --- a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html +++ b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html @@ -7,7 +7,7 @@
- + diff --git a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts index bb0162608..8017f275b 100644 --- a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts +++ b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts @@ -13,14 +13,14 @@ import { ToastService } from 'src/app/services/toast.service'; }) export class TagEditDialogComponent extends EditDialogComponent { - constructor(service: TagService, activeModal: NgbActiveModal, toastService: ToastService) { + constructor(service: TagService, activeModal: NgbActiveModal, toastService: ToastService) { super(service, activeModal, toastService, 'tag') } getForm(): FormGroup { return new FormGroup({ name: new FormControl(''), - colour: new FormControl(1), + colour: new FormControl(''), is_inbox_tag: new FormControl(false), matching_algorithm: new FormControl(1), match: new FormControl(""), @@ -32,7 +32,7 @@ export class TagEditDialogComponent extends EditDialogComponent { return TAG_COLOURS } - getColor(id: number) { + getColor(id) { return TAG_COLOURS.find(c => c.id == id) } diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.html b/src-ui/src/app/components/manage/tag-list/tag-list.component.html index e68b997d1..8923ad210 100644 --- a/src-ui/src/app/components/manage/tag-list/tag-list.component.html +++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.html @@ -23,7 +23,7 @@ {{ tag.name }} {{ getColor(tag.colour).name }} + [style.background-color]="tag.colour">{{ getColor(tag.colour).name }} {{ getMatching(tag) }} {{ tag.document_count }} diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts index 761a9484c..582835de1 100644 --- a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts +++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts @@ -15,10 +15,14 @@ export class TagListComponent extends GenericListComponent { constructor(tagService: TagService, modalService: NgbModal) { super(tagService, modalService, TagEditDialogComponent) - } + } getColor(id) { - return TAG_COLOURS.find(c => c.id == id) + var color = TAG_COLOURS.find(c => c.id == id) + if (color) { + return color + } + return { id: id, name: id, textColor: "#ffffff" } } getObjectName(object: PaperlessTag) { diff --git a/src-ui/src/app/data/paperless-tag.ts b/src-ui/src/app/data/paperless-tag.ts index 551c6e03a..3d8ddfdaf 100644 --- a/src-ui/src/app/data/paperless-tag.ts +++ b/src-ui/src/app/data/paperless-tag.ts @@ -3,26 +3,27 @@ import { ObjectWithId } from './object-with-id'; export const TAG_COLOURS = [ - {id: 1, value: "#a6cee3", name: "Light Blue", textColor: "#000000"}, - {id: 2, value: "#1f78b4", name: "Blue", textColor: "#ffffff"}, - {id: 3, value: "#b2df8a", name: "Light Green", textColor: "#000000"}, - {id: 4, value: "#33a02c", name: "Green", textColor: "#000000"}, - {id: 5, value: "#fb9a99", name: "Light Red", textColor: "#000000"}, - {id: 6, value: "#e31a1c", name: "Red ", textColor: "#ffffff"}, - {id: 7, value: "#fdbf6f", name: "Light Orange", textColor: "#000000"}, - {id: 8, value: "#ff7f00", name: "Orange", textColor: "#000000"}, - {id: 9, value: "#cab2d6", name: "Light Violet", textColor: "#000000"}, - {id: 10, value: "#6a3d9a", name: "Violet", textColor: "#ffffff"}, - {id: 11, value: "#b15928", name: "Brown", textColor: "#000000"}, - {id: 12, value: "#000000", name: "Black", textColor: "#ffffff"}, - {id: 13, value: "#cccccc", name: "Light Grey", textColor: "#000000"} + { id: "", name: "Auto", textColor: "#000000" }, + { id: "#a6cee3", name: "Light Blue", textColor: "#000000" }, + { id: "#1f78b4", name: "Blue", textColor: "#ffffff" }, + { id: "#b2df8a", name: "Light Green", textColor: "#000000" }, + { id: "#33a02c", name: "Green", textColor: "#000000" }, + { id: "#fb9a99", name: "Light Red", textColor: "#000000" }, + { id: "#e31a1c", name: "Red ", textColor: "#ffffff" }, + { id: "#fdbf6f", name: "Light Orange", textColor: "#000000" }, + { id: "#ff7f00", name: "Orange", textColor: "#000000" }, + { id: "#cab2d6", name: "Light Violet", textColor: "#000000" }, + { id: "#6a3d9a", name: "Violet", textColor: "#ffffff" }, + { id: "#b15928", name: "Brown", textColor: "#000000" }, + { id: "#000000", name: "Black", textColor: "#ffffff" }, + { id: "#cccccc", name: "Light Grey", textColor: "#000000" } ] export interface PaperlessTag extends MatchingModel { - colour?: number + colour?: string is_inbox_tag?: boolean - + document_count?: number } diff --git a/src/documents/migrations/1006_migrate_tag_colour.py b/src/documents/migrations/1006_migrate_tag_colour.py new file mode 100644 index 000000000..d9bea8355 --- /dev/null +++ b/src/documents/migrations/1006_migrate_tag_colour.py @@ -0,0 +1,70 @@ +# Generated by Django 3.1.4 on 2020-12-02 21:43 + +from django.db import migrations, models + +COLOURS_OLD = { + 1: "#a6cee3", + 2: "#1f78b4", + 3: "#b2df8a", + 4: "#33a02c", + 5: "#fb9a99", + 6: "#e31a1c", + 7: "#fdbf6f", + 8: "#ff7f00", + 9: "#cab2d6", + 10: "#6a3d9a", + 11: "#b15928", + 12: "#000000", + 13: "#cccccc", +} + + +def forward(apps, schema_editor): + Tag = apps.get_model('documents', 'Tag') + + for tag in Tag.objects.all(): + colour_old_id = tag.colour_old + rgb = COLOURS_OLD[colour_old_id] + tag.colour = rgb + tag.save() + + +def reverse(apps, schema_editor): + Tag = apps.get_model('documents', 'Tag') + + def _get_colour_id(rdb): + for idx, rdbx in COLOURS_OLD.items(): + if rdbx == rdb: + return idx + # Return colour 1 if we can't match anything + return 1 + + for tag in Tag.objects.all(): + colour_id = _get_colour_id(tag.colour) + tag.colour_old = colour_id + tag.save() + + +class Migration(migrations.Migration): + + dependencies = [ + ('documents', '1005_checksums'), + ] + + operations = [ + migrations.RenameField( + model_name='tag', + old_name='colour', + new_name='colour_old', + ), + migrations.AddField( + model_name='tag', + name='colour', + field=models.CharField(blank=True, max_length=7), + ), + migrations.RunPython(forward, reverse), + migrations.RemoveField( + model_name='tag', + name='colour_old', + ) + ] diff --git a/src/documents/models.py b/src/documents/models.py index a4f887d77..5491e4038 100755 --- a/src/documents/models.py +++ b/src/documents/models.py @@ -6,6 +6,7 @@ import re from collections import OrderedDict import dateutil.parser +from colorhash import ColorHash from django.conf import settings from django.db import models from django.utils import timezone @@ -84,23 +85,7 @@ class Correspondent(MatchingModel): class Tag(MatchingModel): - COLOURS = ( - (1, "#a6cee3"), - (2, "#1f78b4"), - (3, "#b2df8a"), - (4, "#33a02c"), - (5, "#fb9a99"), - (6, "#e31a1c"), - (7, "#fdbf6f"), - (8, "#ff7f00"), - (9, "#cab2d6"), - (10, "#6a3d9a"), - (11, "#b15928"), - (12, "#000000"), - (13, "#cccccc") - ) - - colour = models.PositiveIntegerField(choices=COLOURS, default=1) + colour = models.CharField(blank=True, max_length=7) is_inbox_tag = models.BooleanField( default=False, @@ -108,6 +93,15 @@ class Tag(MatchingModel): "documents will be tagged with inbox tags." ) + def save(self, *args, **kwargs): + if self.colour == "": + self.colour = ColorHash( + self.name, + lightness=(0.35, 0.45, 0.55, 0.65), + saturation=(0.2, 0.3, 0.4, 0.5)).hex + + super().save(*args, **kwargs) + class DocumentType(MatchingModel): From 87c364a10472545549ab285c76d488606184569f Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Wed, 24 Feb 2021 23:52:25 +0100 Subject: [PATCH 02/20] adjust migration --- src/documents/admin.py | 6 +++--- ...igrate_tag_colour.py => 1013_migrate_tag_colour.py} | 10 +++++----- src/documents/models.py | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) rename src/documents/migrations/{1006_migrate_tag_colour.py => 1013_migrate_tag_colour.py} (85%) diff --git a/src/documents/admin.py b/src/documents/admin.py index aee45b49d..c8c16d791 100755 --- a/src/documents/admin.py +++ b/src/documents/admin.py @@ -19,12 +19,12 @@ class TagAdmin(admin.ModelAdmin): list_display = ( "name", - "colour", + "color", "match", "matching_algorithm" ) - list_filter = ("colour", "matching_algorithm") - list_editable = ("colour", "match", "matching_algorithm") + list_filter = ("color", "matching_algorithm") + list_editable = ("color", "match", "matching_algorithm") class DocumentTypeAdmin(admin.ModelAdmin): diff --git a/src/documents/migrations/1006_migrate_tag_colour.py b/src/documents/migrations/1013_migrate_tag_colour.py similarity index 85% rename from src/documents/migrations/1006_migrate_tag_colour.py rename to src/documents/migrations/1013_migrate_tag_colour.py index d9bea8355..0c1189074 100644 --- a/src/documents/migrations/1006_migrate_tag_colour.py +++ b/src/documents/migrations/1013_migrate_tag_colour.py @@ -25,7 +25,7 @@ def forward(apps, schema_editor): for tag in Tag.objects.all(): colour_old_id = tag.colour_old rgb = COLOURS_OLD[colour_old_id] - tag.colour = rgb + tag.color = rgb tag.save() @@ -40,7 +40,7 @@ def reverse(apps, schema_editor): return 1 for tag in Tag.objects.all(): - colour_id = _get_colour_id(tag.colour) + colour_id = _get_colour_id(tag.color) tag.colour_old = colour_id tag.save() @@ -48,7 +48,7 @@ def reverse(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ - ('documents', '1005_checksums'), + ('documents', '1012_fix_archive_files'), ] operations = [ @@ -59,8 +59,8 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='tag', - name='colour', - field=models.CharField(blank=True, max_length=7), + name='color', + field=models.CharField(blank=True, max_length=7, verbose_name='color'), ), migrations.RunPython(forward, reverse), migrations.RemoveField( diff --git a/src/documents/models.py b/src/documents/models.py index 47361776a..9c5b14806 100755 --- a/src/documents/models.py +++ b/src/documents/models.py @@ -78,7 +78,7 @@ class Correspondent(MatchingModel): class Tag(MatchingModel): - colour = models.CharField( + color = models.CharField( _("color"), blank=True, max_length=7) From 95fe803bf648da7be9cde6c5831a81f522a5479b Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Wed, 24 Feb 2021 23:52:52 +0100 Subject: [PATCH 03/20] remove colorhash (this will be done client side) --- Pipfile | 1 - src/documents/models.py | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/Pipfile b/Pipfile index 0e72eb1c0..29a91ece3 100644 --- a/Pipfile +++ b/Pipfile @@ -55,7 +55,6 @@ uvloop = "~=0.14.0" # TODO: keep an eye on piwheel builds and update this once available (https://www.piwheels.org/project/cryptography/) cryptography = "~=3.3.2" "pdfminer.six" = "*" -colorhash = "*" [dev-packages] coveralls = "*" diff --git a/src/documents/models.py b/src/documents/models.py index 9c5b14806..abbcc124e 100755 --- a/src/documents/models.py +++ b/src/documents/models.py @@ -8,7 +8,6 @@ from collections import OrderedDict import pathvalidate import dateutil.parser -from colorhash import ColorHash from django.conf import settings from django.contrib.auth.models import User from django.db import models @@ -93,15 +92,6 @@ class Tag(MatchingModel): verbose_name = _("tag") verbose_name_plural = _("tags") - def save(self, *args, **kwargs): - if self.colour == "": - self.colour = ColorHash( - self.name, - lightness=(0.35, 0.45, 0.55, 0.65), - saturation=(0.2, 0.3, 0.4, 0.5)).hex - - super().save(*args, **kwargs) - class DocumentType(MatchingModel): From d84ca511d4642ec336e7f3272217d9ef36d35ae6 Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Wed, 24 Feb 2021 23:54:19 +0100 Subject: [PATCH 04/20] versioning for the tags API --- src/documents/serialisers.py | 52 +++++++++++++++++++++++++++++++++++- src/documents/views.py | 8 +++++- src/paperless/settings.py | 2 +- 3 files changed, 59 insertions(+), 3 deletions(-) diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index adda7117e..e6aef3627 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -88,7 +88,40 @@ class DocumentTypeSerializer(MatchingModelSerializer): ) -class TagSerializer(MatchingModelSerializer): +class ColorField(serializers.Field): + + COLOURS = ( + (1, "#a6cee3"), + (2, "#1f78b4"), + (3, "#b2df8a"), + (4, "#33a02c"), + (5, "#fb9a99"), + (6, "#e31a1c"), + (7, "#fdbf6f"), + (8, "#ff7f00"), + (9, "#cab2d6"), + (10, "#6a3d9a"), + (11, "#b15928"), + (12, "#000000"), + (13, "#cccccc") + ) + + def to_internal_value(self, data): + for id, color in self.COLOURS: + if id == data: + return color + return "#a6cee3" + + def to_representation(self, value): + for id, color in self.COLOURS: + if color == value: + return id + return 1 + + +class TagSerializerVersion1(MatchingModelSerializer): + + colour = ColorField(source='color') class Meta: model = Tag @@ -105,6 +138,23 @@ class TagSerializer(MatchingModelSerializer): ) +class TagSerializer(MatchingModelSerializer): + + class Meta: + model = Tag + fields = ( + "id", + "slug", + "name", + "color", + "match", + "matching_algorithm", + "is_insensitive", + "is_inbox_tag", + "document_count" + ) + + class CorrespondentField(serializers.PrimaryKeyRelatedField): def get_queryset(self): return Correspondent.objects.all() diff --git a/src/documents/views.py b/src/documents/views.py index f5ddd88ee..bed44633d 100755 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -50,6 +50,7 @@ from .parsers import get_parser_class_for_mime_type from .serialisers import ( CorrespondentSerializer, DocumentSerializer, + TagSerializerVersion1, TagSerializer, DocumentTypeSerializer, PostDocumentSerializer, @@ -118,7 +119,12 @@ class TagViewSet(ModelViewSet): queryset = Tag.objects.annotate( document_count=Count('documents')).order_by(Lower('name')) - serializer_class = TagSerializer + def get_serializer_class(self): + if int(self.request.version) == 1: + return TagSerializerVersion1 + else: + return TagSerializer + pagination_class = StandardPagination permission_classes = (IsAuthenticated,) filter_backends = (DjangoFilterBackend, OrderingFilter) diff --git a/src/paperless/settings.py b/src/paperless/settings.py index 48712954c..3dcff4a89 100644 --- a/src/paperless/settings.py +++ b/src/paperless/settings.py @@ -114,7 +114,7 @@ REST_FRAMEWORK = { 'rest_framework.authentication.TokenAuthentication' ], 'DEFAULT_VERSIONING_CLASS': 'rest_framework.versioning.AcceptHeaderVersioning', - 'DEFAULT_VERSION': 'v1', + 'DEFAULT_VERSION': '1', 'ALLOWED_VERSIONS': ['1', '2'] } From 7cc940a16c66045c51f780d5051799026ebc46cd Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Thu, 25 Feb 2021 11:30:36 +0100 Subject: [PATCH 05/20] add text color generation based on luminance --- src/documents/serialisers.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index e6aef3627..4d52f496b 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -1,6 +1,7 @@ import re import magic +import math from django.utils.text import slugify from rest_framework import serializers from rest_framework.fields import SerializerMethodField @@ -140,6 +141,21 @@ class TagSerializerVersion1(MatchingModelSerializer): class TagSerializer(MatchingModelSerializer): + def get_text_color(self, obj): + if obj.color: + h = obj.color.lstrip('#') + rgb = tuple(int(h[i:i + 2], 16)/256 for i in (0, 2, 4)) + luminance = math.sqrt( + 0.299 * math.pow(rgb[0], 2) + + 0.587 * math.pow(rgb[1], 2) + + 0.114 * math.pow(rgb[2], 2) + ) + return "#ffffff" if luminance < 0.5 else "#000000" + else: + return "#000000" + + text_color = serializers.SerializerMethodField() + class Meta: model = Tag fields = ( @@ -147,6 +163,7 @@ class TagSerializer(MatchingModelSerializer): "slug", "name", "color", + "text_color", "match", "matching_algorithm", "is_insensitive", From c75e30fd2860f146ed9d1604cc688b1db850a0c6 Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Thu, 25 Feb 2021 11:30:49 +0100 Subject: [PATCH 06/20] validate hex color strings --- src/documents/serialisers.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index 4d52f496b..689e2fe8d 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -171,6 +171,12 @@ class TagSerializer(MatchingModelSerializer): "document_count" ) + def validate_color(self, color): + regex = r"#[0-9a-fA-F]{6}" + if not re.match(regex, color): + raise serializers.ValidationError(_("Invalid color.")) + return color + class CorrespondentField(serializers.PrimaryKeyRelatedField): def get_queryset(self): From 33ed2c8851a526443b20f7ac5f97f6814fbbac5e Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Thu, 25 Feb 2021 11:32:22 +0100 Subject: [PATCH 07/20] adjust frontend to use the new tag color api --- src-ui/package-lock.json | 20 +++++++++++ src-ui/package.json | 1 + src-ui/src/app/app.module.ts | 8 +++-- .../common/input/color/color.component.html | 33 +++++++++++++++++++ .../common/input/color/color.component.scss | 0 .../input/color/color.component.spec.ts | 25 ++++++++++++++ .../common/input/color/color.component.ts | 27 +++++++++++++++ .../components/common/tag/tag.component.html | 4 +-- .../components/common/tag/tag.component.ts | 10 +----- .../tag-edit-dialog.component.html | 10 +----- .../tag-edit-dialog.component.ts | 12 ++----- .../manage/tag-list/tag-list.component.html | 4 +-- .../manage/tag-list/tag-list.component.ts | 10 +----- src-ui/src/app/data/paperless-tag.ts | 25 +++----------- src-ui/src/environments/environment.prod.ts | 2 +- src-ui/src/environments/environment.ts | 2 +- 16 files changed, 127 insertions(+), 66 deletions(-) create mode 100644 src-ui/src/app/components/common/input/color/color.component.html create mode 100644 src-ui/src/app/components/common/input/color/color.component.scss create mode 100644 src-ui/src/app/components/common/input/color/color.component.spec.ts create mode 100644 src-ui/src/app/components/common/input/color/color.component.ts diff --git a/src-ui/package-lock.json b/src-ui/package-lock.json index fd6d69538..54c99b1b3 100644 --- a/src-ui/package-lock.json +++ b/src-ui/package-lock.json @@ -2035,6 +2035,11 @@ "to-fast-properties": "^2.0.0" } }, + "@ctrl/tinycolor": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.4.0.tgz", + "integrity": "sha512-JZButFdZ1+/xAfpguQHoabIXkcqRRKpMrWKBkpEZZyxfY9C1DpADFB8PEqGSTeFr135SaTRfKqGKx5xSCLI7ZQ==" + }, "@istanbuljs/schema": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz", @@ -7895,6 +7900,11 @@ "object-visit": "^1.0.0" } }, + "material-colors": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz", + "integrity": "sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==" + }, "md5.js": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", @@ -8333,6 +8343,16 @@ } } }, + "ngx-color": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/ngx-color/-/ngx-color-6.2.0.tgz", + "integrity": "sha512-n04tcMnCpOgmI24egST94YwHmnSoAxK8O1T2t3nGrTwWbvw5XBRJvImNFnoNrriBXzc4Gx4hFehH5MU8CZxp1w==", + "requires": { + "@ctrl/tinycolor": "^3.1.6", + "material-colors": "^1.2.6", + "tslib": "^2.0.0" + } + }, "ngx-cookie-service": { "version": "10.1.1", "resolved": "https://registry.npmjs.org/ngx-cookie-service/-/ngx-cookie-service-10.1.1.tgz", diff --git a/src-ui/package.json b/src-ui/package.json index a4d014284..595228501 100644 --- a/src-ui/package.json +++ b/src-ui/package.json @@ -26,6 +26,7 @@ "file-saver": "^2.0.5", "ng-bootstrap": "^1.6.3", "ng2-pdf-viewer": "^6.3.2", + "ngx-color": "^6.2.0", "ngx-cookie-service": "^10.1.1", "ngx-file-drop": "^10.0.0", "ngx-infinite-scroll": "^9.1.0", diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index 0cc42292b..cb3698187 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -63,6 +63,8 @@ import { DateComponent } from './components/common/input/date/date.component'; import { ISODateTimeAdapter } from './utils/ngb-iso-date-time-adapter'; import { LocalizedDateParserFormatter } from './utils/ngb-date-parser-formatter'; import { ApiVersionInterceptor } from './interceptors/api-version.interceptor'; +import { ColorSliderModule } from 'ngx-color/slider'; +import { ColorComponent } from './components/common/input/color/color.component'; import localeFr from '@angular/common/locales/fr'; import localeNl from '@angular/common/locales/nl'; @@ -125,7 +127,8 @@ registerLocaleData(localeEnGb) NumberComponent, SafePipe, CustomDatePipe, - DateComponent + DateComponent, + ColorComponent ], imports: [ BrowserModule, @@ -137,7 +140,8 @@ registerLocaleData(localeEnGb) NgxFileDropModule, InfiniteScrollModule, PdfViewerModule, - NgSelectModule + NgSelectModule, + ColorSliderModule ], providers: [ DatePipe, diff --git a/src-ui/src/app/components/common/input/color/color.component.html b/src-ui/src/app/components/common/input/color/color.component.html new file mode 100644 index 000000000..c39c41d8f --- /dev/null +++ b/src-ui/src/app/components/common/input/color/color.component.html @@ -0,0 +1,33 @@ +
+ + +
+
+     +
+ + +
+ +
+ + + + + +
+ +
+ + {{hint}} +
+ {{error}} +
+
+ +
\ No newline at end of file diff --git a/src-ui/src/app/components/common/input/color/color.component.scss b/src-ui/src/app/components/common/input/color/color.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src-ui/src/app/components/common/input/color/color.component.spec.ts b/src-ui/src/app/components/common/input/color/color.component.spec.ts new file mode 100644 index 000000000..7c5d0d270 --- /dev/null +++ b/src-ui/src/app/components/common/input/color/color.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ColorComponent } from './color.component'; + +describe('ColorComponent', () => { + let component: ColorComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ColorComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ColorComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src-ui/src/app/components/common/input/color/color.component.ts b/src-ui/src/app/components/common/input/color/color.component.ts new file mode 100644 index 000000000..e75bbee16 --- /dev/null +++ b/src-ui/src/app/components/common/input/color/color.component.ts @@ -0,0 +1,27 @@ +import { Component, forwardRef } from '@angular/core'; +import { NG_VALUE_ACCESSOR } from '@angular/forms'; +import { AbstractInputComponent } from '../abstract-input'; + +@Component({ + providers: [{ + provide: NG_VALUE_ACCESSOR, + useExisting: forwardRef(() => ColorComponent), + multi: true + }], + selector: 'app-input-color', + templateUrl: './color.component.html', + styleUrls: ['./color.component.scss'] +}) +export class ColorComponent extends AbstractInputComponent { + + constructor() { + super() + } + + randomize() { + } + + colorChanged(value) { + this.value = value.color.hex + } +} diff --git a/src-ui/src/app/components/common/tag/tag.component.html b/src-ui/src/app/components/common/tag/tag.component.html index 29c554142..fc8b9ef65 100644 --- a/src-ui/src/app/components/common/tag/tag.component.html +++ b/src-ui/src/app/components/common/tag/tag.component.html @@ -1,2 +1,2 @@ -{{tag.name}} -{{tag.name}} \ No newline at end of file +{{tag.name}} +{{tag.name}} \ No newline at end of file diff --git a/src-ui/src/app/components/common/tag/tag.component.ts b/src-ui/src/app/components/common/tag/tag.component.ts index a3c558182..e552ade9c 100644 --- a/src-ui/src/app/components/common/tag/tag.component.ts +++ b/src-ui/src/app/components/common/tag/tag.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; -import { TAG_COLOURS, PaperlessTag } from 'src/app/data/paperless-tag'; +import { PaperlessTag } from 'src/app/data/paperless-tag'; @Component({ selector: 'app-tag', @@ -22,12 +22,4 @@ export class TagComponent implements OnInit { ngOnInit(): void { } - getColour() { - var color = TAG_COLOURS.find(c => c.id == this.tag.colour) - if (color) { - return color - } - return { id: this.tag.colour, name: this.tag.colour, textColor: "#ffffff" } - } - } diff --git a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html index 0d2f6a1c7..d9db9283a 100644 --- a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html +++ b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html @@ -8,15 +8,7 @@
- -
- - - - {{item.name}} - - -
+ diff --git a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts index d5b281e30..53cd50c45 100644 --- a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts +++ b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts @@ -2,7 +2,7 @@ import { Component } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { EditDialogComponent } from 'src/app/components/common/edit-dialog/edit-dialog.component'; -import { TAG_COLOURS, PaperlessTag } from 'src/app/data/paperless-tag'; +import { PaperlessTag } from 'src/app/data/paperless-tag'; import { TagService } from 'src/app/services/rest/tag.service'; import { ToastService } from 'src/app/services/toast.service'; @@ -28,7 +28,7 @@ export class TagEditDialogComponent extends EditDialogComponent { getForm(): FormGroup { return new FormGroup({ name: new FormControl(''), - colour: new FormControl(''), + color: new FormControl(''), is_inbox_tag: new FormControl(false), matching_algorithm: new FormControl(1), match: new FormControl(""), @@ -36,12 +36,4 @@ export class TagEditDialogComponent extends EditDialogComponent { }) } - getColours() { - return TAG_COLOURS - } - - getColor(id) { - return TAG_COLOURS.find(c => c.id == id) - } - } diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.html b/src-ui/src/app/components/manage/tag-list/tag-list.component.html index 62ecbcb90..bb4acdd7b 100644 --- a/src-ui/src/app/components/manage/tag-list/tag-list.component.html +++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.html @@ -26,8 +26,8 @@ {{ tag.name }} - {{ getColor(tag.colour).name }} + {{tag.color}} {{ getMatching(tag) }} {{ tag.document_count }} diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts index ac468c46b..7ea379f64 100644 --- a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts +++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { FILTER_HAS_TAG } from 'src/app/data/filter-rule-type'; -import { TAG_COLOURS, PaperlessTag } from 'src/app/data/paperless-tag'; +import { PaperlessTag } from 'src/app/data/paperless-tag'; import { DocumentListViewService } from 'src/app/services/document-list-view.service'; import { TagService } from 'src/app/services/rest/tag.service'; import { ToastService } from 'src/app/services/toast.service'; @@ -22,14 +22,6 @@ export class TagListComponent extends GenericListComponent { super(tagService, modalService, TagEditDialogComponent, toastService) } - getColor(id) { - var color = TAG_COLOURS.find(c => c.id == id) - if (color) { - return color - } - return { id: id, name: id, textColor: "#ffffff" } - } - getDeleteMessage(object: PaperlessTag) { return $localize`Do you really want to delete the tag "${object.name}"?` } diff --git a/src-ui/src/app/data/paperless-tag.ts b/src-ui/src/app/data/paperless-tag.ts index 1518caa1f..a999666c4 100644 --- a/src-ui/src/app/data/paperless-tag.ts +++ b/src-ui/src/app/data/paperless-tag.ts @@ -1,27 +1,10 @@ -import { MatchingModel } from './matching-model'; -import { ObjectWithId } from './object-with-id'; - - -export const TAG_COLOURS = [ - { id: "", name: "Auto", textColor: "#000000" }, - { id: "#a6cee3", name: $localize`Light blue`, textColor: "#000000" }, - { id: "#1f78b4", name: $localize`Blue`, textColor: "#ffffff" }, - { id: "#b2df8a", name: $localize`Light green`, textColor: "#000000" }, - { id: "#33a02c", name: $localize`Green`, textColor: "#ffffff" }, - { id: "#fb9a99", name: $localize`Light red`, textColor: "#000000" }, - { id: "#e31a1c", name: $localize`Red `, textColor: "#ffffff" }, - { id: "#fdbf6f", name: $localize`Light orange`, textColor: "#000000" }, - { id: "#ff7f00", name: $localize`Orange`, textColor: "#000000" }, - { id: "#cab2d6", name: $localize`Light violet`, textColor: "#000000" }, - { id: "#6a3d9a", name: $localize`Violet`, textColor: "#ffffff" }, - { id: "#b15928", name: $localize`Brown`, textColor: "#ffffff" }, - { id: "#000000", name: $localize`Black`, textColor: "#ffffff" }, - { id: "#cccccc", name: $localize`Light grey`, textColor: "#000000" } -] +import { MatchingModel } from "./matching-model"; export interface PaperlessTag extends MatchingModel { - colour?: string + color?: string + + text_color?: string is_inbox_tag?: boolean diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts index 50cf6d954..2d07ac31c 100644 --- a/src-ui/src/environments/environment.prod.ts +++ b/src-ui/src/environments/environment.prod.ts @@ -1,7 +1,7 @@ export const environment = { production: true, apiBaseUrl: "/api/", - apiVersion: "1", + apiVersion: "2", appTitle: "Paperless-ng", version: "1.2.1", webSocketHost: window.location.host, diff --git a/src-ui/src/environments/environment.ts b/src-ui/src/environments/environment.ts index b0ac843d5..3d981b677 100644 --- a/src-ui/src/environments/environment.ts +++ b/src-ui/src/environments/environment.ts @@ -5,7 +5,7 @@ export const environment = { production: false, apiBaseUrl: "http://localhost:8000/api/", - apiVersion: "1", + apiVersion: "2", appTitle: "Paperless-ng", version: "DEVELOPMENT", webSocketHost: "localhost:8000", From 247edc89f077227b92d06edbca3dcd4bb0d757a8 Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Thu, 25 Feb 2021 16:04:45 +0100 Subject: [PATCH 08/20] fix default api version --- src/paperless/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/paperless/settings.py b/src/paperless/settings.py index 48712954c..3dcff4a89 100644 --- a/src/paperless/settings.py +++ b/src/paperless/settings.py @@ -114,7 +114,7 @@ REST_FRAMEWORK = { 'rest_framework.authentication.TokenAuthentication' ], 'DEFAULT_VERSIONING_CLASS': 'rest_framework.versioning.AcceptHeaderVersioning', - 'DEFAULT_VERSION': 'v1', + 'DEFAULT_VERSION': '1', 'ALLOWED_VERSIONS': ['1', '2'] } From 604da64f5227cb1cd0eabd9a596c0bdc6744d40b Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Thu, 25 Feb 2021 16:22:50 +0100 Subject: [PATCH 09/20] fixed a regression in the date pipe --- src-ui/src/app/pipes/custom-date.pipe.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src-ui/src/app/pipes/custom-date.pipe.ts b/src-ui/src/app/pipes/custom-date.pipe.ts index cf5a931cb..6587c157a 100644 --- a/src-ui/src/app/pipes/custom-date.pipe.ts +++ b/src-ui/src/app/pipes/custom-date.pipe.ts @@ -13,17 +13,20 @@ const FORMAT_TO_ISO_FORMAT = { }) export class CustomDatePipe extends DatePipe implements PipeTransform { + private defaultLocale: string + constructor(@Inject(LOCALE_ID) locale: string, private settings: SettingsService) { super(locale) + this.defaultLocale = locale } transform(value: any, format?: string, timezone?: string, locale?: string): string | null { - let l = locale || this.settings.get(SETTINGS_KEYS.DATE_LOCALE) + let l = locale || this.settings.get(SETTINGS_KEYS.DATE_LOCALE) || this.defaultLocale let f = format || this.settings.get(SETTINGS_KEYS.DATE_FORMAT) if (l == "iso-8601") { return super.transform(value, FORMAT_TO_ISO_FORMAT[f], timezone) } else { - return super.transform(value, format || this.settings.get(SETTINGS_KEYS.DATE_FORMAT), timezone, locale) + return super.transform(value, format || this.settings.get(SETTINGS_KEYS.DATE_FORMAT), timezone, l) } } From 816a4c18875491f8ba47c2e25c5619ba57d9f04f Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Thu, 25 Feb 2021 16:24:24 +0100 Subject: [PATCH 10/20] fix an issue with the pt-br translation --- src-ui/src/locale/messages.pt_BR.xlf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-ui/src/locale/messages.pt_BR.xlf b/src-ui/src/locale/messages.pt_BR.xlf index ff438073d..fe574c7bc 100644 --- a/src-ui/src/locale/messages.pt_BR.xlf +++ b/src-ui/src/locale/messages.pt_BR.xlf @@ -1729,7 +1729,7 @@ {VAR_PLURAL, plural, =1 {One more document} other { more documents}} - {VAR_PLURAL, plural, =1 {Mais um documento} other {Mais documentos} + {VAR_PLURAL, plural, =1 {Mais um documento} other {Mais documentos}} src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html 25 From cc2b836646fb6a111bce58ffa569829aa1e147a0 Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Thu, 25 Feb 2021 16:29:49 +0100 Subject: [PATCH 11/20] fix date input error display --- .../app/components/common/input/date/date.component.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src-ui/src/app/components/common/input/date/date.component.html b/src-ui/src/app/components/common/input/date/date.component.html index ca9ccc040..19f606a16 100644 --- a/src-ui/src/app/components/common/input/date/date.component.html +++ b/src-ui/src/app/components/common/input/date/date.component.html @@ -1,7 +1,7 @@
-
- +
-
Invalid date.
+
Invalid date.
+ {{hint}}
From 463696e6a8c66af421296c1b3fd9ec0581890eda Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Thu, 25 Feb 2021 16:42:06 +0100 Subject: [PATCH 12/20] changelog --- docs/changelog.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 137fa2fd2..73e457176 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -8,7 +8,7 @@ Changelog paperless-ng 1.2.1 ################## -* `Rodrigo Avelino `_ translated Paperless into Portuguese (Brazil). +* `Rodrigo Avelino `_ translated Paperless into Portuguese (Brazil)! * The date input fields now respect the currently selected date format. @@ -16,6 +16,8 @@ paperless-ng 1.2.1 * When using regular expression matching, the regular expression is now validated before saving the tag/correspondent/type. +* Regression fix: Dates on the front end did not respect date locale settings in some cases. + paperless-ng 1.2.0 ################## From 7b1145c75e661699004611895944703cce471159 Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Thu, 25 Feb 2021 22:16:31 +0100 Subject: [PATCH 13/20] bugfixes --- src/documents/migrations/1013_migrate_tag_colour.py | 2 +- src/documents/models.py | 4 +++- src/documents/serialisers.py | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/documents/migrations/1013_migrate_tag_colour.py b/src/documents/migrations/1013_migrate_tag_colour.py index 0c1189074..323ff2bfb 100644 --- a/src/documents/migrations/1013_migrate_tag_colour.py +++ b/src/documents/migrations/1013_migrate_tag_colour.py @@ -60,7 +60,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='tag', name='color', - field=models.CharField(blank=True, max_length=7, verbose_name='color'), + field=models.CharField(default='#a6cee3', max_length=7, verbose_name='color'), ), migrations.RunPython(forward, reverse), migrations.RemoveField( diff --git a/src/documents/models.py b/src/documents/models.py index abbcc124e..3d81efea4 100755 --- a/src/documents/models.py +++ b/src/documents/models.py @@ -79,7 +79,9 @@ class Tag(MatchingModel): color = models.CharField( _("color"), - blank=True, max_length=7) + max_length=7, + default="#a6cee3" + ) is_inbox_tag = models.BooleanField( _("is inbox tag"), diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index 689e2fe8d..675bb464a 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -111,7 +111,7 @@ class ColorField(serializers.Field): for id, color in self.COLOURS: if id == data: return color - return "#a6cee3" + raise serializers.ValidationError() def to_representation(self, value): for id, color in self.COLOURS: @@ -122,7 +122,7 @@ class ColorField(serializers.Field): class TagSerializerVersion1(MatchingModelSerializer): - colour = ColorField(source='color') + colour = ColorField(source='color', default="#a6cee3") class Meta: model = Tag @@ -142,7 +142,7 @@ class TagSerializerVersion1(MatchingModelSerializer): class TagSerializer(MatchingModelSerializer): def get_text_color(self, obj): - if obj.color: + try: h = obj.color.lstrip('#') rgb = tuple(int(h[i:i + 2], 16)/256 for i in (0, 2, 4)) luminance = math.sqrt( @@ -151,7 +151,7 @@ class TagSerializer(MatchingModelSerializer): 0.114 * math.pow(rgb[2], 2) ) return "#ffffff" if luminance < 0.5 else "#000000" - else: + except ValueError: return "#000000" text_color = serializers.SerializerMethodField() From ba478c6cbb1b2e216de3b2396b7561148000eed4 Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Thu, 25 Feb 2021 22:17:18 +0100 Subject: [PATCH 14/20] tests --- src/documents/tests/test_api.py | 63 +++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py index cbd10ac71..9a4788135 100644 --- a/src/documents/tests/test_api.py +++ b/src/documents/tests/test_api.py @@ -807,6 +807,69 @@ class TestDocumentApi(DirectoriesMixin, APITestCase): }, format='json') self.assertEqual(response.status_code, 201, endpoint) + def test_tag_color_default(self): + response = self.client.post("/api/tags/", { + "name": "tag" + }, format="json") + self.assertEqual(response.status_code, 201) + self.assertEqual(Tag.objects.get(id=response.data['id']).color, "#a6cee3") + self.assertEqual(self.client.get(f"/api/tags/{response.data['id']}/", format="json").data['colour'], 1) + + def test_tag_color(self): + response = self.client.post("/api/tags/", { + "name": "tag", + "colour": 3 + }, format="json") + self.assertEqual(response.status_code, 201) + self.assertEqual(Tag.objects.get(id=response.data['id']).color, "#b2df8a") + self.assertEqual(self.client.get(f"/api/tags/{response.data['id']}/", format="json").data['colour'], 3) + + def test_tag_color_invalid(self): + response = self.client.post("/api/tags/", { + "name": "tag", + "colour": 34 + }, format="json") + self.assertEqual(response.status_code, 400) + + def test_tag_color_custom(self): + tag = Tag.objects.create(name="test", color="#abcdef") + self.assertEqual(self.client.get(f"/api/tags/{tag.id}/", format="json").data['colour'], 1) + + +class TestDocumentApiV2(DirectoriesMixin, APITestCase): + + def setUp(self): + super(TestDocumentApiV2, self).setUp() + + self.user = User.objects.create_superuser(username="temp_admin") + + self.client.force_login(user=self.user) + self.client.defaults['HTTP_ACCEPT'] = 'application/json; version=2' + + def test_tag_validate_color(self): + self.assertEqual(self.client.post("/api/tags/", {"name": "test", "color": "#12fFaA"}, format="json").status_code, 201) + + self.assertEqual(self.client.post("/api/tags/", {"name": "test1", "color": "abcdef"}, format="json").status_code, 400) + self.assertEqual(self.client.post("/api/tags/", {"name": "test2", "color": "#abcdfg"}, format="json").status_code, 400) + self.assertEqual(self.client.post("/api/tags/", {"name": "test3", "color": "#asd"}, format="json").status_code, 400) + self.assertEqual(self.client.post("/api/tags/", {"name": "test4", "color": "#12121212"}, format="json").status_code, 400) + + def test_tag_text_color(self): + t = Tag.objects.create(name="tag1", color="#000000") + self.assertEqual(self.client.get(f"/api/tags/{t.id}/", format="json").data['text_color'], "#ffffff") + + t.color = "#ffffff" + t.save() + self.assertEqual(self.client.get(f"/api/tags/{t.id}/", format="json").data['text_color'], "#000000") + + t.color = "asdf" + t.save() + self.assertEqual(self.client.get(f"/api/tags/{t.id}/", format="json").data['text_color'], "#000000") + + t.color = "123" + t.save() + self.assertEqual(self.client.get(f"/api/tags/{t.id}/", format="json").data['text_color'], "#000000") + class TestBulkEdit(DirectoriesMixin, APITestCase): From 66fe821b049857bfa2e6f04667fe69a992e7c67c Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Thu, 25 Feb 2021 22:43:45 +0100 Subject: [PATCH 15/20] color picker fixes, random default color --- .../common/input/color/color.component.html | 14 +++++++------- .../common/input/color/color.component.ts | 5 ++++- .../tag-edit-dialog/tag-edit-dialog.component.ts | 3 ++- src-ui/src/app/utils/color.ts | 12 ++++++++++++ 4 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 src-ui/src/app/utils/color.ts diff --git a/src-ui/src/app/components/common/input/color/color.component.html b/src-ui/src/app/components/common/input/color/color.component.html index c39c41d8f..ca4a0e281 100644 --- a/src-ui/src/app/components/common/input/color/color.component.html +++ b/src-ui/src/app/components/common/input/color/color.component.html @@ -1,14 +1,14 @@
-
+
   
- +
@@ -24,10 +24,10 @@
- {{hint}} -
- {{error}} -
-
+
+ {{hint}} +
+ {{error}} +
\ No newline at end of file diff --git a/src-ui/src/app/components/common/input/color/color.component.ts b/src-ui/src/app/components/common/input/color/color.component.ts index e75bbee16..a7f3452f2 100644 --- a/src-ui/src/app/components/common/input/color/color.component.ts +++ b/src-ui/src/app/components/common/input/color/color.component.ts @@ -1,5 +1,6 @@ import { Component, forwardRef } from '@angular/core'; import { NG_VALUE_ACCESSOR } from '@angular/forms'; +import { randomColor } from 'src/app/utils/color'; import { AbstractInputComponent } from '../abstract-input'; @Component({ @@ -19,9 +20,11 @@ export class ColorComponent extends AbstractInputComponent { } randomize() { + this.colorChanged(randomColor()) } colorChanged(value) { - this.value = value.color.hex + this.value = value + this.onChange(value) } } diff --git a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts index 53cd50c45..623b033ec 100644 --- a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts +++ b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts @@ -5,6 +5,7 @@ import { EditDialogComponent } from 'src/app/components/common/edit-dialog/edit- import { PaperlessTag } from 'src/app/data/paperless-tag'; import { TagService } from 'src/app/services/rest/tag.service'; import { ToastService } from 'src/app/services/toast.service'; +import { randomColor } from 'src/app/utils/color'; @Component({ selector: 'app-tag-edit-dialog', @@ -28,7 +29,7 @@ export class TagEditDialogComponent extends EditDialogComponent { getForm(): FormGroup { return new FormGroup({ name: new FormControl(''), - color: new FormControl(''), + color: new FormControl(randomColor()), is_inbox_tag: new FormControl(false), matching_algorithm: new FormControl(1), match: new FormControl(""), diff --git a/src-ui/src/app/utils/color.ts b/src-ui/src/app/utils/color.ts new file mode 100644 index 000000000..bcfdef088 --- /dev/null +++ b/src-ui/src/app/utils/color.ts @@ -0,0 +1,12 @@ + + function componentToHex(c) { + var hex = c.toString(16); + return hex.length == 1 ? "0" + hex : hex; + } + + export function randomColor() { + let r = Math.floor(Math.random() * 150) + 50 + let g = Math.floor(Math.random() * 150) + 50 + let b = Math.floor(Math.random() * 150) + 50 + return `#${componentToHex(r)}${componentToHex(g)}${componentToHex(b)}` + } \ No newline at end of file From 3a75b2571a1286770f2a153f494732cec51ce54e Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Thu, 25 Feb 2021 22:49:38 +0100 Subject: [PATCH 16/20] increase luminance threshold for better readability --- src/documents/serialisers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index 675bb464a..6ebf4c541 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -150,7 +150,7 @@ class TagSerializer(MatchingModelSerializer): 0.587 * math.pow(rgb[1], 2) + 0.114 * math.pow(rgb[2], 2) ) - return "#ffffff" if luminance < 0.5 else "#000000" + return "#ffffff" if luminance < 0.53 else "#000000" except ValueError: return "#000000" From 2fb286cd43ad754ff089de4cbf2bf8904eb28988 Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Thu, 25 Feb 2021 22:49:47 +0100 Subject: [PATCH 17/20] shadows --- .../src/app/components/common/input/color/color.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-ui/src/app/components/common/input/color/color.component.html b/src-ui/src/app/components/common/input/color/color.component.html index ca4a0e281..778a3684e 100644 --- a/src-ui/src/app/components/common/input/color/color.component.html +++ b/src-ui/src/app/components/common/input/color/color.component.html @@ -13,7 +13,7 @@ - +