From 93a957275cd43a07569bfd3ade2e56b8f8984e1c Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Thu, 1 May 2025 10:08:26 +0700
Subject: [PATCH] Fix issue status icon presentation (#8795)

---
 .../src/components/SetParentIssueActionPopup.svelte           | 2 +-
 .../src/components/activity/StatusIcon.svelte                 | 4 ++--
 .../tracker-resources/src/components/issues/IssueItem.svelte  | 2 +-
 .../src/components/issues/IssueNotification.svelte            | 2 +-
 .../src/components/issues/IssueStatusActivity.svelte          | 2 +-
 .../src/components/issues/IssueStatusPresenter.svelte         | 2 +-
 .../src/components/issues/StatusEditor.svelte                 | 3 ++-
 .../src/components/issues/StatusSelector.svelte               | 2 +-
 .../src/components/issues/edit/SubIssueSelector.svelte        | 2 +-
 .../components/issues/related/RelatedIssuePresenter.svelte    | 2 +-
 10 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/plugins/tracker-resources/src/components/SetParentIssueActionPopup.svelte b/plugins/tracker-resources/src/components/SetParentIssueActionPopup.svelte
index f2176f7f36..bf7059e99f 100644
--- a/plugins/tracker-resources/src/components/SetParentIssueActionPopup.svelte
+++ b/plugins/tracker-resources/src/components/SetParentIssueActionPopup.svelte
@@ -88,7 +88,7 @@
     <div class="flex-center clear-mins w-full h-9">
       {#if issue?.$lookup?.status}
         <div class="icon mr-4 h-8">
-          <IssueStatusIcon value={issue.$lookup.status} space={issue.space} size="small" />
+          <IssueStatusIcon value={issue.$lookup.status} taskType={issue.kind} space={issue.space} size="small" />
         </div>
       {/if}
       <span class="overflow-label flex-no-shrink mr-3">{issue.identifier}</span>
diff --git a/plugins/tracker-resources/src/components/activity/StatusIcon.svelte b/plugins/tracker-resources/src/components/activity/StatusIcon.svelte
index be6afa9efd..759d214d2c 100644
--- a/plugins/tracker-resources/src/components/activity/StatusIcon.svelte
+++ b/plugins/tracker-resources/src/components/activity/StatusIcon.svelte
@@ -20,14 +20,14 @@
 
   export let tx: TxUpdateDoc<Issue>
   $: value = tx.operations.status
+  $: taskType = tx.operations.kind
 
   $: status = value && $statusStore.byId.get(value)
-
   $: space = tx.objectSpace as Ref<Project>
 </script>
 
 <div class="icon">
   {#if status}
-    <IssueStatusIcon value={status} {space} size="small" on:accent-color />
+    <IssueStatusIcon value={status} {taskType} {space} size="small" on:accent-color />
   {/if}
 </div>
diff --git a/plugins/tracker-resources/src/components/issues/IssueItem.svelte b/plugins/tracker-resources/src/components/issues/IssueItem.svelte
index 32049b2dcb..916ae5c425 100644
--- a/plugins/tracker-resources/src/components/issues/IssueItem.svelte
+++ b/plugins/tracker-resources/src/components/issues/IssueItem.svelte
@@ -27,7 +27,7 @@
   <!-- <Icon icon={tracker.icon.TrackerApplication} size={'medium'} /> -->
   <FixedColumn key="object-popup-issue-status">
     {#if st}
-      <IssueStatusIcon value={st} size={'small'} space={value.space} />
+      <IssueStatusIcon value={st} taskType={value.kind} size={'small'} space={value.space} />
     {/if}
   </FixedColumn>
   <span class="ml-2 max-w-120 overflow-label">
diff --git a/plugins/tracker-resources/src/components/issues/IssueNotification.svelte b/plugins/tracker-resources/src/components/issues/IssueNotification.svelte
index 13d93da0fa..f83ed3a3ff 100644
--- a/plugins/tracker-resources/src/components/issues/IssueNotification.svelte
+++ b/plugins/tracker-resources/src/components/issues/IssueNotification.svelte
@@ -57,7 +57,7 @@
   <svelte:fragment slot="content">
     <div class="flex-row-center flex-wrap gap-2 reverse">
       {#if status === undefined && issue}
-        <IssueStatusIcon value={status} space={issue.space} size="small" />
+        <IssueStatusIcon value={status} taskType={issue.kind} space={issue.space} size="small" />
       {/if}
       {#if issue}
         <IssuePresenter value={issue} />
diff --git a/plugins/tracker-resources/src/components/issues/IssueStatusActivity.svelte b/plugins/tracker-resources/src/components/issues/IssueStatusActivity.svelte
index a46f33d618..4316db17f1 100644
--- a/plugins/tracker-resources/src/components/issues/IssueStatusActivity.svelte
+++ b/plugins/tracker-resources/src/components/issues/IssueStatusActivity.svelte
@@ -86,6 +86,6 @@
   </span>
 </Row>
 {#each displaySt as st}
-  <StatusPresenter value={st.status} space={issue.space} />
+  <StatusPresenter value={st.status} taskType={issue.kind} space={issue.space} />
   <Duration value={st.duration} />
 {/each}
diff --git a/plugins/tracker-resources/src/components/issues/IssueStatusPresenter.svelte b/plugins/tracker-resources/src/components/issues/IssueStatusPresenter.svelte
index 85e9e38780..2a064117de 100644
--- a/plugins/tracker-resources/src/components/issues/IssueStatusPresenter.svelte
+++ b/plugins/tracker-resources/src/components/issues/IssueStatusPresenter.svelte
@@ -31,5 +31,5 @@
 </script>
 
 {#if value}
-  <IssueStatusIcon value={issueStatus} {size} space={value.space} />
+  <IssueStatusIcon value={issueStatus} taskType={value.kind} {size} space={value.space} />
 {/if}
diff --git a/plugins/tracker-resources/src/components/issues/StatusEditor.svelte b/plugins/tracker-resources/src/components/issues/StatusEditor.svelte
index 3256cac578..d164656e31 100644
--- a/plugins/tracker-resources/src/components/issues/StatusEditor.svelte
+++ b/plugins/tracker-resources/src/components/issues/StatusEditor.svelte
@@ -143,6 +143,7 @@
       <div class="flex-center flex-no-shrink square-4">
         {#if selectedStatus}<IssueStatusIcon
             value={selectedStatus}
+            taskType={value.kind}
             size={kind === 'list' ? 'small' : 'medium'}
             space={value.space}
           />{/if}
@@ -170,7 +171,7 @@
     >
       <svelte:fragment slot="icon">
         {#if selectedStatus}
-          <IssueStatusIcon value={selectedStatus} size={iconSize} space={value.space} />
+          <IssueStatusIcon value={selectedStatus} taskType={value.kind} size={iconSize} space={value.space} />
         {/if}
       </svelte:fragment>
       <svelte:fragment slot="content">
diff --git a/plugins/tracker-resources/src/components/issues/StatusSelector.svelte b/plugins/tracker-resources/src/components/issues/StatusSelector.svelte
index 86ea837ebc..df13cce3b4 100644
--- a/plugins/tracker-resources/src/components/issues/StatusSelector.svelte
+++ b/plugins/tracker-resources/src/components/issues/StatusSelector.svelte
@@ -139,7 +139,7 @@
   >
     <svelte:fragment slot="icon">
       {#if selectedStatus}
-        <IssueStatusIcon value={selectedStatus} size={iconSize} space={undefined} />
+        <IssueStatusIcon value={selectedStatus} {taskType} size={iconSize} space={undefined} />
       {/if}
     </svelte:fragment>
     <svelte:fragment slot="content">
diff --git a/plugins/tracker-resources/src/components/issues/edit/SubIssueSelector.svelte b/plugins/tracker-resources/src/components/issues/edit/SubIssueSelector.svelte
index d8710c3167..53a3c22b0b 100644
--- a/plugins/tracker-resources/src/components/issues/edit/SubIssueSelector.svelte
+++ b/plugins/tracker-resources/src/components/issues/edit/SubIssueSelector.svelte
@@ -161,7 +161,7 @@
       >
         {#if parentStatus}
           <div class="pr-2">
-            <IssueStatusIcon space={parentIssue.space} value={parentStatus} size="small" />
+            <IssueStatusIcon space={parentIssue.space} taskType={parentIssue.kind} value={parentStatus} size="small" />
           </div>
         {/if}
         <span class="overflow-label flex-no-shrink mr-2">{parentIssue.identifier}</span>
diff --git a/plugins/tracker-resources/src/components/issues/related/RelatedIssuePresenter.svelte b/plugins/tracker-resources/src/components/issues/related/RelatedIssuePresenter.svelte
index 511f4965c2..f454e2304d 100644
--- a/plugins/tracker-resources/src/components/issues/related/RelatedIssuePresenter.svelte
+++ b/plugins/tracker-resources/src/components/issues/related/RelatedIssuePresenter.svelte
@@ -29,7 +29,7 @@
 <div class="flex-row-center">
   {#if status}
     <div class="icon mr-2">
-      <IssueStatusIcon value={status} {size} space={issue.space} />
+      <IssueStatusIcon value={status} taskType={issue.kind} {size} space={issue.space} />
     </div>
   {/if}
   <span class="label" class:text-base={huge}>