github/plane
0
0
Fork 1
mirror of https://github.com/makeplane/plane synced 2024-06-14 14:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:makeplane/plane into develop

Browse Source
This commit is contained in:
sriram veeraghanta 2024-06-13 21:17:17 +05:30
commit c9147e7a57
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
web/core/store/issue/helpers/base-issues.store.ts
View File

@ -1465,10 +1465,12 @@ export abstract class BaseIssuesStore implements IBaseIssuesStore {
// if unGrouped, then return the path as ALL_ISSUES along with orderByUpdates // if unGrouped, then return the path as ALL_ISSUES along with orderByUpdates
if (!this.issueGroupKey) return action ? [{ path: [ALL_ISSUES], action }, ...orderByUpdates] : orderByUpdates; if (!this.issueGroupKey) return action ? [{ path: [ALL_ISSUES], action }, ...orderByUpdates] : orderByUpdates;
const issueGroupKey = 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 performed // if grouped, the get the Difference between the two issue properties (this.issueGroupKey) on which groupBy is performed
const groupActionsArray = getDifference( const groupActionsArray = getDifference(
this.getArrayStringArray(issue, issue?.[this.issueGroupKey], this.groupBy), this.getArrayStringArray(issue, issueGroupKey, this.groupBy),
this.getArrayStringArray(issueBeforeUpdate, issueBeforeUpdate?.[this.issueGroupKey], this.groupBy), this.getArrayStringArray(issueBeforeUpdate, issueBeforeUpdateGroupKey, this.groupBy),
action action
); );
@ -1482,10 +1484,16 @@ export abstract class BaseIssuesStore implements IBaseIssuesStore {
...orderByUpdates, ...orderByUpdates,
]; ];
const issueSubGroupKey = issue?.[this.issueSubGroupKey] as string | string[] | null | undefined;
const issueBeforeUpdateSubGroupKey = issueBeforeUpdate?.[this.issueSubGroupKey] as
| string
| string[]
| null
| undefined;
// if subGrouped, the get the Difference between the two issue properties (this.issueGroupKey) on which subGroupBy is performed // if subGrouped, the get the Difference between the two issue properties (this.issueGroupKey) on which subGroupBy is performed
const subGroupActionsArray = getDifference( const subGroupActionsArray = getDifference(
this.getArrayStringArray(issue, issue?.[this.issueSubGroupKey], this.subGroupBy), this.getArrayStringArray(issue, issueSubGroupKey, this.subGroupBy),
this.getArrayStringArray(issueBeforeUpdate, issueBeforeUpdate?.[this.issueSubGroupKey], this.subGroupBy), this.getArrayStringArray(issueBeforeUpdate, issueBeforeUpdateSubGroupKey, this.subGroupBy),
action action
); );
@ -1494,10 +1502,10 @@ export abstract class BaseIssuesStore implements IBaseIssuesStore {
...getSubGroupIssueKeyActions( ...getSubGroupIssueKeyActions(
groupActionsArray, groupActionsArray,
subGroupActionsArray, subGroupActionsArray,
this.getArrayStringArray(issueBeforeUpdate, issueBeforeUpdate?.[this.issueGroupKey], this.groupBy), this.getArrayStringArray(issueBeforeUpdate, issueBeforeUpdateGroupKey, this.groupBy),
this.getArrayStringArray(issue, issue?.[this.issueGroupKey], this.groupBy), this.getArrayStringArray(issue, issueGroupKey, this.groupBy),
this.getArrayStringArray(issueBeforeUpdate, issueBeforeUpdate?.[this.issueSubGroupKey], this.subGroupBy), this.getArrayStringArray(issueBeforeUpdate, issueBeforeUpdateSubGroupKey, this.subGroupBy),
this.getArrayStringArray(issue, issue?.[this.issueSubGroupKey], this.subGroupBy) this.getArrayStringArray(issue, issueSubGroupKey, this.subGroupBy)
), ),
...orderByUpdates, ...orderByUpdates,
]; ];
@ -1525,9 +1533,10 @@ export abstract class BaseIssuesStore implements IBaseIssuesStore {
// if they are not equal and issues are not grouped then, provide path as ALL_ISSUES // if they are not equal and issues are not grouped then, provide path as ALL_ISSUES
if (!this.issueGroupKey) return [{ path: [ALL_ISSUES], action: EIssueGroupedAction.REORDER }]; if (!this.issueGroupKey) return [{ path: [ALL_ISSUES], action: EIssueGroupedAction.REORDER }];
const issueGroupKey = issue?.[this.issueGroupKey] as string | string[] | null | undefined;
// if they are grouped then identify the paths based on props on which group by is dependent on // if they are grouped then identify the paths based on props on which group by is dependent on
const issueKeyActions: { path: string[]; action: EIssueGroupedAction.REORDER }[] = []; const issueKeyActions: { path: string[]; action: EIssueGroupedAction.REORDER }[] = [];
const groupByValues = this.getArrayStringArray(issue, issue[this.issueGroupKey]); const groupByValues = this.getArrayStringArray(issue, issueGroupKey);
// if issues are not subGrouped then, provide path from groupByValues // if issues are not subGrouped then, provide path from groupByValues
if (!this.issueSubGroupKey) { if (!this.issueSubGroupKey) {
@ -1538,8 +1547,9 @@ export abstract class BaseIssuesStore implements IBaseIssuesStore {
return issueKeyActions; return issueKeyActions;
} }
const issueSubGroupKey = issue?.[this.issueSubGroupKey] as string | string[] | null | undefined;
// if they are grouped then identify the paths based on props on which sub group by is dependent on // if they are grouped then identify the paths based on props on which sub group by is dependent on
const subGroupByValues = this.getArrayStringArray(issue, issue[this.issueSubGroupKey]); const subGroupByValues = this.getArrayStringArray(issue, issueSubGroupKey);
// if issues are subGrouped then, provide path from subGroupByValues // if issues are subGrouped then, provide path from subGroupByValues
for (const groupKey of groupByValues) { for (const groupKey of groupByValues) {