Skip to content

refactor: sort routes by id #260

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

Merged
merged 3 commits into from
Sep 29, 2025
Merged

refactor: sort routes by id #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d786c0
refactor: sort routes by id
Ahmedhossamdev Sep 25, 2025
6e8f8d9
refactor: sort routes by short name before handling modal route click
Ahmedhossamdev Sep 25, 2025
a50ade1
chore: formatting
Ahmedhossamdev Sep 25, 2025
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
40 changes: 30 additions & 10 deletions src/components/routes/ViewAllRoutesModal.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,37 @@

function filterRoutes() {
const lowerCaseQuery = query.toLowerCase();
filteredRoutes = routes.filter((route) => {
const shortName = route.shortName?.toLowerCase();
const longNameOrDescription = (route.longName || route.description || '').toLowerCase();
const agencyName = route.agencyInfo?.name?.toLowerCase();
filteredRoutes = routes
.filter((route) => {
const shortName = route.shortName?.toLowerCase();
const longNameOrDescription = (route.longName || route.description || '').toLowerCase();
const agencyName = route.agencyInfo?.name?.toLowerCase();

return (
shortName?.includes(lowerCaseQuery) ||
longNameOrDescription.includes(lowerCaseQuery) ||
agencyName?.includes(lowerCaseQuery)
);
});
return (
shortName?.includes(lowerCaseQuery) ||
longNameOrDescription.includes(lowerCaseQuery) ||
agencyName?.includes(lowerCaseQuery)
);
})
.sort((a, b) => {
const getNumericValue = (route) => {
if (!route.shortName) return Number.MAX_SAFE_INTEGER; // Put routes without shortName at the end

const matches = route.shortName.match(/(\d+)/);
return matches ? parseInt(matches[1], 10) : Number.MAX_SAFE_INTEGER;
};

const aNumeric = getNumericValue(a);
const bNumeric = getNumericValue(b);

// Case 1: Both have numeric values, sort numerically
if (aNumeric !== bNumeric) {
return aNumeric - bNumeric;
}

// Case 2: One has numeric value, the other doesn't, numeric comes first
return (a.shortName || '').localeCompare(b.shortName || '');
});
}
</script>

Expand Down
17 changes: 16 additions & 1 deletion src/components/routes/__tests__/ViewAllRoutesModal.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,22 @@ describe('ViewAllRoutesModal', () => {
.filter((btn) => btn.className.includes('route-item'));
if (routeButtons.length > 0) {
await user.click(routeButtons[0]);
expect(mockHandleModalRouteClick).toHaveBeenCalledWith(mockRoutesListData[0]);

const sortedRoutes = [...mockRoutesListData].sort((a, b) => {
const getNumericValue = (route) => {
if (!route.shortName) return 999999;
const matches = route.shortName.match(/(\d+)/);
return matches ? parseInt(matches[1], 10) : 999999;
};
const aNumeric = getNumericValue(a);
const bNumeric = getNumericValue(b);
if (aNumeric !== bNumeric) {
return aNumeric - bNumeric;
}
return (a.shortName || '').localeCompare(b.shortName || '');
});

expect(mockHandleModalRouteClick).toHaveBeenCalledWith(sortedRoutes[0]);
}
});

Expand Down