Skip to content

Dashboard server sorting #5191

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
wants to merge 2 commits into
base: 1.0-develop
Choose a base branch
from
Open

Dashboard server sorting #5191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5b3655
ci(Tests): Add PHP 8.3 to test matrix
danny6167 Jul 25, 2024
08139ba
The servers will now be sorted based on their description.
MrLiam2614 Aug 17, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [8.1, 8.2]
php: [8.1, 8.2, 8.3]
database: ["mariadb:10.2", "mysql:8"]
services:
database:
Expand Down
24 changes: 23 additions & 1 deletion resources/scripts/components/dashboard/DashboardContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,30 @@ export default () => {
() => getServers({ page, type: showOnlyAdmin && rootAdmin ? 'admin' : undefined })
);

const [sortedServers, setSortedServers] = useState<Server[]>([]);

useEffect(() => {
if (!servers) return;

const sorted = servers.items.slice().sort((a, b) => {
const aDescription = a.description || '';
const bDescription = b.description || '';

const aMatch = aDescription.match(/^\[(\d+)\]/);
const bMatch = bDescription.match(/^\[(\d+)\]/);

const aNumber = aMatch ? parseInt(aMatch[1], 10) : Number.MAX_SAFE_INTEGER;
const bNumber = bMatch ? parseInt(bMatch[1], 10) : Number.MAX_SAFE_INTEGER;

if (aNumber === bNumber) {
// Se i numeri sono uguali, ordina per nome
return a.name.localeCompare(b.name);
}

return aNumber - bNumber;
});
setSortedServers(sorted);

if (servers.pagination.currentPage > 1 && !servers.items.length) {
setPage(1);
}
Expand Down Expand Up @@ -65,7 +87,7 @@ export default () => {
{!servers ? (
<Spinner centered size={'large'} />
) : (
<Pagination data={servers} onPageSelect={setPage}>
<Pagination data={{ items: sortedServers, pagination: servers.pagination }} onPageSelect={setPage}>
{({ items }) =>
items.length > 0 ? (
items.map((server, index) => (
Expand Down