From 3c93efde075d113b7819585bc991736426448b55 Mon Sep 17 00:00:00 2001
From: mrsadman99 <60566490+mrsadman99@users.noreply.github.com>
Date: Wed, 14 Dec 2022 11:45:47 +0700
Subject: [PATCH] Fixed no grouping issues (#2434)

---
 .../src/components/issues/IssuesList.svelte                  | 5 +++++
 .../src/components/issues/IssuesListItem.svelte              | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/tracker-resources/src/components/issues/IssuesList.svelte b/plugins/tracker-resources/src/components/issues/IssuesList.svelte
index fa38a5d090..f5773e5dfd 100644
--- a/plugins/tracker-resources/src/components/issues/IssuesList.svelte
+++ b/plugins/tracker-resources/src/components/issues/IssuesList.svelte
@@ -27,6 +27,7 @@
     getEventPositionElement,
     IconAdd,
     IconMoreH,
+    Label,
     showPopup,
     Spinner
   } from '@hcengineering/ui'
@@ -215,6 +216,10 @@
               enlargedText
               {currentSpace}
             />
+          {:else if !groupByKey}
+            <span class="text-base fs-bold overflow-label content-accent-color pointer-events-none">
+              <Label label={tracker.string.NoGrouping} />
+            </span>
           {:else if headerComponent}
             <Component
               is={headerComponent}
diff --git a/plugins/tracker-resources/src/components/issues/IssuesListItem.svelte b/plugins/tracker-resources/src/components/issues/IssuesListItem.svelte
index 8fd8c02e46..bb7f8e246e 100644
--- a/plugins/tracker-resources/src/components/issues/IssuesListItem.svelte
+++ b/plugins/tracker-resources/src/components/issues/IssuesListItem.svelte
@@ -76,7 +76,7 @@
   {#each model as attributeModel}
     {#if attributeModel.props?.type === 'grow'}
       <svelte:component this={attributeModel.presenter} />
-    {:else if attributeModel.props?.excludeByKey !== groupByKey && !(attributeModel.props?.optional && compactMode)}
+    {:else if (!groupByKey || attributeModel.props?.excludeByKey !== groupByKey) && !(attributeModel.props?.optional && compactMode)}
       {#if attributeModel.props?.fixed}
         <FixedColumn
           width={propsWidth[attributeModel.key]}