Skip to content

Fix Users table sort logic #526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tommywhitney wants to merge 1 commit into
base: unstable
Choose a base branch
from
Open

Fix Users table sort logic #526

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 16 additions & 49 deletions src/pages/users.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,61 +313,28 @@ function Users() {
setPage((prevPage) => prevPage - 1);
};

function formatLastSeenTime(time) {
if (!time) {
return " never";
}
const units = {
days: [i18next.t("UNITS.DAY"), i18next.t("UNITS.DAYS")],
hours: [i18next.t("UNITS.HOUR"), i18next.t("UNITS.HOUR")],
minutes: [i18next.t("UNITS.MINUTE"), i18next.t("UNITS.MINUTES")],
seconds: [i18next.t("UNITS.SECOND"), i18next.t("UNITS.SECONDS")],
};

let formattedTime = "";

for (const unit in units) {
if (time[unit]) {
const unitName = units[unit][time[unit] > 1 ? 1 : 0];
formattedTime += `${time[unit]} ${unitName} `;
}
}

return `${formattedTime}`;
function getTimeInSeconds(time) {
if (!time) return 0;
const secondsPerMinute = 60;
const secondsPerHour = secondsPerMinute * 60;
const secondsPerDay = secondsPerHour * 24;
return (time.days || 0) * secondsPerDay + (time.hours || 0) * secondsPerHour + (time.minutes || 0) * secondsPerMinute + (time.seconds || 0);
}

function descendingComparator(a, b, orderBy) {
if (orderBy === "LastSeen") {
let order_a = formatLastSeenTime(a[orderBy]);
let order_b = formatLastSeenTime(b[orderBy]);
if (order_b > order_a) {
return -1;
}
if (order_a < order_b) {
return 1;
}
return 0;
}

if (orderBy === "TotalPlays" || orderBy === "TotalWatchTime") {
let order_a = parseInt(a[orderBy]);
let order_b = parseInt(b[orderBy]);
let valA = a[orderBy];
let valB = b[orderBy];

if (order_a < order_b) {
return -1;
}
if (order_a > order_b) {
return 1;
}
return 0;
if (orderBy === "LastSeen") {
valA = getTimeInSeconds(valA);
valB = getTimeInSeconds(valB);
} else if (orderBy === "TotalPlays" || orderBy === "TotalWatchTime") {
valA = parseInt(valA);
valB = parseInt(valB);
}

if (b[orderBy] < a[orderBy]) {
return -1;
}
if (b[orderBy] > a[orderBy]) {
return 1;
}
if (valB < valA) return -1;
if (valB > valA) return 1;
return 0;
}

Expand Down