Skip to content

Commit 93a9572

Browse files
authored
Fix issue status icon presentation (#8795)
1 parent 111c3c6 commit 93a9572

File tree

10 files changed

+12
-11
lines changed

10 files changed

+12
-11
lines changed

plugins/tracker-resources/src/components/SetParentIssueActionPopup.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
<div class="flex-center clear-mins w-full h-9">
8989
{#if issue?.$lookup?.status}
9090
<div class="icon mr-4 h-8">
91-
<IssueStatusIcon value={issue.$lookup.status} space={issue.space} size="small" />
91+
<IssueStatusIcon value={issue.$lookup.status} taskType={issue.kind} space={issue.space} size="small" />
9292
</div>
9393
{/if}
9494
<span class="overflow-label flex-no-shrink mr-3">{issue.identifier}</span>

plugins/tracker-resources/src/components/activity/StatusIcon.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
2121
export let tx: TxUpdateDoc<Issue>
2222
$: value = tx.operations.status
23+
$: taskType = tx.operations.kind
2324
2425
$: status = value && $statusStore.byId.get(value)
25-
2626
$: space = tx.objectSpace as Ref<Project>
2727
</script>
2828

2929
<div class="icon">
3030
{#if status}
31-
<IssueStatusIcon value={status} {space} size="small" on:accent-color />
31+
<IssueStatusIcon value={status} {taskType} {space} size="small" on:accent-color />
3232
{/if}
3333
</div>

plugins/tracker-resources/src/components/issues/IssueItem.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<!-- <Icon icon={tracker.icon.TrackerApplication} size={'medium'} /> -->
2828
<FixedColumn key="object-popup-issue-status">
2929
{#if st}
30-
<IssueStatusIcon value={st} size={'small'} space={value.space} />
30+
<IssueStatusIcon value={st} taskType={value.kind} size={'small'} space={value.space} />
3131
{/if}
3232
</FixedColumn>
3333
<span class="ml-2 max-w-120 overflow-label">

plugins/tracker-resources/src/components/issues/IssueNotification.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<svelte:fragment slot="content">
5858
<div class="flex-row-center flex-wrap gap-2 reverse">
5959
{#if status === undefined && issue}
60-
<IssueStatusIcon value={status} space={issue.space} size="small" />
60+
<IssueStatusIcon value={status} taskType={issue.kind} space={issue.space} size="small" />
6161
{/if}
6262
{#if issue}
6363
<IssuePresenter value={issue} />

plugins/tracker-resources/src/components/issues/IssueStatusActivity.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,6 @@
8686
</span>
8787
</Row>
8888
{#each displaySt as st}
89-
<StatusPresenter value={st.status} space={issue.space} />
89+
<StatusPresenter value={st.status} taskType={issue.kind} space={issue.space} />
9090
<Duration value={st.duration} />
9191
{/each}

plugins/tracker-resources/src/components/issues/IssueStatusPresenter.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
</script>
3232

3333
{#if value}
34-
<IssueStatusIcon value={issueStatus} {size} space={value.space} />
34+
<IssueStatusIcon value={issueStatus} taskType={value.kind} {size} space={value.space} />
3535
{/if}

plugins/tracker-resources/src/components/issues/StatusEditor.svelte

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@
143143
<div class="flex-center flex-no-shrink square-4">
144144
{#if selectedStatus}<IssueStatusIcon
145145
value={selectedStatus}
146+
taskType={value.kind}
146147
size={kind === 'list' ? 'small' : 'medium'}
147148
space={value.space}
148149
/>{/if}
@@ -170,7 +171,7 @@
170171
>
171172
<svelte:fragment slot="icon">
172173
{#if selectedStatus}
173-
<IssueStatusIcon value={selectedStatus} size={iconSize} space={value.space} />
174+
<IssueStatusIcon value={selectedStatus} taskType={value.kind} size={iconSize} space={value.space} />
174175
{/if}
175176
</svelte:fragment>
176177
<svelte:fragment slot="content">

plugins/tracker-resources/src/components/issues/StatusSelector.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
>
140140
<svelte:fragment slot="icon">
141141
{#if selectedStatus}
142-
<IssueStatusIcon value={selectedStatus} size={iconSize} space={undefined} />
142+
<IssueStatusIcon value={selectedStatus} {taskType} size={iconSize} space={undefined} />
143143
{/if}
144144
</svelte:fragment>
145145
<svelte:fragment slot="content">

plugins/tracker-resources/src/components/issues/edit/SubIssueSelector.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
>
162162
{#if parentStatus}
163163
<div class="pr-2">
164-
<IssueStatusIcon space={parentIssue.space} value={parentStatus} size="small" />
164+
<IssueStatusIcon space={parentIssue.space} taskType={parentIssue.kind} value={parentStatus} size="small" />
165165
</div>
166166
{/if}
167167
<span class="overflow-label flex-no-shrink mr-2">{parentIssue.identifier}</span>

plugins/tracker-resources/src/components/issues/related/RelatedIssuePresenter.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<div class="flex-row-center">
3030
{#if status}
3131
<div class="icon mr-2">
32-
<IssueStatusIcon value={status} {size} space={issue.space} />
32+
<IssueStatusIcon value={status} taskType={issue.kind} {size} space={issue.space} />
3333
</div>
3434
{/if}
3535
<span class="label" class:text-base={huge}>

0 commit comments

Comments
 (0)