From fbf351103f7a0b67e2d2c1f21c8fad44462765b3 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <marien.fressinaud@probesys.com>
Date: Wed, 31 Jul 2024 16:14:47 +0200
Subject: [PATCH 1/3] Allow to select a color for a label

---
 src/Entity/Label.php                      | 11 +++---
 src/Form/Type/LabelType.php               |  7 ++--
 src/Misc/AdditionalTranslations.php       |  8 ++++
 templates/labels/_form.html.twig          | 26 +++++++++++++
 tests/Controller/LabelsControllerTest.php | 45 ++++++++++++++++++-----
 tests/Factory/LabelFactory.php            |  1 -
 translations/errors+intl-icu.en_GB.yaml   |  3 +-
 translations/errors+intl-icu.fr_FR.yaml   |  3 +-
 translations/messages+intl-icu.en_GB.yaml |  7 ++++
 translations/messages+intl-icu.fr_FR.yaml |  7 ++++
 10 files changed, 95 insertions(+), 23 deletions(-)

diff --git a/src/Entity/Label.php b/src/Entity/Label.php
index 22a4c672..60fa8d4d 100644
--- a/src/Entity/Label.php
+++ b/src/Entity/Label.php
@@ -29,6 +29,8 @@ class Label implements MonitorableEntityInterface, UidEntityInterface
     use MonitorableEntityTrait;
     use UidEntityTrait;
 
+    public const COLORS = ['grey', 'primary', 'blue', 'green', 'orange', 'red'];
+
     #[ORM\Id]
     #[ORM\GeneratedValue]
     #[ORM\Column]
@@ -67,11 +69,8 @@ class Label implements MonitorableEntityInterface, UidEntityInterface
     private ?string $description = null;
 
     #[ORM\Column(length: 7)]
-    #[Assert\NotBlank(
-        message: new TranslatableMessage('label.color.required', [], 'errors'),
-    )]
-    #[Assert\CssColor(
-        formats: Assert\CssColor::HEX_LONG,
+    #[Assert\Choice(
+        choices: self::COLORS,
         message: new TranslatableMessage('label.color.invalid', [], 'errors'),
     )]
     private ?string $color = null;
@@ -84,7 +83,7 @@ public function __construct()
     {
         $this->name = '';
         $this->description = '';
-        $this->color = '#e0e1e6';
+        $this->color = 'grey';
         $this->tickets = new ArrayCollection();
     }
 
diff --git a/src/Form/Type/LabelType.php b/src/Form/Type/LabelType.php
index f9d7c1b2..85c65854 100644
--- a/src/Form/Type/LabelType.php
+++ b/src/Form/Type/LabelType.php
@@ -26,9 +26,10 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             'trim' => true,
         ]);
 
-        $builder->add('color', Type\HiddenType::class, [
-            'data' => '#e0e1e6',
-            'trim' => true,
+        $builder->add('color', Type\ChoiceType::class, [
+            'choices' => Entity\Label::COLORS,
+            'expanded' => true,
+            'multiple' => false,
         ]);
     }
 
diff --git a/src/Misc/AdditionalTranslations.php b/src/Misc/AdditionalTranslations.php
index f89fb4de..f9dd2d23 100644
--- a/src/Misc/AdditionalTranslations.php
+++ b/src/Misc/AdditionalTranslations.php
@@ -40,3 +40,11 @@
 new TranslatableMessage('roles.permissions.orga.update.tickets.status');
 new TranslatableMessage('roles.permissions.orga.update.tickets.title');
 new TranslatableMessage('roles.permissions.orga.update.tickets.type');
+
+// See templates/labels/_form.html.twig
+new TranslatableMessage('common.colors.grey');
+new TranslatableMessage('common.colors.primary');
+new TranslatableMessage('common.colors.blue');
+new TranslatableMessage('common.colors.green');
+new TranslatableMessage('common.colors.orange');
+new TranslatableMessage('common.colors.red');
diff --git a/templates/labels/_form.html.twig b/templates/labels/_form.html.twig
index 70b7c8d6..a674abc1 100644
--- a/templates/labels/_form.html.twig
+++ b/templates/labels/_form.html.twig
@@ -58,6 +58,32 @@
         />
     </div>
 
+    <fieldset>
+        <legend>{{ 'labels.color' | trans }}</legend>
+
+        <div class="flow flow--small">
+            {{ form_errors(form.color) }}
+
+            <div class="flow flow--inline flow--smaller">
+                {% for color in form.color %}
+                    <span>
+                        <input
+                            type="radio"
+                            id="{{ field_id(color) }}"
+                            name="{{ field_name(color) }}"
+                            value="{{ field_value(color) }}"
+                            {{ field_value(color) == field_value(form.color) ? 'checked' }}
+                        />
+
+                        <label for="{{ field_id(color) }}" class="badge badge--big badge--{{ field_value(color) }}">
+                            {{ ("common.colors." ~ field_value(color)) | trans }}
+                        </label>
+                    </span>
+                {% endfor %}
+            </div>
+        </div>
+    </div>
+
     <div class="form__actions">
         <button class="button--primary" type="submit">
             {{ submit_label }}
diff --git a/tests/Controller/LabelsControllerTest.php b/tests/Controller/LabelsControllerTest.php
index a831be31..22778dfc 100644
--- a/tests/Controller/LabelsControllerTest.php
+++ b/tests/Controller/LabelsControllerTest.php
@@ -92,6 +92,7 @@ public function testPostCreateCreatesTheLabelAndRedirects(): void
         $this->grantAdmin($user->_real(), ['admin:manage:labels']);
         $name = 'My label';
         $description = 'My description';
+        $color = 'primary';
 
         $this->assertSame(0, LabelFactory::count());
 
@@ -100,7 +101,7 @@ public function testPostCreateCreatesTheLabelAndRedirects(): void
                 '_token' => $this->generateCsrfToken($client, 'label'),
                 'name' => $name,
                 'description' => $description,
-                'color' => '#e0e1e6',
+                'color' => $color,
             ],
         ]);
 
@@ -109,6 +110,7 @@ public function testPostCreateCreatesTheLabelAndRedirects(): void
         $this->assertResponseRedirects('/labels', 302);
         $this->assertSame($name, $label->getName());
         $this->assertSame($description, $label->getDescription());
+        $this->assertSame($color, $label->getColor());
         $this->assertSame(20, strlen($label->getUid()));
     }
 
@@ -127,7 +129,7 @@ public function testPostCreateFailsIfNameIsAlreadyUsed(): void
             'label' => [
                 '_token' => $this->generateCsrfToken($client, 'label'),
                 'name' => $name,
-                'color' => '#e0e1e6',
+                'color' => 'grey',
             ],
         ]);
 
@@ -150,7 +152,7 @@ public function testPostCreateFailsIfNameIsEmpty(): void
             'label' => [
                 '_token' => $this->generateCsrfToken($client, 'label'),
                 'name' => $name,
-                'color' => '#e0e1e6',
+                'color' => 'grey',
             ],
         ]);
 
@@ -158,6 +160,27 @@ public function testPostCreateFailsIfNameIsEmpty(): void
         $this->assertSame(0, LabelFactory::count());
     }
 
+    public function testPostCreateFailsIfColorIsInvalid(): void
+    {
+        $client = static::createClient();
+        $user = UserFactory::createOne();
+        $client->loginUser($user->_real());
+        $this->grantAdmin($user->_real(), ['admin:manage:labels']);
+        $name = 'My label';
+        $color = 'not a color';
+
+        $crawler = $client->request(Request::METHOD_POST, '/labels/new', [
+            'label' => [
+                '_token' => $this->generateCsrfToken($client, 'label'),
+                'name' => $name,
+                'color' => $color,
+            ],
+        ]);
+
+        $this->assertSelectorTextContains('#label_color-error', 'The selected choice is invalid');
+        $this->assertSame(0, LabelFactory::count());
+    }
+
     public function testPostCreateFailsIfCsrfTokenIsInvalid(): void
     {
         $client = static::createClient();
@@ -170,7 +193,7 @@ public function testPostCreateFailsIfCsrfTokenIsInvalid(): void
             'label' => [
                 '_token' => 'not a token',
                 'name' => $name,
-                'color' => '#e0e1e6',
+                'color' => 'grey',
             ],
         ]);
 
@@ -192,7 +215,7 @@ public function testPostCreateFailsIfAccessIsForbidden(): void
             'label' => [
                 '_token' => $this->generateCsrfToken($client, 'label'),
                 'name' => $name,
-                'color' => '#e0e1e6',
+                'color' => 'grey',
             ],
         ]);
     }
@@ -234,9 +257,12 @@ public function testPostUpdateSavesTheLabelAndRedirects(): void
         $newName = 'My label';
         $initialDescription = 'description';
         $newDescription = 'My description';
+        $initialColor = 'primary';
+        $newColor = 'red';
         $label = LabelFactory::createOne([
             'name' => $initialName,
             'description' => $initialDescription,
+            'color' => $initialColor,
         ]);
 
         $client->request(Request::METHOD_POST, "/labels/{$label->getUid()}/edit", [
@@ -244,7 +270,7 @@ public function testPostUpdateSavesTheLabelAndRedirects(): void
                 '_token' => $this->generateCsrfToken($client, 'label'),
                 'name' => $newName,
                 'description' => $newDescription,
-                'color' => '#e0e1e6',
+                'color' => $newColor,
             ],
         ]);
 
@@ -252,6 +278,7 @@ public function testPostUpdateSavesTheLabelAndRedirects(): void
         $label->_refresh();
         $this->assertSame($newName, $label->getName());
         $this->assertSame($newDescription, $label->getDescription());
+        $this->assertSame($newColor, $label->getColor());
     }
 
     public function testPostUpdateFailsIfNameIsAlreadyUsed(): void
@@ -273,7 +300,7 @@ public function testPostUpdateFailsIfNameIsAlreadyUsed(): void
             'label' => [
                 '_token' => $this->generateCsrfToken($client, 'label'),
                 'name' => $newName,
-                'color' => '#e0e1e6',
+                'color' => 'grey',
             ],
         ]);
 
@@ -302,7 +329,7 @@ public function testPostUpdateFailsIfCsrfTokenIsInvalid(): void
             'label' => [
                 '_token' => 'not a token',
                 'name' => $newName,
-                'color' => '#e0e1e6',
+                'color' => 'grey',
             ],
         ]);
 
@@ -330,7 +357,7 @@ public function testPostUpdateFailsIfAccessIsForbidden(): void
             'label' => [
                 '_token' => $this->generateCsrfToken($client, 'label'),
                 'name' => $newName,
-                'color' => '#e0e1e6',
+                'color' => 'grey',
             ],
         ]);
     }
diff --git a/tests/Factory/LabelFactory.php b/tests/Factory/LabelFactory.php
index 947a5c91..ae3f0e39 100644
--- a/tests/Factory/LabelFactory.php
+++ b/tests/Factory/LabelFactory.php
@@ -21,7 +21,6 @@ protected function defaults(): array
     {
         return [
             'name' => self::faker()->words(3, true),
-            'color' => self::faker()->hexColor(),
         ];
     }
 
diff --git a/translations/errors+intl-icu.en_GB.yaml b/translations/errors+intl-icu.en_GB.yaml
index 3b758fb6..70e389ef 100644
--- a/translations/errors+intl-icu.en_GB.yaml
+++ b/translations/errors+intl-icu.en_GB.yaml
@@ -11,8 +11,7 @@ contract.name.max_chars: 'Enter a name of less than {limit} characters.'
 contract.name.required: 'Enter a name.'
 contract.start_at.required: 'Enter a start date.'
 csrf.invalid: 'The security token is invalid. Please try to resubmit the form.'
-label.color.invalid: 'Enter a valid hexadecimal color.'
-label.color.required: 'Enter a color.'
+label.color.invalid: 'Select a color from the list.'
 label.description.max_chars: 'Enter a description of less than {limit} characters.'
 label.name.already_used: 'Enter a different name, a label already has this name.'
 label.name.max_chars: 'Enter a name of less than {limit} characters.'
diff --git a/translations/errors+intl-icu.fr_FR.yaml b/translations/errors+intl-icu.fr_FR.yaml
index 83230023..1bdd7d8c 100644
--- a/translations/errors+intl-icu.fr_FR.yaml
+++ b/translations/errors+intl-icu.fr_FR.yaml
@@ -11,8 +11,7 @@ contract.name.max_chars: 'Saisissez un nom de moins de {limit} caractères.'
 contract.name.required: 'Saisissez un nom.'
 contract.start_at.required: 'Saisissez une date de début.'
 csrf.invalid: 'Le jeton de sécurité est invalide. Veuillez essayer de revalider le formulaire.'
-label.color.invalid: 'Saisissez une couleur hexadécimal valide.'
-label.color.required: 'Saisissez une couleur.'
+label.color.invalid: 'Sélectionnez une couleur de la liste.'
 label.description.max_chars: 'Saisissez une description de moins de {limit} caractères.'
 label.name.already_used: 'Saisissez un nom différent, une étiquette porte déjà ce même nom.'
 label.name.max_chars: 'Saisissez un nom de moins de {limit} caractères.'
diff --git a/translations/messages+intl-icu.en_GB.yaml b/translations/messages+intl-icu.en_GB.yaml
index a678d5c8..aab43d2d 100644
--- a/translations/messages+intl-icu.en_GB.yaml
+++ b/translations/messages+intl-icu.en_GB.yaml
@@ -67,6 +67,12 @@ authorizations.revoke.confirm: 'Are you sure that you want to revoke this author
 authorizations.revoke.disabled: 'You can’t revoke this authorization.'
 common.actions: Actions
 common.caution: Caution!
+common.colors.blue: Blue
+common.colors.green: Green
+common.colors.grey: Grey
+common.colors.primary: Primary
+common.colors.orange: Orange
+common.colors.red: Red
 contracts.alerts.edit.date_alert.after: 'days before the end of the contract.'
 contracts.alerts.edit.date_alert.before: Alert
 contracts.alerts.edit.hours_alert.after: '% of the hours have been consumed.'
@@ -129,6 +135,7 @@ hours_formatter.hours_and_minutes.long: "{ hours, plural, one {1\_hour} other {#
 hours_formatter.hours_and_minutes.short: "{hours}\_h\_{minutes}\_m"
 hours_formatter.minutes.long: "{ minutes, plural, one {1\_minute} other {#\_minutes} }"
 hours_formatter.minutes.short: "{minutes}\_m"
+labels.color: Color
 labels.deletion.confirm: 'Are you sure that you want to delete this label?'
 labels.deletion.going_delete: 'You’re going to delete the “{label}” label. This label will be removed from the relevant tickets.'
 labels.deletion.submit: 'Delete the label'
diff --git a/translations/messages+intl-icu.fr_FR.yaml b/translations/messages+intl-icu.fr_FR.yaml
index b6b1c15b..2f85e83a 100644
--- a/translations/messages+intl-icu.fr_FR.yaml
+++ b/translations/messages+intl-icu.fr_FR.yaml
@@ -67,6 +67,12 @@ authorizations.revoke.confirm: "Êtes-vous sûr de vouloir révoquer cette autor
 authorizations.revoke.disabled: 'Vous ne pouvez pas révoquer cette autorisation.'
 common.actions: Actions
 common.caution: "Attention\_!"
+common.colors.blue: Bleu
+common.colors.green: Vert
+common.colors.grey: Gris
+common.colors.primary: Principale
+common.colors.orange: Orange
+common.colors.red: Rouge
 contracts.alerts.edit.date_alert.after: 'jours de la fin du contrat.'
 contracts.alerts.edit.date_alert.before: 'Alerter à'
 contracts.alerts.edit.hours_alert.after: '% des heures seront consommées.'
@@ -129,6 +135,7 @@ hours_formatter.hours_and_minutes.long: "{ hours, plural, one {1\_heure} other {
 hours_formatter.hours_and_minutes.short: "{hours}\_h\_{minutes}\_m"
 hours_formatter.minutes.long: "{ minutes, plural, one {1\_minute} other {#\_minutes} }"
 hours_formatter.minutes.short: "{minutes}\_m"
+labels.color: Couleur
 labels.deletion.confirm: "Êtes-vous sûr de vouloir supprimer cette étiquette\_?"
 labels.deletion.going_delete: "Vous êtes sur le point de supprimer l’étiquette «\_{label}\_». Cette étiquette sera enlevée des tickets correspondants."
 labels.deletion.submit: 'Supprimer l’étiquette'

From f0c38963d850915ec1b41deb662acf2b9299822f Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <marien.fressinaud@probesys.com>
Date: Wed, 31 Jul 2024 16:15:11 +0200
Subject: [PATCH 2/3] Display the labels' colors

---
 src/Form/Type/TicketLabelsType.php            | 17 ++++++---------
 .../TicketEventChangesFormatterExtension.php  |  6 ++++--
 templates/labels/index.html.twig              |  2 +-
 templates/organizations/tickets/new.html.twig | 21 +++++++++----------
 templates/tickets/_list.html.twig             |  2 +-
 templates/tickets/_search_form.html.twig      |  2 +-
 templates/tickets/labels/edit.html.twig       | 13 ++++++++++--
 templates/tickets/show.html.twig              |  2 +-
 8 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/src/Form/Type/TicketLabelsType.php b/src/Form/Type/TicketLabelsType.php
index e300fb2e..8ca98b11 100644
--- a/src/Form/Type/TicketLabelsType.php
+++ b/src/Form/Type/TicketLabelsType.php
@@ -24,17 +24,12 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 return $entityRepository->createQueryBuilder('l')
                                         ->orderBy('l.name', 'ASC');
             },
-            'choice_label' => function (Entity\Label $label): string {
-                $labelName = htmlspecialchars($label->getName(), \ENT_QUOTES | \ENT_SUBSTITUTE, 'UTF-8');
-                $labelDescription = htmlspecialchars($label->getDescription(), \ENT_QUOTES | \ENT_SUBSTITUTE, 'UTF-8');
-
-                $htmlLabel = "<span class=\"badge badge--grey\">{$labelName}</span>";
-
-                if ($labelDescription) {
-                    $htmlLabel .= "&nbsp;<span class=\"text--small text--secondary\">{$labelDescription}</span>";
-                }
-
-                return $htmlLabel;
+            'choice_label' => 'name',
+            'choice_attr' => function (Entity\Label $label): array {
+                return [
+                    'description' => $label->getDescription(),
+                    'color' => $label->getColor(),
+                ];
             },
             'expanded' => true,
             'multiple' => true,
diff --git a/src/Twig/TicketEventChangesFormatterExtension.php b/src/Twig/TicketEventChangesFormatterExtension.php
index 3f802f7c..10dc4422 100644
--- a/src/Twig/TicketEventChangesFormatterExtension.php
+++ b/src/Twig/TicketEventChangesFormatterExtension.php
@@ -362,13 +362,15 @@ private function formatLabelsChanges(Entity\User $user, array $changes): string
 
         $removed = array_map(function ($label): string {
             $name = $this->escape($label->getName());
-            return "<span class=\"badge badge--grey\">{$name}</span>";
+            $color = $this->escape($label->getColor());
+            return "<span class=\"badge badge--{$color}\">{$name}</span>";
         }, $removedLabels);
         $removed = implode(', ', $removed);
 
         $added = array_map(function ($label): string {
             $name = $this->escape($label->getName());
-            return "<span class=\"badge badge--grey\">{$name}</span>";
+            $color = $this->escape($label->getColor());
+            return "<span class=\"badge badge--{$color}\">{$name}</span>";
         }, $addedLabels);
         $added = implode(', ', $added);
 
diff --git a/templates/labels/index.html.twig b/templates/labels/index.html.twig
index def337fe..69107519 100644
--- a/templates/labels/index.html.twig
+++ b/templates/labels/index.html.twig
@@ -50,7 +50,7 @@
                 <ul class="list--padded list--border list--nostyle">
                     {% for label in labels %}
                         <li class="cols cols--baseline flow" data-test="label-item">
-                            <p class="badge badge--grey">
+                            <p class="badge badge--{{ label.color }}">
                                 {{ label.name }}
                             </p>
 
diff --git a/templates/organizations/tickets/new.html.twig b/templates/organizations/tickets/new.html.twig
index 73c07a0f..7c53c406 100644
--- a/templates/organizations/tickets/new.html.twig
+++ b/templates/organizations/tickets/new.html.twig
@@ -323,21 +323,20 @@
                                                     name="labels[]"
                                                     value="{{ label.uid }}"
                                                     {{ label.uid in labelUids ? 'checked' }}
+                                                    {% if label.description %}
+                                                        aria-describedby="label-{{ label.uid }}-description"
+                                                    {% endif %}
                                                 />
 
-                                                <label for="labels-{{ label.uid }}">
-                                                    <span>
-                                                        <span class="badge badge--grey">
-                                                            {{ label.name }}
-                                                        </span>
+                                                <label for="labels-{{ label.uid }}" class="badge badge--{{ label.color }}">
+                                                    {{ label.name }}
+                                                </label>
 
-                                                        {% if label.description %}
-                                                            <span class="text--small text--secondary">
-                                                                {{ label.description }}
-                                                            </span>
-                                                        {% endif %}
+                                                {% if label.description %}
+                                                    <span id="label-{{ label.uid }}-description" class="text--small text--secondary">
+                                                        {{ label.description }}
                                                     </span>
-                                                </label>
+                                                {% endif %}
                                             </div>
                                         {% endfor %}
                                     </div>
diff --git a/templates/tickets/_list.html.twig b/templates/tickets/_list.html.twig
index ea93dd98..8dc0334c 100644
--- a/templates/tickets/_list.html.twig
+++ b/templates/tickets/_list.html.twig
@@ -50,7 +50,7 @@
                     {% if ticket.labels %}
                         <ul class="list--nostyle flow flow--inline flow--smaller text--small">
                             {% for label in ticket.labels %}
-                                <li class="badge badge--grey">
+                                <li class="badge badge--{{ label.color }}">
                                     {{ label.name }}
                                 </li>
                             {% endfor %}
diff --git a/templates/tickets/_search_form.html.twig b/templates/tickets/_search_form.html.twig
index ba3db304..da29474c 100644
--- a/templates/tickets/_search_form.html.twig
+++ b/templates/tickets/_search_form.html.twig
@@ -224,7 +224,7 @@
                                     {{ label.name in ticketFilter.filter('label') ? 'checked' }}
                                 />
 
-                                <label for="filter-label-{{ label.uid }}">
+                                <label for="filter-label-{{ label.uid }}" class="badge badge--{{ label.color }}">
                                     {{ label.name }}
                                 </label>
                             </div>
diff --git a/templates/tickets/labels/edit.html.twig b/templates/tickets/labels/edit.html.twig
index a4476f91..b56c4037 100644
--- a/templates/tickets/labels/edit.html.twig
+++ b/templates/tickets/labels/edit.html.twig
@@ -27,11 +27,20 @@
                         name="{{ field_name(label) }}"
                         value="{{ field_value(label) }}"
                         {{ field_value(label) in field_value(form.labels) ? 'checked' }}
+                        {% if label.vars.attr.description %}
+                            aria-describedby="{{ field_id(label, 'description') }}"
+                        {% endif %}
                     />
 
-                    <label for="{{ field_id(label) }}">
-                        {{ field_label(label) | raw }}
+                    <label for="{{ field_id(label) }}" class="badge badge--{{ label.vars.attr.color }}">
+                        {{ field_label(label) }}
                     </label>
+
+                    {% if label.vars.attr.description %}
+                        <span id="{{ field_id(label, 'description') }}" class="text--small text--secondary">
+                            {{ label.vars.attr.description }}
+                        </span>
+                    {% endif %}
                 </div>
             {% endfor %}
         </div>
diff --git a/templates/tickets/show.html.twig b/templates/tickets/show.html.twig
index 8e2d1841..4cc0d24c 100644
--- a/templates/tickets/show.html.twig
+++ b/templates/tickets/show.html.twig
@@ -306,7 +306,7 @@
                         {% if ticket.labels is not empty %}
                             <ul class="list--nostyle flow flow--inline flow--smaller">
                                 {% for label in ticket.labels %}
-                                    <li class="badge badge--grey">
+                                    <li class="badge badge--{{ label.color }}">
                                         {{ label.name }}
                                     </li>
                                 {% endfor %}

From 5719594f556b0f9c6cf5c5314b9e42f9de4f7ae6 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <marien.fressinaud@probesys.com>
Date: Wed, 31 Jul 2024 16:30:13 +0200
Subject: [PATCH 3/3] Allow to import labels's colors

---
 docs/developers/import-data.md                  | 1 +
 src/Service/DataImporter/DataImporter.php       | 6 ++++++
 tests/Service/DataImporter/DataImporterTest.php | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/docs/developers/import-data.md b/docs/developers/import-data.md
index e4f4345f..bdb44d2e 100644
--- a/docs/developers/import-data.md
+++ b/docs/developers/import-data.md
@@ -80,6 +80,7 @@ The data is stored in a ZIP archive. It contains several files:
   - id: string (unique)
   - name: string (unique, not empty, max 50 chars)
   - description: string, optional (max 250 chars)
+  - color: string, optional (must be `grey`, `primary`, `blue`, `green`, `orange`, or `red`)
 
 It also contains a `tickets/` folder where each file corresponds to a ticket. For clarity reasons, the files can be put in sub-folders. Sub-folders have no meaning to the command, but can help to group tickets by organizations for instance. The name of the files doesn't matter, but they have to contain JSON objects:
 
diff --git a/src/Service/DataImporter/DataImporter.php b/src/Service/DataImporter/DataImporter.php
index a99b7930..8e24f7ae 100644
--- a/src/Service/DataImporter/DataImporter.php
+++ b/src/Service/DataImporter/DataImporter.php
@@ -747,10 +747,16 @@ private function processLabels(array $json): \Generator
                 $description = strval($jsonLabel['description']);
             }
 
+            $color = 'grey';
+            if (isset($jsonLabel['color'])) {
+                $color = strval($jsonLabel['color']);
+            }
+
             // Build the label
             $label = new Label();
             $label->setName($name);
             $label->setDescription($description);
+            $label->setColor($color);
 
             // Add the label to the index
             try {
diff --git a/tests/Service/DataImporter/DataImporterTest.php b/tests/Service/DataImporter/DataImporterTest.php
index 59a1f4b9..7d5ffb4f 100644
--- a/tests/Service/DataImporter/DataImporterTest.php
+++ b/tests/Service/DataImporter/DataImporterTest.php
@@ -756,6 +756,7 @@ public function testImportLabels(): void
                 'id' => '1',
                 'name' => 'My label',
                 'description' => 'My description',
+                'color' => 'primary',
             ],
         ];
 
@@ -767,6 +768,7 @@ public function testImportLabels(): void
         $label = LabelFactory::last();
         $this->assertSame('My label', $label->getName());
         $this->assertSame('My description', $label->getDescription());
+        $this->assertSame('primary', $label->getColor());
     }
 
     public function testImportLabelsKeepsExistingLabelsInDatabase(): void