alihan/isaiah
1
0
Fork 0
mirror of https://github.com/will-moss/isaiah.git synced 2024-08-22 23:27:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(client): fixed the Jump feature by fixing the code responsible for sorting resources

Browse Source
This commit is contained in:
Will Moss
2024-05-08 00:39:24 +07:00
parent 11be163406
commit 5b67363769
1 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/client/assets/js/isaiah.js
View File

@@ -429,25 +429,7 @@
html += `<div class="tab-content">`;
if (tab.Rows.length > 0) {
html += renderRows(
!tab.SortBy
? tab.Rows
: tab.Rows.sort((a, b) => {
const inReverse = tab.SortBy.startsWith('-');
const key = inReverse ? tab.SortBy.slice(1) : tab.SortBy;
let val1 = a[key];
let val2 = b[key];
const comparisonType = getGeneralType(!val1 ? val2 : val1);
if (comparisonType === 'string')
return !inReverse
? val1.localeCompare(val2)
: val2.localeCompare(val1);
else if (comparisonType === 'numeric')
return !inReverse ? val1 - val2 : val2 - val1;
})
);
html += renderRows(tab.Rows);
}
html += `</div>`;
@@ -1894,7 +1876,7 @@
const isPrivate = cmdString[0] === '_';
const isAllowed = isPrivate ? true : cmdAllowed(cmdString);
console.log(cmdString, isAllowed);
// console.log(cmdString, isAllowed);
if (!isAllowed) return;
@@ -4125,6 +4107,28 @@
{}
);
state.isFullyEmpty = false;
// Perform sort if applicable
state.tabs = state.tabs.map((tab) => ({
...tab,
Rows: !tab.SortBy
? tab.Rows
: tab.Rows.toSorted((a, b) => {
const inReverse = tab.SortBy.startsWith('-');
const key = inReverse ? tab.SortBy.slice(1) : tab.SortBy;
let val1 = a[key];
let val2 = b[key];
const comparisonType = getGeneralType(!val1 ? val2 : val1);
if (comparisonType === 'string')
return !inReverse
? val1.localeCompare(val2)
: val2.localeCompare(val1);
else if (comparisonType === 'numeric')
return !inReverse ? val1 - val2 : val2 - val1;
}),
}));
} else {
state.isFullyEmpty = true;
}