From 284114651204f903d72daa4273684fe5293f0c15 Mon Sep 17 00:00:00 2001
From: mrsadman99 <60566490+mrsadman99@users.noreply.github.com>
Date: Fri, 4 Nov 2022 13:09:59 +0700
Subject: [PATCH] TSK-363: Fixed multiple no sprint category (#2352)

Signed-off-by: Anton Brechka <anton.brechka@xored.com>
---
 .../src/components/issues/IssuesList.svelte            |  6 ++----
 .../src/components/sprints/SprintSelector.svelte       |  2 +-
 plugins/tracker-resources/src/utils.ts                 | 10 ++--------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/plugins/tracker-resources/src/components/issues/IssuesList.svelte b/plugins/tracker-resources/src/components/issues/IssuesList.svelte
index 04a970cb34..5bd5b0bcdc 100644
--- a/plugins/tracker-resources/src/components/issues/IssuesList.svelte
+++ b/plugins/tracker-resources/src/components/issues/IssuesList.svelte
@@ -200,10 +200,8 @@
     categoryLimit: Record<any, number>
   ): Issue[] {
     const issues = groupes[category] ?? []
-    if (Object.keys(groupes).length === 1) {
-      return issues.slice(0, singleCategoryLimit)
-    }
-    const limit = categoryLimit[toCat(category)] ?? defaultLimit
+    const initialLimit = Object.keys(groupes).length === 1 ? singleCategoryLimit : defaultLimit
+    const limit = categoryLimit[toCat(category)] ?? initialLimit
     return issues.slice(0, limit)
   }
   const categoryLimit: Record<any, number> = {}
diff --git a/plugins/tracker-resources/src/components/sprints/SprintSelector.svelte b/plugins/tracker-resources/src/components/sprints/SprintSelector.svelte
index 71205e8e96..bebfa06eb7 100644
--- a/plugins/tracker-resources/src/components/sprints/SprintSelector.svelte
+++ b/plugins/tracker-resources/src/components/sprints/SprintSelector.svelte
@@ -56,7 +56,7 @@
 
   $: handleSelectedSprintIdUpdated(value, rawSprints)
 
-  $: translate(tracker.string.Sprint, {}).then((result) => (defaultSprintLabel = result))
+  $: translate(tracker.string.NoSprint, {}).then((result) => (defaultSprintLabel = result))
   const sprintIcon = tracker.icon.Sprint
   $: sprintText = shouldShowLabel ? selectedSprint?.label ?? defaultSprintLabel : undefined
 
diff --git a/plugins/tracker-resources/src/utils.ts b/plugins/tracker-resources/src/utils.ts
index 4edbc3c963..ba9157cefa 100644
--- a/plugins/tracker-resources/src/utils.ts
+++ b/plugins/tracker-resources/src/utils.ts
@@ -111,7 +111,7 @@ export const getIssuesModificationDatePeriodTime = (period: IssuesDateModificati
 
 export const groupBy = (data: any, key: any): { [key: string]: any[] } => {
   return data.reduce((storage: { [key: string]: any[] }, item: any) => {
-    const group = item[key]
+    const group = item[key] ?? undefined
 
     storage[group] = storage[group] ?? []
 
@@ -318,13 +318,7 @@ export function getCategories (
     (category) => statuses.find((status) => status.category === category)?._id
   )
 
-  const existingCategories = Array.from(
-    new Set(
-      elements.map((x) => {
-        return (x as any)[key]
-      })
-    )
-  )
+  const existingCategories = Array.from(new Set(elements.map((x: any) => x[key] ?? undefined)))
 
   if (shouldShowAll) {
     if (key === 'status') {