ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.
Python astracloudflarecontrol-panelcyberpaneldnsfablehosting-control-panelhosting-panelkimi-k3server-managementserverkitubuntu-web-panelwebserver
fix(views): the view bar counted rows the table was not showing
Juan Denis002fb1bccba5
diff --git a/frontend/src/components/ds/grid/useTableChrome.js b/frontend/src/components/ds/grid/useTableChrome.jsindex 17d15358..ec98acc6 100644--- a/frontend/src/components/ds/grid/useTableChrome.js+++ b/frontend/src/components/ds/grid/useTableChrome.js@@ -1,6 +1,6 @@import { useCallback, useMemo, useState } from 'react';import useGridViews from './useGridViews';-import { OPS, emptyValueFor, isFilterable, ruleId, withInferredTypes } from './fields';+import { OPS, applyFilters, emptyValueFor, isFilterable, ruleId, withInferredTypes } from './fields';const NO_FILTERS = { match: 'all', rules: [] };@@ -149,12 +149,24 @@ export function useTableChrome({resetToView: api.resetToView,});+ // What the table will ACTUALLY render. `rows` is the page's own already+ // searched/filtered array; the column rules are applied by <DataTable>+ // itself, so a page counting `rows.length` for its view bar reported "4 of+ // 4" while the table showed 2. Computed here, once, from the same engine+ // the table uses, so the two can never disagree.+ const shownRows = useMemo(+ () => applyFilters(rows, filters, orderedColumns),+ [rows, filters, orderedColumns],+ );+return {cfg,api,views,columns: orderedColumns,noun,+ shownRows,+ shownCount: shownRows.length,filterCount: filters.rules.length,drawerOpen,setDrawerOpen,diff --git a/frontend/src/components/layouts/ResourceListPage.jsx b/frontend/src/components/layouts/ResourceListPage.jsxindex b452dbd7..d579bc61 100644--- a/frontend/src/components/layouts/ResourceListPage.jsx+++ b/frontend/src/components/layouts/ResourceListPage.jsx@@ -173,11 +173,6 @@ export default function ResourceListPage({}};- const pagedItems = useMemo(- () => (pageSize === 'all' ? items : items.slice(0, pageSize)),- [items, pageSize],- );-// The chrome — view picker, chip bar, filter drawer, tools menu, shareable// links — comes from the shared hook rather than being adapted again here.// This wrapper used to carry its own copy of that adapter, which is how it@@ -218,6 +213,15 @@ export default function ResourceListPage({const orderedColumns = chrome.columns;const tableViews = chrome.views;+ // Paged AFTER the column rules, not before. Slicing `items` meant a page+ // size of 25 took 25 unfiltered rows and THEN filtered them, so "show 25"+ // could render three. `chrome.shownRows` is the same set the table renders,+ // so the two agree; DataTable re-applying the rules to it is a no-op.+ const pagedItems = useMemo(+ () => (pageSize === 'all' ? chrome.shownRows : chrome.shownRows.slice(0, pageSize)),+ [chrome.shownRows, pageSize],+ );+if (loading) {// Same wrapper as the loaded state below. A skeleton that renders// outside the page's padded container occupies a different box than the@@ -260,7 +264,7 @@ export default function ResourceListPage({<GridViewPickerviews={tableViews}label={noun}- total={`${items.length} of ${resolvedTotal} ${noun}`}+ total={`${chrome.shownCount} of ${resolvedTotal} ${noun}`}onCreate={chrome.createView}/>)}@@ -365,7 +369,7 @@ export default function ResourceListPage({footer={(<DataTableFootershown={pagedItems.length}- total={items.length}+ total={chrome.shownCount}noun={noun.replace(/s$/, '')}pageSize={pageSize}onPageSizeChange={changePageSize}diff --git a/frontend/src/components/settings/ApiSettingsTab.jsx b/frontend/src/components/settings/ApiSettingsTab.jsxindex 148a5c18..e1ff4197 100644--- a/frontend/src/components/settings/ApiSettingsTab.jsx+++ b/frontend/src/components/settings/ApiSettingsTab.jsx@@ -293,7 +293,7 @@ const ApiKeysSection = () => {<GridViewPickerviews={chrome.views}label="keys"- total={loading ? null : `${keys.length} key${keys.length === 1 ? '' : 's'}`}+ total={loading ? null : `${chrome.shownCount} of ${keys.length} key${keys.length === 1 ? '' : 's'}`}onCreate={chrome.createView}/><ListToolbardiff --git a/frontend/src/components/settings/InvitationsTab.jsx b/frontend/src/components/settings/InvitationsTab.jsxindex d75514e6..bc359b72 100644--- a/frontend/src/components/settings/InvitationsTab.jsx+++ b/frontend/src/components/settings/InvitationsTab.jsx@@ -277,7 +277,7 @@ const InvitationsTab = () => {<GridViewPickerviews={chrome.views}label="invitations"- total={loading ? null : `${invitations.length} invitation${invitations.length === 1 ? '' : 's'}`}+ total={loading ? null : `${chrome.shownCount} of ${invitations.length} invitation${invitations.length === 1 ? '' : 's'}`}onCreate={chrome.createView}/><ListToolbardiff --git a/frontend/src/components/settings/MigrationHistoryTab.jsx b/frontend/src/components/settings/MigrationHistoryTab.jsxindex ef87441f..ddd7b46d 100644--- a/frontend/src/components/settings/MigrationHistoryTab.jsx+++ b/frontend/src/components/settings/MigrationHistoryTab.jsx@@ -309,7 +309,7 @@ const MigrationHistoryTab = () => {<GridViewPickerviews={chrome.views}label="migrations"- total={`${revisions.length} revision${revisions.length === 1 ? '' : 's'}`}+ total={`${chrome.shownCount} of ${revisions.length} revision${revisions.length === 1 ? '' : 's'}`}onCreate={chrome.createView}/><ListToolbardiff --git a/frontend/src/components/settings/UsersTab.jsx b/frontend/src/components/settings/UsersTab.jsxindex 532e2373..95dfcf1f 100644--- a/frontend/src/components/settings/UsersTab.jsx+++ b/frontend/src/components/settings/UsersTab.jsx@@ -360,7 +360,7 @@ const UsersTab = () => {<GridViewPickerviews={chrome.views}label="users"- total={`${users.length} user${users.length === 1 ? '' : 's'}`}+ total={`${chrome.shownCount} of ${users.length} user${users.length === 1 ? '' : 's'}`}onCreate={chrome.createView}/><ListToolbardiff --git a/frontend/src/pages/CronJobs.jsx b/frontend/src/pages/CronJobs.jsxindex c4bc14cb..ccfa779e 100644--- a/frontend/src/pages/CronJobs.jsx+++ b/frontend/src/pages/CronJobs.jsx@@ -467,7 +467,7 @@ const CronJobs = () => {<GridViewPickerviews={chrome.views}label="jobs"- total={`${shown.length} of ${jobs.length} jobs`}+ total={`${chrome.shownCount} of ${jobs.length} jobs`}onCreate={chrome.createView}/><ListToolbar@@ -503,7 +503,7 @@ const CronJobs = () => {rowClassName={(job) => (job.enabled ? undefined : 'is-disabled')}footer={(<DataTableFooter- shown={shown.length}+ shown={chrome.shownCount}total={jobs.length}noun="job"/>diff --git a/frontend/src/pages/DeliveryLog.jsx b/frontend/src/pages/DeliveryLog.jsxindex 91d11a54..e689b9a6 100644--- a/frontend/src/pages/DeliveryLog.jsx+++ b/frontend/src/pages/DeliveryLog.jsx@@ -268,7 +268,7 @@ export default function DeliveryLog() {<GridViewPickerviews={chrome.views}label="deliveries"- total={`${deliveries.length} of ${stats?.total ?? deliveries.length} deliveries`}+ total={`${chrome.shownCount} of ${stats?.total ?? deliveries.length} deliveries`}onCreate={chrome.createView}/><ListToolbardiff --git a/frontend/src/pages/FleetProxy.jsx b/frontend/src/pages/FleetProxy.jsxindex f44eff05..e5ef14e6 100644--- a/frontend/src/pages/FleetProxy.jsx+++ b/frontend/src/pages/FleetProxy.jsx@@ -391,7 +391,7 @@ const FleetProxy = () => {<GridViewPickerviews={chrome.views}label="servers"- total={loading ? null : `${rows.length} server${rows.length === 1 ? '' : 's'}`}+ total={loading ? null : `${chrome.shownCount} of ${rows.length} server${rows.length === 1 ? '' : 's'}`}onCreate={chrome.createView}/><ListToolbardiff --git a/frontend/src/pages/Incidents.jsx b/frontend/src/pages/Incidents.jsxindex 501ac1f9..e1cf64b9 100644--- a/frontend/src/pages/Incidents.jsx+++ b/frontend/src/pages/Incidents.jsx@@ -395,7 +395,7 @@ export default function Incidents() {<GridViewPickerviews={chrome.views}label="incidents"- total={`${shown.length} of ${items.length} · ${openIncidents} open · ${activeAlerts.length} host alerts firing`}+ total={`${chrome.shownCount} of ${items.length} · ${openIncidents} open · ${activeAlerts.length} host alerts firing`}onCreate={chrome.createView}actions={(<>diff --git a/frontend/src/pages/Jobs.jsx b/frontend/src/pages/Jobs.jsxindex bca51ac5..0380e28f 100644--- a/frontend/src/pages/Jobs.jsx+++ b/frontend/src/pages/Jobs.jsx@@ -489,8 +489,8 @@ export default function Jobs() {views={chrome.views}label="jobs"total={hasFilters- ? `${jobs.length} of ${total} matching · ${allJobs} jobs total`- : `${jobs.length} of ${allJobs} jobs`}+ ? `${chrome.shownCount} of ${total} matching · ${allJobs} jobs total`+ : `${chrome.shownCount} of ${allJobs} jobs`}onCreate={chrome.createView}/><ListToolbardiff --git a/frontend/src/pages/Monitors.jsx b/frontend/src/pages/Monitors.jsxindex 8cee598e..79bd9b1a 100644--- a/frontend/src/pages/Monitors.jsx+++ b/frontend/src/pages/Monitors.jsx@@ -461,7 +461,7 @@ export default function Monitors() {label="monitors"total={(<>- {monitors.length} monitor{monitors.length === 1 ? '' : 's'}+ {chrome.shownCount} of {monitors.length} monitor{monitors.length === 1 ? '' : 's'}{stats?.overall_uptime_30d != null && (<> · {stats.overall_uptime_30d}% uptime (30d)</>)}diff --git a/frontend/src/pages/QueueDetail.jsx b/frontend/src/pages/QueueDetail.jsxindex 94713b8d..4602a827 100644--- a/frontend/src/pages/QueueDetail.jsx+++ b/frontend/src/pages/QueueDetail.jsx@@ -389,7 +389,7 @@ const QueueDetail = () => {<GridViewPickerviews={chrome.views}label="messages"- total={`${messages.length} loaded`}+ total={`${chrome.shownCount} of ${messages.length} loaded`}onCreate={chrome.createView}/>diff --git a/frontend/src/pages/QueueOperations.jsx b/frontend/src/pages/QueueOperations.jsxindex 030dc04c..71843b09 100644--- a/frontend/src/pages/QueueOperations.jsx+++ b/frontend/src/pages/QueueOperations.jsx@@ -565,7 +565,7 @@ const QueueOperations = () => {<GridViewPickerviews={chrome.views}label="queues"- total={`${filteredQueues.length} of ${queues.length} queues`}+ total={`${chrome.shownCount} of ${queues.length} queues`}onCreate={chrome.createView}/>diff --git a/frontend/src/pages/Servers.jsx b/frontend/src/pages/Servers.jsxindex 93e973e9..4951b247 100644--- a/frontend/src/pages/Servers.jsx+++ b/frontend/src/pages/Servers.jsx@@ -371,7 +371,7 @@ const Servers = () => {<GridViewPickerviews={chrome.views}label="servers"- total={`${filteredServers.length} of ${servers.length} servers`}+ total={`${chrome.shownCount} of ${servers.length} servers`}onCreate={chrome.createView}/><ListToolbar@@ -446,7 +446,7 @@ const Servers = () => {tableClassName="servers-table"footer={(<DataTableFooter- shown={filteredServers.length}+ shown={chrome.shownCount}total={servers.length}noun="server"/>diff --git a/frontend/src/pages/Telemetry.jsx b/frontend/src/pages/Telemetry.jsxindex 9544f168..ceb0f833 100644--- a/frontend/src/pages/Telemetry.jsx+++ b/frontend/src/pages/Telemetry.jsx@@ -377,7 +377,7 @@ export default function Telemetry() {<GridViewPickerviews={chrome.views}label="events"- total={`${events.length} loaded · ${stats?.total || 0} in the last 24h`}+ total={`${chrome.shownCount} of ${events.length} loaded · ${stats?.total || 0} in the last 24h`}onCreate={chrome.createView}// The "..." sits on the view-name line rather than in a toolbar// of its own -- with nothing else to put there, that toolbar was