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): shareable links on Domains, and a restore guard for saved views
Juan Denise659773bfc78
diff --git a/backend/app/services/recycle_bin_service.py b/backend/app/services/recycle_bin_service.pyindex 6265eee2..89d0e8d0 100644--- a/backend/app/services/recycle_bin_service.py+++ b/backend/app/services/recycle_bin_service.py@@ -158,8 +158,26 @@ def register_builtin_types():pre_restore=pre_restore_domain,on_restore=on_restore_domain,)+ def _pre_restore_view(view):+ # Same partial-unique-index conflict as Domain: deleting a view frees+ # its name AND its slug, so either can be taken by the time you press+ # Restore. Clearing the tombstone would then violate+ # uq_saved_views_user_page_name_live / _slug_live and 500 at commit.+ clash = (SavedView.query_active()+ .filter(SavedView.user_id == view.user_id,+ SavedView.page == view.page,+ SavedView.id != view.id)+ .filter(db.or_(SavedView.name == view.name,+ SavedView.slug == view.slug))+ .first())+ if clash:+ return (f'you already have a “{clash.name}” view on this page '+ f'-- rename it first, or leave this one in the bin')+ return None+register('saved_view', SavedView, noun='saved view',label=lambda v: v.name,description=lambda v: f'{v.page} view',+ pre_restore=_pre_restore_view,)diff --git a/backend/tests/test_recycle_bin.py b/backend/tests/test_recycle_bin.pyindex 543b144d..25d244e5 100644--- a/backend/tests/test_recycle_bin.py+++ b/backend/tests/test_recycle_bin.py@@ -275,3 +275,17 @@ def test_restoring_the_last_domain_re_enables_the_site(app, app_with_domain, monassert seen['create'] >= 1, 'vhost was never written'assert seen['enable'] >= 1, 'vhost written but never enabled — the site stays unserved'+++def test_restoring_a_view_is_refused_when_the_name_was_reused(app):+ """Deleting a view frees its name and slug, so either can be taken by the+ time you press Restore — that must be a refusal, not an IntegrityError."""+ with app.app_context():+ first, _ = saved_view_service.create_view(1, 'domains', 'Triage', {})+ saved_view_service.delete_view(1, first['id'])+ saved_view_service.create_view(1, 'domains', 'Triage', {}) # reuses name + slug++ item, err = recycle_bin_service.restore('saved_view', first['id'])+ assert item is None+ assert 'already have' in err+ assert SavedView.query.get(first['id']).deleted_at is not Nonediff --git a/frontend/src/components/ds/grid/useGridConfig.js b/frontend/src/components/ds/grid/useGridConfig.jsindex d67ae13b..fb67541a 100644--- a/frontend/src/components/ds/grid/useGridConfig.js+++ b/frontend/src/components/ds/grid/useGridConfig.js@@ -1,5 +1,6 @@import { useCallback, useMemo, useState } from 'react';import useTableViews from '@/hooks/useTableViews';+import useViewLink from './useViewLink';import { emptyValueFor, isFilterable, OPS, ruleId } from './fields';// The whole of a grid's chrome is ONE serialisable object, so a saved view is@@ -68,6 +69,11 @@ export function useGridConfig({ page, columns, initial, builtinViews = [] }) {const views = useTableViews({ page, builtinViews, capture, apply });+ // ?view=<slug> / readable params <-> the active view. Same hook the legacy+ // chrome uses, so a DataGrid page and a DataTable page produce and accept+ // the same links.+ const { copyLink } = useViewLink({ views, apply, capture, enabled: !!page });+// ---- narrow setters the menus talk to ------------------------------const patch = useCallback((next) => setCfg((prev) => ({ ...prev, ...next })), []);@@ -179,6 +185,7 @@ export function useGridConfig({ page, columns, initial, builtinViews = [] }) {cfg,setCfg,views,+ copyLink,base,setSort,toggleGroup,diff --git a/frontend/src/pages/Domains.jsx b/frontend/src/pages/Domains.jsxindex f58f911a..48be924c 100644--- a/frontend/src/pages/Domains.jsx+++ b/frontend/src/pages/Domains.jsx@@ -580,6 +580,7 @@ const Domains = () => {noun="domains"onRefresh={loadData}onReset={grid.resetToView}+ onCopyLink={grid.copyLink}onDensity={grid.setDensity}onExported={(n, fields, format) => toast.success(`${n} rows · ${fields} fields · ${format.toUpperCase()}`)}/>