Skip to content

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.

Stop built-in views reading as unsaved

Juan Denis16776146546a
diff --git a/frontend/src/components/ds/grid/__tests__/viewState.test.mjs b/frontend/src/components/ds/grid/__tests__/viewState.test.mjs
new file mode 100644
index 00000000..e796bc93
--- /dev/null
+++ b/frontend/src/components/ds/grid/__tests__/viewState.test.mjs
@@ -0,0 +1,52 @@
+// Proving tests for "is this still the view I picked?" (sameViewState).
+//
+// Regression pinned here: picking a BUILT-IN view on any ResourceListPage list
+// (Services ▸ Running, WordPress ▸ Stopped) showed "Unsaved" immediately. The
+// live state always carries the wrapper's page bag ({ filter, search,
+// pageSize }) while a built-in view sets none of pageSize, so the page bags
+// never compared equal.
+//
+// Run: node --test src/components/ds/grid/__tests__/viewState.test.mjs
+
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { sameViewState } from '../viewState.js';
+
+const RUNNING = { match: 'all', rules: [{ id: 'st', field: 'status', op: 'any', value: ['running'] }] };
+
+// What ResourceListPage captures right after a built-in view is applied.
+const live = (page) => ({
+ sorts: [],
+ hiddenKeys: [],
+ columnOrder: null,
+ groupBy: null,
+ columnFilters: { match: 'all', rules: [{ id: 'other-id', field: 'status', op: 'any', value: ['running'] }] },
+ page,
+});
+
+const BUILTIN = { search: '', sorts: [], hiddenKeys: [], columnFilters: RUNNING };
+
+test('a just-picked built-in view is not dirty', () => {
+ assert.equal(sameViewState(live({ filter: undefined, search: undefined, pageSize: 25 }), BUILTIN), true);
+ assert.equal(sameViewState(live({ filter: undefined, search: '', pageSize: 25 }), BUILTIN), true);
+});
+
+test('typing a search after picking a view that clears it is dirty', () => {
+ assert.equal(sameViewState(live({ filter: undefined, search: 'wp', pageSize: 25 }), BUILTIN), false);
+});
+
+test('a page size the view saved still counts', () => {
+ const saved = { ...BUILTIN, page: { pageSize: 50 } };
+ assert.equal(sameViewState(live({ search: '', pageSize: 25 }), saved), false);
+ assert.equal(sameViewState(live({ search: '', pageSize: 50 }), saved), true);
+});
+
+test('a page key the page retired is not a difference', () => {
+ const saved = { ...BUILTIN, page: { bucket: 'old' } };
+ assert.equal(sameViewState(live({ search: '', pageSize: 25 }), saved), true);
+});
+
+test('a different filter rule is dirty', () => {
+ const stopped = { ...BUILTIN, columnFilters: { match: 'all', rules: [{ field: 'status', op: 'none', value: ['running'] }] } };
+ assert.equal(sameViewState(live({ pageSize: 25 }), stopped), false);
+});
diff --git a/frontend/src/components/ds/grid/viewState.js b/frontend/src/components/ds/grid/viewState.js
index fbe5f261..fb345362 100644
--- a/frontend/src/components/ds/grid/viewState.js
+++ b/frontend/src/components/ds/grid/viewState.js
@@ -124,10 +124,19 @@ export function sameViewState(a, b, { rename } = {}) {
// never compare equal again, leaving "Unsaved" pinned on forever with
// nothing the user can do to clear it. A key the live state no longer knows
// about is not a difference the user made.
- const liveKeys = new Set(Object.keys(left.page || {}));
- right.page = Object.fromEntries(
- Object.entries(right.page || {}).filter(([k]) => liveKeys.has(k)),
+ //
+ // The converse holds too: a key the saved view never set (a built-in view
+ // says nothing about page size) is not a difference either, or every
+ // built-in view reads "Unsaved" the moment it is picked. An empty search
+ // and no search are the same state.
+ const savedKeys = new Set(Object.keys(right.page || {}));
+ const shared = new Set(Object.keys(left.page || {}).filter((k) => savedKeys.has(k)));
+ const unset = (v) => v === undefined || v === null || v === '';
+ const clean = (bag) => Object.fromEntries(
+ Object.entries(bag || {}).filter(([k, v]) => shared.has(k) && !unset(v)),
);
+ left.page = clean(left.page);
+ right.page = clean(right.page);
return JSON.stringify(canon(left)) === JSON.stringify(canon(right));
}