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

[WEB-2518] chore: Reverse order by of priority keys (#5591)

Browse source 
* make front end changes for priority orderby reversal

* chore: handled priority ordering in issues pagination

---------

Co-authored-by: gurusainath <gurusainath007@gmail.com>
This commit is contained in:
rahulramesha 2024-09-23 14:58:05 +05:30 • committed by GitHub
parent a05876552c
commit ae1a63f832
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apiserver/plane/utils/order_queryset.py
View file

@ -30,9 +30,9 @@ def order_issue_queryset(issue_queryset, order_by_param="-created_at"):
) )
).order_by("priority_order") ).order_by("priority_order")
order_by_param = ( order_by_param = (
"-priority_order" "priority_order"
if order_by_param.startswith("-") if order_by_param.startswith("-")
else "priority_order" else "-priority_order"
) )
# State Ordering # State Ordering
elif order_by_param in [ elif order_by_param in [

20
web/core/constants/issue.ts
View file

@ -95,7 +95,7 @@ export const ISSUE_ORDER_BY_OPTIONS: {
{ key: "-updated_at", title: "Last Updated" }, { key: "-updated_at", title: "Last Updated" },
{ key: "start_date", title: "Start Date" }, { key: "start_date", title: "Start Date" },
{ key: "target_date", title: "Due Date" }, { key: "target_date", title: "Due Date" },
{ key: "priority", title: "Priority" }, { key: "-priority", title: "Priority" },
]; ];
export const ISSUE_FILTER_OPTIONS: { export const ISSUE_FILTER_OPTIONS: {
@ -208,7 +208,7 @@ export const ISSUE_DISPLAY_FILTERS_BY_LAYOUT: {
display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS, display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,
display_filters: { display_filters: {
group_by: ["state_detail.group", "priority", "project", "labels", null], group_by: ["state_detail.group", "priority", "project", "labels", null],
order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "priority"], order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "-priority"],
type: [null, "active", "backlog"], type: [null, "active", "backlog"],
}, },
extra_options: { extra_options: {
@ -221,7 +221,7 @@ export const ISSUE_DISPLAY_FILTERS_BY_LAYOUT: {
display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS, display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,
display_filters: { display_filters: {
group_by: ["state_detail.group", "priority", "project", "labels"], group_by: ["state_detail.group", "priority", "project", "labels"],
order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "priority"], order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "-priority"],
type: [null, "active", "backlog"], type: [null, "active", "backlog"],
}, },
extra_options: { extra_options: {
@ -257,7 +257,7 @@ export const ISSUE_DISPLAY_FILTERS_BY_LAYOUT: {
"created_by", "created_by",
null, null,
], ],
order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "priority"], order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "-priority"],
type: [null, "active", "backlog"], type: [null, "active", "backlog"],
}, },
extra_options: { extra_options: {
@ -272,7 +272,7 @@ export const ISSUE_DISPLAY_FILTERS_BY_LAYOUT: {
display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS, display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,
display_filters: { display_filters: {
group_by: ["state_detail.group", "cycle", "module", "priority", "project", "labels", null], group_by: ["state_detail.group", "cycle", "module", "priority", "project", "labels", null],
order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "priority"], order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "-priority"],
type: [null, "active", "backlog"], type: [null, "active", "backlog"],
}, },
extra_options: { extra_options: {
@ -285,7 +285,7 @@ export const ISSUE_DISPLAY_FILTERS_BY_LAYOUT: {
display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS, display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,
display_filters: { display_filters: {
group_by: ["state_detail.group", "cycle", "module", "priority", "project", "labels"], group_by: ["state_detail.group", "cycle", "module", "priority", "project", "labels"],
order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "priority"], order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "-priority"],
type: [null, "active", "backlog"], type: [null, "active", "backlog"],
}, },
extra_options: { extra_options: {
@ -357,7 +357,7 @@ export const ISSUE_DISPLAY_FILTERS_BY_LAYOUT: {
display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS, display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,
display_filters: { display_filters: {
group_by: ["state", "priority", "cycle", "module", "labels", "assignees", "created_by", null], group_by: ["state", "priority", "cycle", "module", "labels", "assignees", "created_by", null],
order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "priority"], order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "-priority"],
type: [null, "active", "backlog"], type: [null, "active", "backlog"],
}, },
extra_options: { extra_options: {
@ -383,7 +383,7 @@ export const ISSUE_DISPLAY_FILTERS_BY_LAYOUT: {
display_filters: { display_filters: {
group_by: ["state", "priority", "cycle", "module", "labels", "assignees", "created_by"], group_by: ["state", "priority", "cycle", "module", "labels", "assignees", "created_by"],
sub_group_by: ["state", "priority", "cycle", "module", "labels", "assignees", "created_by", null], sub_group_by: ["state", "priority", "cycle", "module", "labels", "assignees", "created_by", null],
order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "priority", "target_date"], order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "-priority", "target_date"],
type: [null, "active", "backlog"], type: [null, "active", "backlog"],
}, },
extra_options: { extra_options: {
@ -429,7 +429,7 @@ export const ISSUE_DISPLAY_FILTERS_BY_LAYOUT: {
], ],
display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS, display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,
display_filters: { display_filters: {
order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "priority"], order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "-priority"],
type: [null, "active", "backlog"], type: [null, "active", "backlog"],
}, },
extra_options: { extra_options: {
@ -453,7 +453,7 @@ export const ISSUE_DISPLAY_FILTERS_BY_LAYOUT: {
], ],
display_properties: ["key", "issue_type"], display_properties: ["key", "issue_type"],
display_filters: { display_filters: {
order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "priority"], order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "-priority"],
type: [null, "active", "backlog"], type: [null, "active", "backlog"],
}, },
extra_options: { extra_options: {

4
web/core/constants/spreadsheet.ts
View file

@ -115,9 +115,9 @@ export const SPREADSHEET_PROPERTY_DETAILS: {
}, },
priority: { priority: {
title: "Priority", title: "Priority",
ascendingOrderKey: "-priority", ascendingOrderKey: "priority",
ascendingOrderTitle: "None", ascendingOrderTitle: "None",
descendingOrderKey: "priority", descendingOrderKey: "-priority",
descendingOrderTitle: "Urgent", descendingOrderTitle: "Urgent",
icon: Signal, icon: Signal,
Column: SpreadsheetPriorityColumn, Column: SpreadsheetPriorityColumn,

4
web/core/store/issue/helpers/base-issues.store.ts
View file

@ -1744,11 +1744,11 @@ export abstract class BaseIssuesStore implements IBaseIssuesStore {
); );
// custom // custom
case "priority": { case "-priority": {
const sortArray = ISSUE_PRIORITIES.map((i) => i.key); const sortArray = ISSUE_PRIORITIES.map((i) => i.key);
return getIssueIds(orderBy(array, (currentIssue: TIssue) => indexOf(sortArray, currentIssue?.priority))); return getIssueIds(orderBy(array, (currentIssue: TIssue) => indexOf(sortArray, currentIssue?.priority)));
} }
case "-priority": { case "priority": {
const sortArray = ISSUE_PRIORITIES.map((i) => i.key); const sortArray = ISSUE_PRIORITIES.map((i) => i.key);
return getIssueIds( return getIssueIds(
orderBy(array, (currentIssue: TIssue) => indexOf(sortArray, currentIssue?.priority), ["desc"]) orderBy(array, (currentIssue: TIssue) => indexOf(sortArray, currentIssue?.priority), ["desc"])