From b1f2a417a4ed412c023756bf71f9d6d252df9d90 Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@users.noreply.github.com>
Date: Thu, 27 Apr 2023 19:52:04 +0700
Subject: [PATCH] TSK-1375: Sub issue selector icons (#3089)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 packages/ui/src/components/SelectPopup.svelte |  5 ++--
 .../issues/edit/SubIssuesSelector.svelte      | 28 +++++++------------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/packages/ui/src/components/SelectPopup.svelte b/packages/ui/src/components/SelectPopup.svelte
index cdc2f61d5b..06363695b9 100644
--- a/packages/ui/src/components/SelectPopup.svelte
+++ b/packages/ui/src/components/SelectPopup.svelte
@@ -27,7 +27,8 @@
 
   interface ValueType {
     id: number | string | null
-    icon?: Asset
+    icon?: Asset | AnySvelteComponent
+    iconProps?: Record<string, any>
     iconColor?: string
     label?: IntlString
     text?: string
@@ -167,7 +168,7 @@
               {:else}
                 {#if item.icon}
                   <div class="icon mr-2">
-                    <Icon icon={item.icon} fill={item.iconColor ?? 'currentColor'} {size} />
+                    <Icon icon={item.icon} iconProps={item.iconProps} fill={item.iconColor ?? 'currentColor'} {size} />
                   </div>
                 {/if}
                 <span class="label" class:text-base={huge}>
diff --git a/plugins/tracker-resources/src/components/issues/edit/SubIssuesSelector.svelte b/plugins/tracker-resources/src/components/issues/edit/SubIssuesSelector.svelte
index 1516b55273..aebcebb5d2 100644
--- a/plugins/tracker-resources/src/components/issues/edit/SubIssuesSelector.svelte
+++ b/plugins/tracker-resources/src/components/issues/edit/SubIssuesSelector.svelte
@@ -14,23 +14,22 @@
 -->
 <script lang="ts">
   import { Ref, SortingOrder, WithLookup } from '@hcengineering/core'
-  import { createQuery } from '@hcengineering/presentation'
-  import { Issue, IssueStatus, Project } from '@hcengineering/tracker'
+  import { createQuery, statusStore } from '@hcengineering/presentation'
+  import { Issue, Project } from '@hcengineering/tracker'
   import {
     Button,
     ButtonKind,
     ButtonSize,
-    closeTooltip,
-    getPlatformColor,
     ProgressCircle,
     SelectPopup,
+    closeTooltip,
     showPanel,
     showPopup
   } from '@hcengineering/ui'
   import { getIssueId } from '../../../issues'
   import tracker from '../../../plugin'
   import { subIssueListProvider } from '../../../utils'
-  import { statusStore } from '@hcengineering/presentation'
+  import IssueStatusIcon from '../IssueStatusIcon.svelte'
 
   export let value: WithLookup<Issue>
   export let currentProject: Project | undefined = undefined
@@ -85,17 +84,6 @@
   }
   $: hasSubIssues = (subIssues?.length ?? 0) > 0
 
-  function getIssueStatusIcon (issue: Issue, statuses: Map<Ref<WithLookup<IssueStatus>>, WithLookup<IssueStatus>>) {
-    const status = statuses.get(issue.status)
-    const category = status?.$lookup?.category
-    const color = status?.color ?? category?.color
-
-    return {
-      ...(category?.icon !== undefined ? { icon: category.icon } : {}),
-      ...(color !== undefined ? { iconColor: getPlatformColor(color) } : {})
-    }
-  }
-
   function openIssue (target: Ref<Issue>) {
     if (target !== value._id) {
       subIssueListProvider(subIssues, target)
@@ -111,12 +99,16 @@
         {
           value: subIssues.map((iss) => {
             const text = project ? `${getIssueId(project, iss)} ${iss.title}` : iss.title
-
             return {
               id: iss._id,
               text,
               isSelected: iss._id === value._id,
-              ...getIssueStatusIcon(iss, $statusStore.byId)
+              icon: IssueStatusIcon,
+              iconProps: {
+                value: $statusStore.get(iss.status),
+                size: 'small',
+                fill: undefined
+              }
             }
           }),
           width: 'large'