From ab02e975b11c780208b7e8d774dea42fa0852cbc Mon Sep 17 00:00:00 2001 From: gurusainath Date: Mon, 9 Oct 2023 15:37:20 +0530 Subject: [PATCH 1/2] chore: updated kanban logic in project cycles and modules --- .../[projectId]/modules/[moduleId].tsx | 6 +- web/store/cycle_issue_filters.ts | 9 +- web/store/cycle_issue_kanban_view.ts | 105 +++++++++++----- web/store/module_issue_kanban_view.ts | 117 ++++++++++++------ 4 files changed, 162 insertions(+), 75 deletions(-) diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/modules/[moduleId].tsx b/web/pages/[workspaceSlug]/projects/[projectId]/modules/[moduleId].tsx index 6354af6d65a..5d8b461a2c2 100644 --- a/web/pages/[workspaceSlug]/projects/[projectId]/modules/[moduleId].tsx +++ b/web/pages/[workspaceSlug]/projects/[projectId]/modules/[moduleId].tsx @@ -140,9 +140,9 @@ const SingleModule: React.FC = () => { <> setAnalyticsModal(false)} />
diff --git a/web/store/cycle_issue_filters.ts b/web/store/cycle_issue_filters.ts index e1950776cb8..bcf04d0f55b 100644 --- a/web/store/cycle_issue_filters.ts +++ b/web/store/cycle_issue_filters.ts @@ -66,9 +66,6 @@ class CycleIssueFilterStore implements ICycleIssueFilterStore { get appliedFilters(): TIssueParams[] | null { const userDisplayFilters = this.rootStore?.issueFilter?.userDisplayFilters; - console.log("userDisplayFilters", userDisplayFilters); - console.log("this.cycleFilters", this.cycleFilters); - if (!this.cycleFilters || !userDisplayFilters) return null; let filteredRouteParams: any = { @@ -89,11 +86,7 @@ class CycleIssueFilterStore implements ICycleIssueFilterStore { start_target_date: userDisplayFilters?.start_target_date || true, }; - console.log("----"); - console.log("filteredRouteParams", filteredRouteParams); const filteredParams = handleIssueQueryParamsByLayout(userDisplayFilters.layout, "issues"); - console.log("filteredParams", filteredParams); - console.log("----"); if (filteredParams) filteredRouteParams = this.computedFilter(filteredRouteParams, filteredParams); @@ -140,7 +133,7 @@ class CycleIssueFilterStore implements ICycleIssueFilterStore { }, }; - const response = await this.cycleService.updateCycle(workspaceSlug, projectId, cycleId, payload, undefined); + await this.cycleService.updateCycle(workspaceSlug, projectId, cycleId, payload, undefined); } catch (error) { this.fetchCycleFilters(workspaceSlug, projectId, cycleId); diff --git a/web/store/cycle_issue_kanban_view.ts b/web/store/cycle_issue_kanban_view.ts index 2a4bce8a732..1139fb96eb0 100644 --- a/web/store/cycle_issue_kanban_view.ts +++ b/web/store/cycle_issue_kanban_view.ts @@ -82,7 +82,7 @@ class CycleIssueKanBanViewStore implements ICycleIssueKanBanViewStore { const projectId = this.rootStore?.project?.projectId; const issueType: IIssueType | null = this.rootStore?.issue?.getIssueType; const issueLayout = this.rootStore?.issueFilter?.userDisplayFilters?.layout || null; - const currentIssues: any = this.rootStore.cycleIssue?.getIssues; + const currentIssues: any = this.rootStore.cycleIssue.getIssues; const sortOrderDefaultValue = 65535; @@ -166,20 +166,30 @@ class CycleIssueKanBanViewStore implements ICycleIssueKanBanViewStore { }; } + let issueStatePriority = {}; + if (this.rootStore.issueFilter?.userDisplayFilters?.group_by === "state") { + updateIssue = { ...updateIssue, state: destination_group_id }; + issueStatePriority = { ...issueStatePriority, state: destination_group_id }; + } + if (this.rootStore.issueFilter?.userDisplayFilters?.group_by === "priority") { + updateIssue = { ...updateIssue, priority: destination_group_id }; + issueStatePriority = { ...issueStatePriority, priority: destination_group_id }; + } + const [removed] = _sourceIssues.splice(source.index, 1); if (_destinationIssues && _destinationIssues.length > 0) _destinationIssues.splice(destination.index, 0, { ...removed, sort_order: updateIssue.sort_order, + ...issueStatePriority, }); - else _destinationIssues = [..._destinationIssues, { ...removed, sort_order: updateIssue.sort_order }]; + else + _destinationIssues = [ + ..._destinationIssues, + { ...removed, sort_order: updateIssue.sort_order, ...issueStatePriority }, + ]; updateIssue = { ...updateIssue, issueId: removed?.id }; - // if (this.rootStore.issueFilter?.userDisplayFilters?.group_by === "state") - // updateIssue = { ...updateIssue, state: destination_group_id }; - // if (this.rootStore.issueFilter?.userDisplayFilters?.group_by === "priority") - // updateIssue = { ...updateIssue, priority: destination_group_id }; - currentIssues[source_sub_group_id][source_group_id] = _sourceIssues; currentIssues[destination_sub_group_id][destination_group_id] = _destinationIssues; } @@ -216,22 +226,51 @@ class CycleIssueKanBanViewStore implements ICycleIssueKanBanViewStore { }; } + let issueStatePriority = {}; + if (source_group_id === destination_group_id) { + if (this.rootStore.issueFilter?.userDisplayFilters?.sub_group_by === "state") { + updateIssue = { ...updateIssue, state: destination_sub_group_id }; + issueStatePriority = { ...issueStatePriority, state: destination_sub_group_id }; + } + if (this.rootStore.issueFilter?.userDisplayFilters?.sub_group_by === "priority") { + updateIssue = { ...updateIssue, priority: destination_sub_group_id }; + issueStatePriority = { ...issueStatePriority, priority: destination_sub_group_id }; + } + } else { + if (this.rootStore.issueFilter?.userDisplayFilters?.sub_group_by === "state") { + updateIssue = { ...updateIssue, state: destination_sub_group_id, priority: destination_group_id }; + issueStatePriority = { + ...issueStatePriority, + state: destination_sub_group_id, + priority: destination_group_id, + }; + } + if (this.rootStore.issueFilter?.userDisplayFilters?.sub_group_by === "priority") { + updateIssue = { ...updateIssue, state: destination_group_id, priority: destination_sub_group_id }; + issueStatePriority = { + ...issueStatePriority, + state: destination_group_id, + priority: destination_sub_group_id, + }; + } + } + const [removed] = _sourceIssues.splice(source.index, 1); if (_destinationIssues && _destinationIssues.length > 0) _destinationIssues.splice(destination.index, 0, { ...removed, sort_order: updateIssue.sort_order, + ...issueStatePriority, }); - else _destinationIssues = [..._destinationIssues, { ...removed, sort_order: updateIssue.sort_order }]; + else + _destinationIssues = [ + ..._destinationIssues, + { ...removed, sort_order: updateIssue.sort_order, ...issueStatePriority }, + ]; updateIssue = { ...updateIssue, issueId: removed?.id }; currentIssues[source_sub_group_id][source_group_id] = _sourceIssues; currentIssues[destination_sub_group_id][destination_group_id] = _destinationIssues; - - // if (this.rootStore.issueFilter?.userDisplayFilters?.group_by === "state") - // updateIssue = { ...updateIssue, state: destination_group_id }; - // if (this.rootStore.issueFilter?.userDisplayFilters?.group_by === "priority") - // updateIssue = { ...updateIssue, priority: destination_group_id }; } const reorderedIssues = { @@ -249,15 +288,13 @@ class CycleIssueKanBanViewStore implements ICycleIssueKanBanViewStore { this.rootStore.cycleIssue.issues = { ...reorderedIssues }; }); - // console.log("updateIssue", updateIssue); - - // this.rootStore.issueDetail?.updateIssue( - // updateIssue.workspaceSlug, - // updateIssue.projectId, - // updateIssue.issueId, - // updateIssue, - // undefined - // ); + this.rootStore.issueDetail?.updateIssue( + updateIssue.workspaceSlug, + updateIssue.projectId, + updateIssue.issueId, + updateIssue, + undefined + ); } }; @@ -266,7 +303,7 @@ class CycleIssueKanBanViewStore implements ICycleIssueKanBanViewStore { const projectId = this.rootStore?.project?.projectId; const issueType: IIssueType | null = this.rootStore?.issue?.getIssueType; const issueLayout = this.rootStore?.issueFilter?.userDisplayFilters?.layout || null; - const currentIssues: any = this.rootStore.cycleIssue?.getIssues; + const currentIssues: any = this.rootStore.cycleIssue.getIssues; const sortOrderDefaultValue = 65535; @@ -348,23 +385,33 @@ class CycleIssueKanBanViewStore implements ICycleIssueKanBanViewStore { }; } + let issueStatePriority = {}; + if (this.rootStore.issueFilter?.userDisplayFilters?.group_by === "state") { + updateIssue = { ...updateIssue, state: destination_group_id }; + issueStatePriority = { ...issueStatePriority, state: destination_group_id }; + } + if (this.rootStore.issueFilter?.userDisplayFilters?.group_by === "priority") { + updateIssue = { ...updateIssue, priority: destination_group_id }; + issueStatePriority = { ...issueStatePriority, priority: destination_group_id }; + } + const [removed] = _sourceIssues.splice(source.index, 1); if (_destinationIssues && _destinationIssues.length > 0) _destinationIssues.splice(destination.index, 0, { ...removed, sort_order: updateIssue.sort_order, + ...issueStatePriority, }); - else _destinationIssues = [..._destinationIssues, { ...removed, sort_order: updateIssue.sort_order }]; + else + _destinationIssues = [ + ..._destinationIssues, + { ...removed, sort_order: updateIssue.sort_order, ...issueStatePriority }, + ]; updateIssue = { ...updateIssue, issueId: removed?.id }; currentIssues[source_group_id] = _sourceIssues; currentIssues[destination_group_id] = _destinationIssues; } - - if (this.rootStore.issueFilter?.userDisplayFilters?.group_by === "state") - updateIssue = { ...updateIssue, state: destination_group_id }; - if (this.rootStore.issueFilter?.userDisplayFilters?.group_by === "priority") - updateIssue = { ...updateIssue, priority: destination_group_id }; } // user can drag the issues only vertically diff --git a/web/store/module_issue_kanban_view.ts b/web/store/module_issue_kanban_view.ts index c34be7bffd8..629be79dc66 100644 --- a/web/store/module_issue_kanban_view.ts +++ b/web/store/module_issue_kanban_view.ts @@ -82,7 +82,7 @@ class ModuleIssueKanBanViewStore implements IModuleIssueKanBanViewStore { const projectId = this.rootStore?.project?.projectId; const issueType: IIssueType | null = this.rootStore?.issue?.getIssueType; const issueLayout = this.rootStore?.issueFilter?.userDisplayFilters?.layout || null; - const currentIssues: any = this.rootStore.moduleIssue?.getIssues; + const currentIssues: any = this.rootStore.moduleIssue.getIssues; const sortOrderDefaultValue = 65535; @@ -166,20 +166,30 @@ class ModuleIssueKanBanViewStore implements IModuleIssueKanBanViewStore { }; } + let issueStatePriority = {}; + if (this.rootStore.issueFilter?.userDisplayFilters?.group_by === "state") { + updateIssue = { ...updateIssue, state: destination_group_id }; + issueStatePriority = { ...issueStatePriority, state: destination_group_id }; + } + if (this.rootStore.issueFilter?.userDisplayFilters?.group_by === "priority") { + updateIssue = { ...updateIssue, priority: destination_group_id }; + issueStatePriority = { ...issueStatePriority, priority: destination_group_id }; + } + const [removed] = _sourceIssues.splice(source.index, 1); if (_destinationIssues && _destinationIssues.length > 0) _destinationIssues.splice(destination.index, 0, { ...removed, sort_order: updateIssue.sort_order, + ...issueStatePriority, }); - else _destinationIssues = [..._destinationIssues, { ...removed, sort_order: updateIssue.sort_order }]; + else + _destinationIssues = [ + ..._destinationIssues, + { ...removed, sort_order: updateIssue.sort_order, ...issueStatePriority }, + ]; updateIssue = { ...updateIssue, issueId: removed?.id }; - // if (this.rootStore.issueFilter?.userDisplayFilters?.group_by === "state") - // updateIssue = { ...updateIssue, state: destination_group_id }; - // if (this.rootStore.issueFilter?.userDisplayFilters?.group_by === "priority") - // updateIssue = { ...updateIssue, priority: destination_group_id }; - currentIssues[source_sub_group_id][source_group_id] = _sourceIssues; currentIssues[destination_sub_group_id][destination_group_id] = _destinationIssues; } @@ -216,30 +226,59 @@ class ModuleIssueKanBanViewStore implements IModuleIssueKanBanViewStore { }; } + let issueStatePriority = {}; + if (source_group_id === destination_group_id) { + if (this.rootStore.issueFilter?.userDisplayFilters?.sub_group_by === "state") { + updateIssue = { ...updateIssue, state: destination_sub_group_id }; + issueStatePriority = { ...issueStatePriority, state: destination_sub_group_id }; + } + if (this.rootStore.issueFilter?.userDisplayFilters?.sub_group_by === "priority") { + updateIssue = { ...updateIssue, priority: destination_sub_group_id }; + issueStatePriority = { ...issueStatePriority, priority: destination_sub_group_id }; + } + } else { + if (this.rootStore.issueFilter?.userDisplayFilters?.sub_group_by === "state") { + updateIssue = { ...updateIssue, state: destination_sub_group_id, priority: destination_group_id }; + issueStatePriority = { + ...issueStatePriority, + state: destination_sub_group_id, + priority: destination_group_id, + }; + } + if (this.rootStore.issueFilter?.userDisplayFilters?.sub_group_by === "priority") { + updateIssue = { ...updateIssue, state: destination_group_id, priority: destination_sub_group_id }; + issueStatePriority = { + ...issueStatePriority, + state: destination_group_id, + priority: destination_sub_group_id, + }; + } + } + const [removed] = _sourceIssues.splice(source.index, 1); if (_destinationIssues && _destinationIssues.length > 0) _destinationIssues.splice(destination.index, 0, { ...removed, sort_order: updateIssue.sort_order, + ...issueStatePriority, }); - else _destinationIssues = [..._destinationIssues, { ...removed, sort_order: updateIssue.sort_order }]; + else + _destinationIssues = [ + ..._destinationIssues, + { ...removed, sort_order: updateIssue.sort_order, ...issueStatePriority }, + ]; updateIssue = { ...updateIssue, issueId: removed?.id }; currentIssues[source_sub_group_id][source_group_id] = _sourceIssues; currentIssues[destination_sub_group_id][destination_group_id] = _destinationIssues; - - // if (this.rootStore.issueFilter?.userDisplayFilters?.group_by === "state") - // updateIssue = { ...updateIssue, state: destination_group_id }; - // if (this.rootStore.issueFilter?.userDisplayFilters?.group_by === "priority") - // updateIssue = { ...updateIssue, priority: destination_group_id }; } const reorderedIssues = { - ...this.rootStore?.cycleIssue.issues, + ...this.rootStore?.moduleIssue.issues, [projectId]: { - ...this.rootStore?.cycleIssue.issues?.[projectId], + ...this.rootStore?.moduleIssue.issues?.[projectId], [issueType]: { - ...this.rootStore?.cycleIssue.issues?.[projectId]?.[issueType], + ...this.rootStore?.moduleIssue.issues?.[projectId]?.[issueType], [issueType]: currentIssues, }, }, @@ -249,15 +288,13 @@ class ModuleIssueKanBanViewStore implements IModuleIssueKanBanViewStore { this.rootStore.moduleIssue.issues = { ...reorderedIssues }; }); - // console.log("updateIssue", updateIssue); - - // this.rootStore.issueDetail?.updateIssue( - // updateIssue.workspaceSlug, - // updateIssue.projectId, - // updateIssue.issueId, - // updateIssue, - // undefined - // ); + this.rootStore.issueDetail?.updateIssue( + updateIssue.workspaceSlug, + updateIssue.projectId, + updateIssue.issueId, + updateIssue, + undefined + ); } }; @@ -266,7 +303,7 @@ class ModuleIssueKanBanViewStore implements IModuleIssueKanBanViewStore { const projectId = this.rootStore?.project?.projectId; const issueType: IIssueType | null = this.rootStore?.issue?.getIssueType; const issueLayout = this.rootStore?.issueFilter?.userDisplayFilters?.layout || null; - const currentIssues: any = this.rootStore.moduleIssue?.getIssues; + const currentIssues: any = this.rootStore.moduleIssue.getIssues; const sortOrderDefaultValue = 65535; @@ -348,23 +385,33 @@ class ModuleIssueKanBanViewStore implements IModuleIssueKanBanViewStore { }; } + let issueStatePriority = {}; + if (this.rootStore.issueFilter?.userDisplayFilters?.group_by === "state") { + updateIssue = { ...updateIssue, state: destination_group_id }; + issueStatePriority = { ...issueStatePriority, state: destination_group_id }; + } + if (this.rootStore.issueFilter?.userDisplayFilters?.group_by === "priority") { + updateIssue = { ...updateIssue, priority: destination_group_id }; + issueStatePriority = { ...issueStatePriority, priority: destination_group_id }; + } + const [removed] = _sourceIssues.splice(source.index, 1); if (_destinationIssues && _destinationIssues.length > 0) _destinationIssues.splice(destination.index, 0, { ...removed, sort_order: updateIssue.sort_order, + ...issueStatePriority, }); - else _destinationIssues = [..._destinationIssues, { ...removed, sort_order: updateIssue.sort_order }]; + else + _destinationIssues = [ + ..._destinationIssues, + { ...removed, sort_order: updateIssue.sort_order, ...issueStatePriority }, + ]; updateIssue = { ...updateIssue, issueId: removed?.id }; currentIssues[source_group_id] = _sourceIssues; currentIssues[destination_group_id] = _destinationIssues; } - - if (this.rootStore.issueFilter?.userDisplayFilters?.group_by === "state") - updateIssue = { ...updateIssue, state: destination_group_id }; - if (this.rootStore.issueFilter?.userDisplayFilters?.group_by === "priority") - updateIssue = { ...updateIssue, priority: destination_group_id }; } // user can drag the issues only vertically @@ -376,11 +423,11 @@ class ModuleIssueKanBanViewStore implements IModuleIssueKanBanViewStore { } const reorderedIssues = { - ...this.rootStore?.cycleIssue.issues, + ...this.rootStore?.moduleIssue.issues, [projectId]: { - ...this.rootStore?.cycleIssue.issues?.[projectId], + ...this.rootStore?.moduleIssue.issues?.[projectId], [issueType]: { - ...this.rootStore?.cycleIssue.issues?.[projectId]?.[issueType], + ...this.rootStore?.moduleIssue.issues?.[projectId]?.[issueType], [issueType]: currentIssues, }, }, From 1ef1c9af91fcb8c8cb57e0aa7c3673a119e6ef4c Mon Sep 17 00:00:00 2001 From: gurusainath Date: Tue, 10 Oct 2023 11:32:18 +0530 Subject: [PATCH 2/2] chore: updated list and kanban in module --- .../issue-layouts/kanban/module-root.tsx | 20 +++++++--- .../issues/issue-layouts/list/module-root.tsx | 6 +-- .../issue-layouts/module-all-layouts.tsx | 37 ++++++++++++------- 3 files changed, 41 insertions(+), 22 deletions(-) diff --git a/web/components/issues/issue-layouts/kanban/module-root.tsx b/web/components/issues/issue-layouts/kanban/module-root.tsx index 5fa0a0f67a5..5bdc09706e4 100644 --- a/web/components/issues/issue-layouts/kanban/module-root.tsx +++ b/web/components/issues/issue-layouts/kanban/module-root.tsx @@ -14,12 +14,12 @@ export interface IModuleKanBanLayout {} export const ModuleKanBanLayout: React.FC = observer(() => { const { - issue: issueStore, + moduleIssue: moduleIssueStore, issueFilter: issueFilterStore, - issueKanBanView: issueKanBanViewStore, + moduleIssueKanBanView: moduleIssueKanBanViewStore, }: RootStore = useMobxStore(); - const issues = issueStore?.getIssues; + const issues = moduleIssueStore?.getIssues; const sub_group_by: string | null = issueFilterStore?.userDisplayFilters?.sub_group_by || null; @@ -43,12 +43,16 @@ export const ModuleKanBanLayout: React.FC = observer(() => { return; currentKanBanView === "default" - ? issueKanBanViewStore?.handleDragDrop(result.source, result.destination) - : issueKanBanViewStore?.handleSwimlaneDragDrop(result.source, result.destination); + ? moduleIssueKanBanViewStore?.handleDragDrop(result.source, result.destination) + : moduleIssueKanBanViewStore?.handleSwimlaneDragDrop(result.source, result.destination); }; const updateIssue = (sub_group_by: string | null, group_by: string | null, issue: any) => { - issueStore.updateIssueStructure(group_by, sub_group_by, issue); + moduleIssueStore.updateIssueStructure(group_by, sub_group_by, issue); + }; + + const handleKanBanToggle = (toggle: "groupByHeaderMinMax" | "subgroupByIssuesVisibility", value: string) => { + moduleIssueKanBanViewStore.handleKanBanToggle(toggle, value); }; return ( @@ -61,6 +65,8 @@ export const ModuleKanBanLayout: React.FC = observer(() => { group_by={group_by} handleIssues={updateIssue} display_properties={display_properties} + kanBanToggle={moduleIssueKanBanViewStore?.kanBanToggle} + handleKanBanToggle={handleKanBanToggle} /> ) : ( { group_by={group_by} handleIssues={updateIssue} display_properties={display_properties} + kanBanToggle={moduleIssueKanBanViewStore?.kanBanToggle} + handleKanBanToggle={handleKanBanToggle} /> )} diff --git a/web/components/issues/issue-layouts/list/module-root.tsx b/web/components/issues/issue-layouts/list/module-root.tsx index c4929423be2..66f8771f716 100644 --- a/web/components/issues/issue-layouts/list/module-root.tsx +++ b/web/components/issues/issue-layouts/list/module-root.tsx @@ -10,16 +10,16 @@ import { RootStore } from "store/root"; export interface IModuleListLayout {} export const ModuleListLayout: React.FC = observer(() => { - const { issue: issueStore, issueFilter: issueFilterStore }: RootStore = useMobxStore(); + const { issueFilter: issueFilterStore, moduleIssue: moduleIssueStore }: RootStore = useMobxStore(); - const issues = issueStore?.getIssues; + const issues = moduleIssueStore?.getIssues; const group_by: string | null = issueFilterStore?.userDisplayFilters?.group_by || null; const display_properties = issueFilterStore?.userDisplayProperties || null; const updateIssue = (group_by: string | null, issue: any) => { - issueStore.updateIssueStructure(group_by, null, issue); + moduleIssueStore.updateIssueStructure(group_by, null, issue); }; return ( diff --git a/web/components/issues/issue-layouts/module-all-layouts.tsx b/web/components/issues/issue-layouts/module-all-layouts.tsx index bfcf80d4c87..6fb138c06fa 100644 --- a/web/components/issues/issue-layouts/module-all-layouts.tsx +++ b/web/components/issues/issue-layouts/module-all-layouts.tsx @@ -7,34 +7,43 @@ import useSWR from "swr"; import { useMobxStore } from "lib/mobx/store-provider"; // components import { - KanBanLayout, ModuleAppliedFiltersRoot, ModuleCalendarLayout, ModuleGanttLayout, ModuleSpreadsheetLayout, } from "components/issues"; +import { ModuleListLayout } from "components/issues/issue-layouts/list/module-root"; +import { ModuleKanBanLayout } from "components/issues/issue-layouts/kanban/module-root"; export const ModuleAllLayouts: React.FC = observer(() => { const router = useRouter(); - const { workspaceSlug, projectId, moduleId } = router.query; + const { workspaceSlug, projectId, moduleId } = router.query as { + workspaceSlug: string; + projectId: string; + moduleId: string; + }; const { - module: moduleStore, - moduleFilter: moduleFilterStore, project: projectStore, issueFilter: issueFilterStore, + moduleIssue: moduleIssueStore, + moduleFilter: moduleIssueFilterStore, } = useMobxStore(); - useSWR(workspaceSlug && projectId && moduleId ? `MODULE_ISSUES_${moduleId.toString()}` : null, async () => { + useSWR(workspaceSlug && projectId && moduleId ? `CYCLE_ISSUES` : null, async () => { if (workspaceSlug && projectId && moduleId) { - await issueFilterStore.fetchUserProjectFilters(workspaceSlug.toString(), projectId.toString()); + // fetching the project display filters and display properties + await issueFilterStore.fetchUserProjectFilters(workspaceSlug, projectId); + // fetching the cycle filters + await moduleIssueFilterStore.fetchModuleFilters(workspaceSlug, projectId, moduleId); - await projectStore.fetchProjectStates(workspaceSlug.toString(), projectId.toString()); - await projectStore.fetchProjectLabels(workspaceSlug.toString(), projectId.toString()); - await projectStore.fetchProjectMembers(workspaceSlug.toString(), projectId.toString()); + // fetching the project state, labels and members + await projectStore.fetchProjectStates(workspaceSlug, projectId); + await projectStore.fetchProjectLabels(workspaceSlug, projectId); + await projectStore.fetchProjectMembers(workspaceSlug, projectId); - await moduleStore.fetchModuleIssues(workspaceSlug.toString(), projectId.toString(), moduleId.toString()); - await moduleFilterStore.fetchModuleFilters(workspaceSlug.toString(), projectId.toString(), moduleId.toString()); + // fetching the cycle issues + await moduleIssueStore.fetchIssues(workspaceSlug, projectId, moduleId); } }); @@ -44,8 +53,10 @@ export const ModuleAllLayouts: React.FC = observer(() => {
- {activeLayout === "kanban" ? ( - + {activeLayout === "list" ? ( + + ) : activeLayout === "kanban" ? ( + ) : activeLayout === "calendar" ? ( ) : activeLayout === "gantt_chart" ? (