From 2838e952a14f130aabfaa6b578c752d8f5966aff Mon Sep 17 00:00:00 2001
From: Sergei Ogorelkov <sergei.ogorelkov@xored.com>
Date: Wed, 6 Jul 2022 17:13:22 +0700
Subject: [PATCH] Update issue status colors (#2218)

Signed-off-by: Sergei Ogorelkov <sergei.ogorelkov@xored.com>
---
 models/tracker/src/index.ts                         | 10 +++++-----
 packages/ui/src/colors.ts                           | 13 ++++++++++++-
 .../src/components/workflow/StatusEditor.svelte     |  1 -
 .../src/components/workflow/Statuses.svelte         |  2 +-
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/models/tracker/src/index.ts b/models/tracker/src/index.ts
index 031051bb47..9d2c632028 100644
--- a/models/tracker/src/index.ts
+++ b/models/tracker/src/index.ts
@@ -341,7 +341,7 @@ export function createModel (builder: Builder): void {
     {
       label: tracker.string.CategoryBacklog,
       icon: tracker.icon.CategoryBacklog,
-      color: 0,
+      color: 12,
       defaultStatusName: 'Backlog',
       order: 0
     },
@@ -354,7 +354,7 @@ export function createModel (builder: Builder): void {
     {
       label: tracker.string.CategoryUnstarted,
       icon: tracker.icon.CategoryUnstarted,
-      color: 1,
+      color: 13,
       defaultStatusName: 'Todo',
       order: 1
     },
@@ -367,7 +367,7 @@ export function createModel (builder: Builder): void {
     {
       label: tracker.string.CategoryStarted,
       icon: tracker.icon.CategoryStarted,
-      color: 2,
+      color: 14,
       defaultStatusName: 'In Progress',
       order: 2
     },
@@ -380,7 +380,7 @@ export function createModel (builder: Builder): void {
     {
       label: tracker.string.CategoryCompleted,
       icon: tracker.icon.CategoryCompleted,
-      color: 3,
+      color: 15,
       defaultStatusName: 'Done',
       order: 3
     },
@@ -393,7 +393,7 @@ export function createModel (builder: Builder): void {
     {
       label: tracker.string.CategoryCanceled,
       icon: tracker.icon.CategoryCanceled,
-      color: 4,
+      color: 16,
       defaultStatusName: 'Canceled',
       order: 4
     },
diff --git a/packages/ui/src/colors.ts b/packages/ui/src/colors.ts
index 0a09c5041d..d755b85b8b 100644
--- a/packages/ui/src/colors.ts
+++ b/packages/ui/src/colors.ts
@@ -14,6 +14,12 @@ export const SeaBuckthornColor = '#F2994A' // orange (warning)
 export const FlamingoColor = '#EB5757' // red (error)
 export const LinkWaterColor = '#C9CBCD'
 
+export const SilverSandColor = '#BEC2C8'
+export const PlatinumColor = '#E2E2E2'
+export const CrayolaColor = '#F2C94C'
+export const SlateBlueColor = '#5E6AD2'
+export const CadetGreyColor = '#95A2B3'
+
 const blackColors = Object.freeze([
   FeijoaColor,
   DeYorkColor,
@@ -26,7 +32,12 @@ const blackColors = Object.freeze([
   EastSideColor,
   MoodyBlueColor,
   ChetwodeBlueColor,
-  SalmonColor
+  SalmonColor,
+  SilverSandColor,
+  PlatinumColor,
+  CrayolaColor,
+  SlateBlueColor,
+  CadetGreyColor
 ])
 
 /**
diff --git a/plugins/tracker-resources/src/components/workflow/StatusEditor.svelte b/plugins/tracker-resources/src/components/workflow/StatusEditor.svelte
index 27bdd5e292..c78827fdc3 100644
--- a/plugins/tracker-resources/src/components/workflow/StatusEditor.svelte
+++ b/plugins/tracker-resources/src/components/workflow/StatusEditor.svelte
@@ -104,7 +104,6 @@
     .dot {
       position: absolute;
       content: '';
-      background: red;
       border-radius: 50%;
       inset: 30%;
     }
diff --git a/plugins/tracker-resources/src/components/workflow/Statuses.svelte b/plugins/tracker-resources/src/components/workflow/Statuses.svelte
index 50c8e7be06..6f965b6a87 100644
--- a/plugins/tracker-resources/src/components/workflow/Statuses.svelte
+++ b/plugins/tracker-resources/src/components/workflow/Statuses.svelte
@@ -292,7 +292,7 @@
                     on:default-update={({ detail }) => updateTeamDefaultStatus(detail)}
                     on:edit={({ detail }) => {
                       closeTooltip()
-                      editingStatus = { ...detail }
+                      editingStatus = { ...detail, color: detail.color ?? category.color }
                     }}
                     on:delete={deleteStatus}
                   />