binarybeach/bb-plane-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: states order (#498)

Browse source 
* fix: order of states in the kanban board

* fix: state name in list view
This commit is contained in:
Aaryan Khandelwal 2023-03-23 01:00:50 +05:30 • committed by GitHub
parent 4e3c9397ea
commit 79249c5c9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 37 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
apps/app/hooks/use-issues-view.tsx
View file

@ -15,12 +15,15 @@ import {
CYCLE_ISSUES_WITH_PARAMS,
MODULE_ISSUES_WITH_PARAMS,
PROJECT_ISSUES_LIST_WITH_PARAMS,
STATE_LIST,
VIEW_ISSUES,
} from "constants/fetch-keys";
// types
import type { IIssue } from "types";
import viewsService from "services/views.service";
import stateService from "services/state.service";
import { getStatesList } from "helpers/state.helper";
const useIssuesView = () => {
const {
@ -96,6 +99,19 @@ const useIssuesView = () => {
: null
);
const { data: states } = useSWR(
workspaceSlug && projectId ? STATE_LIST(projectId as string) : null,
workspaceSlug && projectId
? () => stateService.getStates(workspaceSlug as string, projectId as string)
: null
);
const statesList = getStatesList(states ?? {});
const stateIds = statesList.map((state) => state.id);
let emptyStatesObject: { [key: string]: [] } = {};
for (let i = 0; i < stateIds.length; i++) {
emptyStatesObject[stateIds[i]] = [];
}
const groupedByIssues:
| {
[key: string]: IIssue[];
@ -104,7 +120,9 @@ const useIssuesView = () => {
const issuesToGroup = cycleIssues ?? moduleIssues ?? projectIssues;
if (Array.isArray(issuesToGroup)) return { allIssues: issuesToGroup };
else return issuesToGroup;
if (groupByProperty === "state") return Object.assign(emptyStatesObject, issuesToGroup);
return issuesToGroup;
}, [projectIssues, cycleIssues, moduleIssues]);
return {