From 59110c7205eda8084618074495b84ea8ae83b23a Mon Sep 17 00:00:00 2001
From: rahulramesha <71900764+rahulramesha@users.noreply.github.com>
Date: Sat, 2 Dec 2023 18:23:07 +0530
Subject: [PATCH] fix: sub display filter params for fetching issues (#2972)

* fix add subgroup issue FED-1101

* fix subgroup by None assignee FED-1100

* fix grouping by asignee or labels FED-1096

* fix create view popup FED-1093

* fix subgroup exception in swimlanes

* fix show sub issue filter FED-1102
---
 web/store/issues/global/filter.store.ts               |  7 +++++++
 web/store/issues/profile/filter.store.ts              | 11 ++++++++---
 .../issues/project-issues/archived/filter.store.ts    | 11 ++++++++---
 web/store/issues/project-issues/cycle/filter.store.ts | 11 ++++++++---
 web/store/issues/project-issues/draft/filter.store.ts | 11 ++++++++---
 .../issues/project-issues/module/filter.store.ts      | 11 ++++++++---
 .../project-issues/project-view/filter.store.ts       | 11 ++++++++---
 .../issues/project-issues/project/filter.store.ts     | 11 ++++++++---
 web/store/issues/project-issues/utils.ts              |  5 +++++
 9 files changed, 68 insertions(+), 21 deletions(-)
 create mode 100644 web/store/issues/project-issues/utils.ts

diff --git a/web/store/issues/global/filter.store.ts b/web/store/issues/global/filter.store.ts
index b495bb816..4302acc76 100644
--- a/web/store/issues/global/filter.store.ts
+++ b/web/store/issues/global/filter.store.ts
@@ -6,6 +6,7 @@ import { EFilterType } from "store/issues/types";
 import { IssueFilterBaseStore } from "../project-issues/base-issue-filter.store";
 // helpers
 import { handleIssueQueryParamsByLayout } from "helpers/issue.helper";
+import { isNil } from "../project-issues/utils";
 // services
 import { WorkspaceService } from "services/workspace.service";
 
@@ -377,6 +378,12 @@ export class GlobalIssuesFilterStore extends IssueFilterBaseStore implements IGl
       start_date: userFilters?.filters?.start_date || undefined,
       target_date: userFilters?.filters?.target_date || undefined,
       type: userFilters?.displayFilters?.type || undefined,
+      show_empty_groups: isNil(userFilters?.displayFilters?.show_empty_groups)
+        ? true
+        : userFilters?.displayFilters?.show_empty_groups,
+      start_target_date: isNil(userFilters?.displayFilters?.start_target_date)
+        ? true
+        : userFilters?.displayFilters?.start_target_date,
       sub_issue: false,
     };
 
diff --git a/web/store/issues/profile/filter.store.ts b/web/store/issues/profile/filter.store.ts
index 0b684f7a7..dcb760d1a 100644
--- a/web/store/issues/profile/filter.store.ts
+++ b/web/store/issues/profile/filter.store.ts
@@ -6,6 +6,7 @@ import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOption
 import { EFilterType } from "store/issues/types";
 import { handleIssueQueryParamsByLayout } from "helpers/issue.helper";
 import { IssueFilterBaseStore } from "../project-issues/base-issue-filter.store";
+import { isNil } from "../project-issues/utils";
 
 interface IProjectIssuesFiltersOptions {
   filters: IIssueFilterOptions;
@@ -285,9 +286,13 @@ export class ProfileIssuesFilterStore extends IssueFilterBaseStore implements IP
       start_date: userFilters?.filters?.start_date || undefined,
       target_date: userFilters?.filters?.target_date || undefined,
       type: userFilters?.displayFilters?.type || undefined,
-      sub_issue: userFilters?.displayFilters?.sub_issue || true,
-      show_empty_groups: userFilters?.displayFilters?.show_empty_groups || true,
-      start_target_date: userFilters?.displayFilters?.start_target_date || true,
+      sub_issue: isNil(userFilters?.displayFilters?.sub_issue) ? true : userFilters?.displayFilters?.sub_issue,
+      show_empty_groups: isNil(userFilters?.displayFilters?.show_empty_groups)
+        ? true
+        : userFilters?.displayFilters?.show_empty_groups,
+      start_target_date: isNil(userFilters?.displayFilters?.start_target_date)
+        ? true
+        : userFilters?.displayFilters?.start_target_date,
     };
 
     const filteredParams = handleIssueQueryParamsByLayout(userFilters?.displayFilters?.layout, "profile_issues");
diff --git a/web/store/issues/project-issues/archived/filter.store.ts b/web/store/issues/project-issues/archived/filter.store.ts
index 77e30c4fc..0b3ce15a9 100644
--- a/web/store/issues/project-issues/archived/filter.store.ts
+++ b/web/store/issues/project-issues/archived/filter.store.ts
@@ -8,6 +8,7 @@ import { handleIssueQueryParamsByLayout } from "helpers/issue.helper";
 import { RootStore } from "store/root";
 import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions, TIssueParams } from "types";
 import { EFilterType } from "store/issues/types";
+import { isNil } from "../utils";
 
 interface IProjectIssuesFilters {
   filters: IIssueFilterOptions | undefined;
@@ -78,9 +79,13 @@ export class ProjectArchivedIssuesFilterStore
       start_date: userFilters?.filters?.start_date || undefined,
       target_date: userFilters?.filters?.target_date || undefined,
       type: userFilters?.displayFilters?.type || undefined,
-      sub_issue: userFilters?.displayFilters?.sub_issue || true,
-      show_empty_groups: userFilters?.displayFilters?.show_empty_groups || true,
-      start_target_date: userFilters?.displayFilters?.start_target_date || true,
+      sub_issue: isNil(userFilters?.displayFilters?.sub_issue) ? true : userFilters?.displayFilters?.sub_issue,
+      show_empty_groups: isNil(userFilters?.displayFilters?.show_empty_groups)
+        ? true
+        : userFilters?.displayFilters?.show_empty_groups,
+      start_target_date: isNil(userFilters?.displayFilters?.start_target_date)
+        ? true
+        : userFilters?.displayFilters?.start_target_date,
     };
 
     const filteredParams = handleIssueQueryParamsByLayout(userFilters?.displayFilters?.layout, "issues");
diff --git a/web/store/issues/project-issues/cycle/filter.store.ts b/web/store/issues/project-issues/cycle/filter.store.ts
index 6e73d7613..b78999d7e 100644
--- a/web/store/issues/project-issues/cycle/filter.store.ts
+++ b/web/store/issues/project-issues/cycle/filter.store.ts
@@ -11,6 +11,7 @@ import { handleIssueQueryParamsByLayout } from "helpers/issue.helper";
 import { RootStore } from "store/root";
 import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions, TIssueParams } from "types";
 import { EFilterType } from "store/issues/types";
+import { isNil } from "../utils";
 
 interface ICycleIssuesFilterOptions {
   filters: IIssueFilterOptions;
@@ -118,9 +119,13 @@ export class CycleIssuesFilterStore extends IssueFilterBaseStore implements ICyc
       start_date: userFilters?.filters?.start_date || undefined,
       target_date: userFilters?.filters?.target_date || undefined,
       type: userFilters?.displayFilters?.type || undefined,
-      sub_issue: userFilters?.displayFilters?.sub_issue || true,
-      show_empty_groups: userFilters?.displayFilters?.show_empty_groups || true,
-      start_target_date: userFilters?.displayFilters?.start_target_date || true,
+      sub_issue: isNil(userFilters?.displayFilters?.sub_issue) ? true : userFilters?.displayFilters?.sub_issue,
+      show_empty_groups: isNil(userFilters?.displayFilters?.show_empty_groups)
+        ? true
+        : userFilters?.displayFilters?.show_empty_groups,
+      start_target_date: isNil(userFilters?.displayFilters?.start_target_date)
+        ? true
+        : userFilters?.displayFilters?.start_target_date,
     };
 
     const filteredParams = handleIssueQueryParamsByLayout(userFilters?.displayFilters?.layout, "issues");
diff --git a/web/store/issues/project-issues/draft/filter.store.ts b/web/store/issues/project-issues/draft/filter.store.ts
index 7cfca229b..0c0a3ba37 100644
--- a/web/store/issues/project-issues/draft/filter.store.ts
+++ b/web/store/issues/project-issues/draft/filter.store.ts
@@ -8,6 +8,7 @@ import { handleIssueQueryParamsByLayout } from "helpers/issue.helper";
 import { RootStore } from "store/root";
 import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions, TIssueParams } from "types";
 import { EFilterType } from "store/issues/types";
+import { isNil } from "../utils";
 
 interface IProjectIssuesFilters {
   filters: IIssueFilterOptions | undefined;
@@ -75,9 +76,13 @@ export class ProjectDraftIssuesFilterStore extends IssueFilterBaseStore implemen
       start_date: userFilters?.filters?.start_date || undefined,
       target_date: userFilters?.filters?.target_date || undefined,
       type: userFilters?.displayFilters?.type || undefined,
-      sub_issue: userFilters?.displayFilters?.sub_issue || true,
-      show_empty_groups: userFilters?.displayFilters?.show_empty_groups || true,
-      start_target_date: userFilters?.displayFilters?.start_target_date || true,
+      sub_issue: isNil(userFilters?.displayFilters?.sub_issue) ? true : userFilters?.displayFilters?.sub_issue,
+      show_empty_groups: isNil(userFilters?.displayFilters?.show_empty_groups)
+        ? true
+        : userFilters?.displayFilters?.show_empty_groups,
+      start_target_date: isNil(userFilters?.displayFilters?.start_target_date)
+        ? true
+        : userFilters?.displayFilters?.start_target_date,
     };
 
     const filteredParams = handleIssueQueryParamsByLayout(userFilters?.displayFilters?.layout, "issues");
diff --git a/web/store/issues/project-issues/module/filter.store.ts b/web/store/issues/project-issues/module/filter.store.ts
index a30103314..103528ba8 100644
--- a/web/store/issues/project-issues/module/filter.store.ts
+++ b/web/store/issues/project-issues/module/filter.store.ts
@@ -11,6 +11,7 @@ import { handleIssueQueryParamsByLayout } from "helpers/issue.helper";
 import { RootStore } from "store/root";
 import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions, TIssueParams } from "types";
 import { EFilterType } from "store/issues/types";
+import { isNil } from "../utils";
 
 interface IModuleIssuesFilterOptions {
   filters: IIssueFilterOptions;
@@ -118,9 +119,13 @@ export class ModuleIssuesFilterStore extends IssueFilterBaseStore implements IMo
       start_date: userFilters?.filters?.start_date || undefined,
       target_date: userFilters?.filters?.target_date || undefined,
       type: userFilters?.displayFilters?.type || undefined,
-      sub_issue: userFilters?.displayFilters?.sub_issue || true,
-      show_empty_groups: userFilters?.displayFilters?.show_empty_groups || true,
-      start_target_date: userFilters?.displayFilters?.start_target_date || true,
+      sub_issue: isNil(userFilters?.displayFilters?.sub_issue) ? true : userFilters?.displayFilters?.sub_issue,
+      show_empty_groups: isNil(userFilters?.displayFilters?.show_empty_groups)
+        ? true
+        : userFilters?.displayFilters?.show_empty_groups,
+      start_target_date: isNil(userFilters?.displayFilters?.start_target_date)
+        ? true
+        : userFilters?.displayFilters?.start_target_date,
     };
 
     const filteredParams = handleIssueQueryParamsByLayout(userFilters?.displayFilters?.layout, "issues");
diff --git a/web/store/issues/project-issues/project-view/filter.store.ts b/web/store/issues/project-issues/project-view/filter.store.ts
index 5aa25f604..215e3749f 100644
--- a/web/store/issues/project-issues/project-view/filter.store.ts
+++ b/web/store/issues/project-issues/project-view/filter.store.ts
@@ -11,6 +11,7 @@ import { handleIssueQueryParamsByLayout } from "helpers/issue.helper";
 import { RootStore } from "store/root";
 import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions, TIssueParams } from "types";
 import { EFilterType } from "store/issues/types";
+import { isNil } from "../utils";
 
 interface IViewIssuesFilterOptions {
   filters: IIssueFilterOptions;
@@ -118,9 +119,13 @@ export class ViewIssuesFilterStore extends IssueFilterBaseStore implements IView
       start_date: userFilters?.filters?.start_date || undefined,
       target_date: userFilters?.filters?.target_date || undefined,
       type: userFilters?.displayFilters?.type || undefined,
-      sub_issue: userFilters?.displayFilters?.sub_issue || true,
-      show_empty_groups: userFilters?.displayFilters?.show_empty_groups || true,
-      start_target_date: userFilters?.displayFilters?.start_target_date || true,
+      sub_issue: isNil(userFilters?.displayFilters?.sub_issue) ? true : userFilters?.displayFilters?.sub_issue,
+      show_empty_groups: isNil(userFilters?.displayFilters?.show_empty_groups)
+        ? true
+        : userFilters?.displayFilters?.show_empty_groups,
+      start_target_date: isNil(userFilters?.displayFilters?.start_target_date)
+        ? true
+        : userFilters?.displayFilters?.start_target_date,
     };
 
     const filteredParams = handleIssueQueryParamsByLayout(userFilters?.displayFilters?.layout, "issues");
diff --git a/web/store/issues/project-issues/project/filter.store.ts b/web/store/issues/project-issues/project/filter.store.ts
index bb64b5784..8caf189ad 100644
--- a/web/store/issues/project-issues/project/filter.store.ts
+++ b/web/store/issues/project-issues/project/filter.store.ts
@@ -8,6 +8,7 @@ import { handleIssueQueryParamsByLayout } from "helpers/issue.helper";
 import { RootStore } from "store/root";
 import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions, TIssueParams } from "types";
 import { EFilterType } from "store/issues/types";
+import { isNil } from "../utils";
 
 interface IProjectIssuesFilters {
   filters: IIssueFilterOptions | undefined;
@@ -75,9 +76,13 @@ export class ProjectIssuesFilterStore extends IssueFilterBaseStore implements IP
       start_date: userFilters?.filters?.start_date || undefined,
       target_date: userFilters?.filters?.target_date || undefined,
       type: userFilters?.displayFilters?.type || undefined,
-      sub_issue: userFilters?.displayFilters?.sub_issue || true,
-      show_empty_groups: userFilters?.displayFilters?.show_empty_groups || true,
-      start_target_date: userFilters?.displayFilters?.start_target_date || true,
+      sub_issue: isNil(userFilters?.displayFilters?.sub_issue) ? true : userFilters?.displayFilters?.sub_issue,
+      show_empty_groups: isNil(userFilters?.displayFilters?.show_empty_groups)
+        ? true
+        : userFilters?.displayFilters?.show_empty_groups,
+      start_target_date: isNil(userFilters?.displayFilters?.start_target_date)
+        ? true
+        : userFilters?.displayFilters?.start_target_date,
     };
 
     const filteredParams = handleIssueQueryParamsByLayout(userFilters?.displayFilters?.layout, "issues");
diff --git a/web/store/issues/project-issues/utils.ts b/web/store/issues/project-issues/utils.ts
new file mode 100644
index 000000000..11eb6b90d
--- /dev/null
+++ b/web/store/issues/project-issues/utils.ts
@@ -0,0 +1,5 @@
+export const isNil = (value: any) => {
+  if (value === undefined || value === null) return true;
+
+  return false;
+};