π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
[WEB-4283] fix: update group key handling in issue store utilities for state groups (#7191)
Prateek Shourya6adc721b3479
diff --git a/packages/constants/src/issue/filter.ts b/packages/constants/src/issue/filter.tsindex 2e29474eb8..46275d7519 100644--- a/packages/constants/src/issue/filter.ts+++ b/packages/constants/src/issue/filter.ts@@ -136,45 +136,7 @@ export const ISSUE_DISPLAY_FILTERS_BY_PAGE: TIssueFiltersToDisplayByPageType = {],display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,display_filters: {- group_by: [- "state",- "cycle",- "module",- "state_detail.group",- "priority",- "labels",- "assignees",- "created_by",- null,- ],- order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "-priority"],- type: [null, "active", "backlog"],- },- extra_options: {- access: true,- values: ["show_empty_groups"],- },- },- },- draft_issues: {- list: {- filters: ["priority", "state_group", "cycle", "module", "labels", "start_date", "target_date", "issue_type"],- display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,- display_filters: {- group_by: ["state_detail.group", "cycle", "module", "priority", "project", "labels", null],- order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "-priority"],- type: [null, "active", "backlog"],- },- extra_options: {- access: true,- values: ["show_empty_groups"],- },- },- kanban: {- filters: ["priority", "state_group", "cycle", "module", "labels", "start_date", "target_date", "issue_type"],- display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,- display_filters: {- group_by: ["state_detail.group", "cycle", "module", "priority", "project", "labels"],+ group_by: ["state", "cycle", "module", "priority", "labels", "assignees", "created_by", null],order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "-priority"],type: [null, "active", "backlog"],},diff --git a/web/core/store/issue/helpers/base-issues-utils.ts b/web/core/store/issue/helpers/base-issues-utils.tsindex dcb4e86adb..3317159490 100644--- a/web/core/store/issue/helpers/base-issues-utils.ts+++ b/web/core/store/issue/helpers/base-issues-utils.ts@@ -5,7 +5,6 @@ import isEmpty from "lodash/isEmpty";import orderBy from "lodash/orderBy";import set from "lodash/set";import uniq from "lodash/uniq";-import { runInAction } from "mobx";import { ALL_ISSUES, EIssueFilterType, FILTER_TO_ISSUE_MAP, ISSUE_PRIORITIES } from "@plane/constants";import {IIssueDisplayFilterOptions,@@ -318,10 +317,22 @@ export const getGroupedWorkItemIds = (};}+ // Get the default key for the group by key+ const getDefaultGroupKey = (groupByKey: TIssueGroupByOptions) => {+ switch (groupByKey) {+ case "state_detail.group":+ return "state__group";+ case null:+ return null;+ default:+ return ISSUE_GROUP_BY_KEY[groupByKey];+ }+ };+// Group work items- const groupKey = ISSUE_GROUP_BY_KEY[groupByKey];+ const groupKey = getDefaultGroupKey(groupByKey);const groupedWorkItems = groupBy(workItems, (item) => {- const value = item[groupKey];+ const value = groupKey ? item[groupKey] : null;if (Array.isArray(value)) {if (value.length === 0) return "None";// Sort & join to build deterministic set-like keydiff --git a/web/core/store/issue/helpers/base-issues.store.ts b/web/core/store/issue/helpers/base-issues.store.tsindex b28ff13faa..30ac6fb04d 100644--- a/web/core/store/issue/helpers/base-issues.store.ts+++ b/web/core/store/issue/helpers/base-issues.store.ts@@ -121,7 +121,7 @@ export interface IBaseIssuesStore {export const ISSUE_GROUP_BY_KEY: Record<TIssueDisplayFilterOptions, keyof TIssue> = {project: "project_id",state: "state_id",- "state_detail.group": "state__group" as keyof TIssue, // state_detail.group is only being used for state_group display,+ "state_detail.group": "state_id", // state_detail.group is only being used for state_group display,priority: "priority",labels: "label_ids",created_by: "created_by",@@ -137,7 +137,7 @@ export const ISSUE_FILTER_DEFAULT_DATA: Record<TIssueDisplayFilterOptions, keyofcycle: "cycle_id",module: "module_ids",state: "state_id",- "state_detail.group": "state_group" as keyof TIssue, // state_detail.group is only being used for state_group display,+ "state_detail.group": "state__group", // state_detail.group is only being used for state_group display,priority: "priority",labels: "label_ids",created_by: "created_by",@@ -1594,11 +1594,11 @@ export abstract class BaseIssuesStore implements IBaseIssuesStore {// if unGrouped, then return the path as ALL_ISSUES along with orderByUpdatesif (!this.issueGroupKey) return action ? [{ path: [ALL_ISSUES], action }, ...orderByUpdates] : orderByUpdates;- const issueGroupKey = issue?.[this.issueGroupKey] as string | string[] | null | undefined;+ const issueGroupKeyValue = issue?.[this.issueGroupKey] as string | string[] | null | undefined;const issueBeforeUpdateGroupKey = issueBeforeUpdate?.[this.issueGroupKey] as string | string[] | null | undefined;// if grouped, the get the Difference between the two issue properties (this.issueGroupKey) on which groupBy is performedconst groupActionsArray = getDifference(- this.getArrayStringArray(issue, issueGroupKey, this.groupBy),+ this.getArrayStringArray(issue, issueGroupKeyValue, this.groupBy),this.getArrayStringArray(issueBeforeUpdate, issueBeforeUpdateGroupKey, this.groupBy),action);@@ -1632,7 +1632,7 @@ export abstract class BaseIssuesStore implements IBaseIssuesStore {groupActionsArray,subGroupActionsArray,this.getArrayStringArray(issueBeforeUpdate, issueBeforeUpdateGroupKey, this.groupBy),- this.getArrayStringArray(issue, issueGroupKey, this.groupBy),+ this.getArrayStringArray(issue, issueGroupKeyValue, this.groupBy),this.getArrayStringArray(issueBeforeUpdate, issueBeforeUpdateSubGroupKey, this.subGroupBy),this.getArrayStringArray(issue, issueSubGroupKey, this.subGroupBy)),@@ -1690,12 +1690,13 @@ export abstract class BaseIssuesStore implements IBaseIssuesStore {return issueKeyActions;}- /**- * get the groupByKey issue property on which actions are to be decided in the form of array- * @param value- * @param groupByKey- * @returns an array of issue property values- */+ // /**+ // * Normalizes group values into a consistent string array format+ // * @param issueObject - The issue object to extract values from+ // * @param value - The raw value (string, array, or null/undefined)+ // * @param groupByKey - The group by key to handle special cases+ // * @returns Normalized array of string values+ // */getArrayStringArray = (issueObject: Partial<TIssue> | undefined,value: string | string[] | undefined | null,@@ -1708,9 +1709,23 @@ export abstract class BaseIssuesStore implements IBaseIssuesStore {// if array return the arrayif (Array.isArray(value)) return value;- // if the groupKey is state group then return the group based on state_id+ return this.getDefaultGroupValue(issueObject, value, groupByKey);+ };++ // /**+ // * Gets the default value for a group when the primary value is empty+ // * @param issueObject - The issue object to extract fallback values from+ // * @param groupByKey - The group by key to determine fallback logic+ // * @returns Default group value as string array+ // */+ private getDefaultGroupValue = (+ issueObject: Partial<TIssue>,+ value: string,+ groupByKey?: TIssueGroupByOptions+ ): string[] => {+ // Handle special case for state groupif (groupByKey === "state_detail.group") {- return [this.rootIssueStore.rootStore.state.stateMap?.[value]?.group];+ return [this.rootIssueStore.rootStore.state.stateMap?.[value]?.group ?? issueObject.state__group];}return [value];