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

[WEB-4802] fix: module sort order (#7674)

Browse source 
* fix: module sort order

* chore: removed secondary sort for progress

* chore: sort refactor
This commit is contained in:
Vamsi Krishna 2025-09-09 23:49:30 +05:30 • committed by GitHub
parent 34bdc2ad76
commit 260d9a053d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
packages/utils/src/module.ts
View file

@ -5,6 +5,15 @@ import { IModule, TModuleDisplayFilters, TModuleFilters, TModuleOrderByOptions }
import { getDate } from "./datetime"; import { getDate } from "./datetime";
import { satisfiesDateFilter } from "./filter"; import { satisfiesDateFilter } from "./filter";
const collator = new Intl.Collator("en-US", { numeric: true, sensitivity: "base" });
/**
* @description performs natural sorting of strings (handles numbers within strings correctly)
* @param {string} a - first string to compare
* @param {string} b - second string to compare
* @returns {number} - comparison result (-1, 0, or 1)
*/
const naturalSort = (a: string, b: string): number => collator.compare(a, b);
/** /**
* @description orders modules based on their status * @description orders modules based on their status
* @param {IModule[]} modules * @param {IModule[]} modules
@ -15,8 +24,8 @@ export const orderModules = (modules: IModule[], orderByKey: TModuleOrderByOptio
let orderedModules: IModule[] = []; let orderedModules: IModule[] = [];
if (modules.length === 0 || !orderByKey) return []; if (modules.length === 0 || !orderByKey) return [];
if (orderByKey === "name") orderedModules = sortBy(modules, [(m) => m.name.toLowerCase()]); if (orderByKey === "name") orderedModules = [...modules].sort((a, b) => naturalSort(a.name, b.name));
if (orderByKey === "-name") orderedModules = sortBy(modules, [(m) => m.name.toLowerCase()]).reverse(); if (orderByKey === "-name") orderedModules = [...modules].sort((a, b) => naturalSort(b.name, a.name));
if (["progress", "-progress"].includes(orderByKey)) if (["progress", "-progress"].includes(orderByKey))
orderedModules = sortBy(modules, [ orderedModules = sortBy(modules, [
(m) => { (m) => {
@ -24,13 +33,9 @@ export const orderModules = (modules: IModule[], orderByKey: TModuleOrderByOptio
if (isNaN(progress)) progress = 0; if (isNaN(progress)) progress = 0;
return orderByKey === "progress" ? progress : -progress; return orderByKey === "progress" ? progress : -progress;
}, },
"name",
]); ]);
if (["issues_length", "-issues_length"].includes(orderByKey)) if (["issues_length", "-issues_length"].includes(orderByKey))
orderedModules = sortBy(modules, [ orderedModules = sortBy(modules, [(m) => (orderByKey === "issues_length" ? m.total_issues : !m.total_issues)]);
(m) => (orderByKey === "issues_length" ? m.total_issues : !m.total_issues),
"name",
]);
if (orderByKey === "target_date") orderedModules = sortBy(modules, [(m) => m.target_date]); if (orderByKey === "target_date") orderedModules = sortBy(modules, [(m) => m.target_date]);
if (orderByKey === "-target_date") orderedModules = sortBy(modules, [(m) => !m.target_date]); if (orderByKey === "-target_date") orderedModules = sortBy(modules, [(m) => !m.target_date]);
if (orderByKey === "created_at") orderedModules = sortBy(modules, [(m) => m.created_at]); if (orderByKey === "created_at") orderedModules = sortBy(modules, [(m) => m.created_at]);