From af9aec67698f492c624d6133a49e6bee857231c3 Mon Sep 17 00:00:00 2001
From: gurusainath <gurusainath007@gmail.com>
Date: Sat, 28 Oct 2023 18:03:06 +0530
Subject: [PATCH] chore: handled issues render data structure in project,
 cycle, module and project-view issues

---
 web/store/cycle/cycle_issue.store.ts                | 9 +++++++--
 web/store/issue/issue.store.ts                      | 4 ++--
 web/store/module/module_issue.store.ts              | 4 ++--
 web/store/project-view/project_view_issues.store.ts | 8 ++++++--
 yarn.lock                                           | 4 ++--
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/web/store/cycle/cycle_issue.store.ts b/web/store/cycle/cycle_issue.store.ts
index e343a733d..1402b0215 100644
--- a/web/store/cycle/cycle_issue.store.ts
+++ b/web/store/cycle/cycle_issue.store.ts
@@ -258,7 +258,12 @@ export class CycleIssueStore implements ICycleIssueStore {
       this.error = null;
 
       const params = this.rootStore?.cycleIssueFilter?.appliedFilters;
-      const issueResponse = await this.cycleService.getCycleIssuesWithParams(workspaceSlug, projectId, cycleId, params);
+      const issueResponse: any = await this.cycleService.getCycleIssuesWithParams(
+        workspaceSlug,
+        projectId,
+        cycleId,
+        params
+      );
 
       const issueType = this.getIssueType;
       if (issueType != null) {
@@ -266,7 +271,7 @@ export class CycleIssueStore implements ICycleIssueStore {
           ...this.issues,
           [cycleId]: {
             ...this.issues[cycleId],
-            [issueType]: issueResponse,
+            [issueType]: issueResponse?.["data"],
           },
         };
         runInAction(() => {
diff --git a/web/store/issue/issue.store.ts b/web/store/issue/issue.store.ts
index 85d726f78..61a7af27f 100644
--- a/web/store/issue/issue.store.ts
+++ b/web/store/issue/issue.store.ts
@@ -300,7 +300,7 @@ export class IssueStore implements IIssueStore {
       this.rootStore.project.setProjectId(projectId);
 
       const params = this.rootStore?.issueFilter?.appliedFilters;
-      const issueResponse = await this.issueService.getIssuesWithParams(workspaceSlug, projectId, params);
+      const issueResponse: any = await this.issueService.getIssuesWithParams(workspaceSlug, projectId, params);
 
       const issueType = this.getIssueType;
       if (issueType != null) {
@@ -308,7 +308,7 @@ export class IssueStore implements IIssueStore {
           ...this.issues,
           [projectId]: {
             ...this.issues[projectId],
-            [issueType]: issueResponse,
+            [issueType]: issueResponse?.["data"],
           },
         };
         runInAction(() => {
diff --git a/web/store/module/module_issue.store.ts b/web/store/module/module_issue.store.ts
index 9751ef708..106cbb7b2 100644
--- a/web/store/module/module_issue.store.ts
+++ b/web/store/module/module_issue.store.ts
@@ -268,7 +268,7 @@ export class ModuleIssueStore implements IModuleIssueStore {
       this.error = null;
 
       const params = this.rootStore?.moduleFilter?.appliedFilters;
-      const issueResponse = await this.moduleService.getModuleIssuesWithParams(
+      const issueResponse: any = await this.moduleService.getModuleIssuesWithParams(
         workspaceSlug,
         projectId,
         moduleId,
@@ -281,7 +281,7 @@ export class ModuleIssueStore implements IModuleIssueStore {
           ...this.issues,
           [moduleId]: {
             ...this.issues[moduleId],
-            [issueType]: issueResponse,
+            [issueType]: issueResponse?.["data"],
           },
         };
         runInAction(() => {
diff --git a/web/store/project-view/project_view_issues.store.ts b/web/store/project-view/project_view_issues.store.ts
index 1c6374942..fbd484d70 100644
--- a/web/store/project-view/project_view_issues.store.ts
+++ b/web/store/project-view/project_view_issues.store.ts
@@ -307,7 +307,11 @@ export class ProjectViewIssuesStore implements IProjectViewIssuesStore {
       if (displayFilters.layout === "calendar") filteredRouteParams.group_by = "target_date";
       if (displayFilters.layout === "gantt_chart") filteredRouteParams.start_target_date = true;
 
-      const response = await this.issueService.getIssuesWithParams(workspaceSlug, projectId, filteredRouteParams);
+      const issueResponse: any = await this.issueService.getIssuesWithParams(
+        workspaceSlug,
+        projectId,
+        filteredRouteParams
+      );
 
       const issueType = this.rootStore.issue.getIssueType;
 
@@ -316,7 +320,7 @@ export class ProjectViewIssuesStore implements IProjectViewIssuesStore {
           ...this.viewIssues,
           [viewId]: {
             ...this.viewIssues[viewId],
-            [issueType]: response,
+            [issueType]: issueResponse?.["data"],
           },
         };
 
diff --git a/yarn.lock b/yarn.lock
index e95d031bf..7f729677e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2755,7 +2755,7 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-color@^3.0.6":
+"@types/react-color@^3.0.6", "@types/react-color@^3.0.9":
   version "3.0.9"
   resolved "https://registry.yarnpkg.com/@types/react-color/-/react-color-3.0.9.tgz#8dbb0d798f2979c3d7e2e26dd46321e80da950b4"
   integrity sha512-Ojyc6jySSKvM6UYQrZxaYe0JZXtgHHXwR2q9H4MhcNCswFdeZH1owYZCvPtdHtMOfh7t8h1fY0Gd0nvU1JGDkQ==
@@ -7393,7 +7393,7 @@ react-markdown@^8.0.7:
     unist-util-visit "^4.0.0"
     vfile "^5.0.0"
 
-react-moveable@^0.54.1:
+react-moveable@^0.54.1, react-moveable@^0.54.2:
   version "0.54.2"
   resolved "https://registry.yarnpkg.com/react-moveable/-/react-moveable-0.54.2.tgz#87ce9af3499dc1c8218bce7e174b10264c1bbecf"
   integrity sha512-NGaVLbn0i9pb3+BWSKGWFqI/Mgm4+WMeWHxXXQ4Qi1tHxWCXrUrbGvpxEpt69G/hR7dez+/m68ex+fabjnvcUg==