refactor(settings): replace modal with nested full-page route (#848)

* refactor(settings): replace modal with nested full-page route

Settings sections are now URL-addressable at /settings/:sectionId, rendered
nested inside EditorLayout alongside the stack sidebar. Browser back/forward
navigates between sections. Deep links (e.g. /settings/cloud-backup) load
the section directly on hard reload.

- Add react-router-dom v7; BrowserRouter wraps the full app tree
- New SettingsPage (scroll memory, Cmd+K palette), SettingsSidebar (NavLink
  active styling, back-arrow), SectionGate (visibility + tier lock card)
- Rename SectionId 'appstore' to 'app-store' so slug === SectionId
- Decouple SystemSection, DeveloperSection, AppStoreSection from modal-
  passed props; each fetches its own data on mount
- Replace onLabelsChanged prop chain with SENCHO_LABELS_CHANGED window event
- Drop onOpenSettings prop from UserProfileDropdown, HomeDashboard,
  ConfigurationStatus; each calls useNavigate directly
- Delete SettingsModal.tsx

* fix(settings): validate sectionId against registry before property write

Prevents prototype pollution (CodeQL js/remote-property-injection #243).
URL param sectionId is checked against SETTINGS_ITEMS before being used
as a property key on scrollPositionsRef.

* fix(settings): eliminate remote property injection via Map and registry-sourced key

Two-part fix for CodeQL js/remote-property-injection:

1. currentSection is now derived from SETTINGS_ITEMS.find().id (trusted
   registry data) instead of the raw sectionId URL param. The tainted
   string never flows into any property access.

2. scrollPositionsRef uses Map<SectionId, number> with .get()/.set()
   instead of a plain object. Map operations do not write to the prototype
   chain, removing the prototype pollution vector entirely.

* test(e2e): align settings selectors with full-page route

The settings refactor (4475afd) replaced the modal with a nested route.
The new sidebar renders sub-sections as NavLinks (role link, not button)
and adds a "Filter settings" button that collides with the loose
/settings/i regex used in mfa and nodes specs.

- Use exact 'Settings' match for the profile-dropdown menu row
- Switch the Nodes sub-section selector from button to link role
This commit is contained in:
Anso
2026-04-30 12:57:02 -04:00
committed by GitHub
parent 3c30c2befe
commit 9a1c043189
21 changed files with 834 additions and 624 deletions
@@ -1,4 +1,4 @@
import { useState } from 'react';
import { useState, useRef, useEffect } from 'react';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label';
@@ -6,15 +6,6 @@ import { Skeleton } from '@/components/ui/skeleton';
import { toast } from '@/components/ui/toast-store';
import { apiFetch } from '@/lib/api';
import { RefreshCw } from 'lucide-react';
import type { PatchableSettings } from './types';
interface AppStoreSectionProps {
settings: PatchableSettings;
onSettingChange: <K extends keyof PatchableSettings>(key: K, value: PatchableSettings[K]) => void;
isLoading: boolean;
/** Called after a successful save so the parent can update serverSettingsRef */
onSaved: (key: keyof PatchableSettings, value: string) => void;
}
function SettingsSkeleton() {
return (
@@ -30,22 +21,50 @@ function SettingsSkeleton() {
);
}
export function AppStoreSection({ settings, onSettingChange, isLoading, onSaved }: AppStoreSectionProps) {
export function AppStoreSection() {
const [templateRegistryUrl, setTemplateRegistryUrl] = useState('');
const serverUrl = useRef('');
const [isLoading, setIsLoading] = useState(false);
const [isSavingRegistry, setIsSavingRegistry] = useState(false);
useEffect(() => {
const fetchSettings = async () => {
setIsLoading(true);
try {
const res = await apiFetch('/settings');
if (res.ok) {
const data: Record<string, string> = await res.json();
const url = data.template_registry_url ?? '';
setTemplateRegistryUrl(url);
serverUrl.current = url;
}
} catch (e) {
console.error('Failed to fetch app store settings', e);
} finally {
setIsLoading(false);
}
};
fetchSettings();
}, []);
const saveRegistrySettings = async () => {
const trimmedUrl = templateRegistryUrl.trim();
if (trimmedUrl && !/^https?:\/\/./.test(trimmedUrl)) {
toast.error('Registry URL must start with http:// or https://');
return;
}
setIsSavingRegistry(true);
try {
const res = await apiFetch('/settings', {
method: 'PATCH',
body: JSON.stringify({ template_registry_url: settings.template_registry_url ?? '' }),
body: JSON.stringify({ template_registry_url: trimmedUrl }),
});
if (!res.ok) {
const err = await res.json().catch(() => ({}));
toast.error(err?.error || err?.message || 'Failed to save registry settings.');
return;
}
onSaved('template_registry_url', settings.template_registry_url ?? '');
serverUrl.current = templateRegistryUrl;
await apiFetch('/templates/refresh-cache', { method: 'POST' });
toast.success('Registry saved. App Store will reload from the new source.');
} catch (e: unknown) {
@@ -77,8 +96,8 @@ export function AppStoreSection({ settings, onSettingChange, isLoading, onSaved
</div>
<Input
placeholder="https://example.com/templates.json"
value={settings.template_registry_url ?? ''}
onChange={(e) => onSettingChange('template_registry_url', e.target.value)}
value={templateRegistryUrl}
onChange={(e) => setTemplateRegistryUrl(e.target.value)}
/>
<p className="text-xs text-muted-foreground">Leave empty to use the default LinuxServer.io registry.</p>
</div>
@@ -88,8 +107,8 @@ export function AppStoreSection({ settings, onSettingChange, isLoading, onSaved
<Button
variant="outline"
size="sm"
onClick={() => onSettingChange('template_registry_url', '')}
disabled={isSavingRegistry || !settings.template_registry_url}
onClick={() => setTemplateRegistryUrl('')}
disabled={isSavingRegistry || !templateRegistryUrl}
>
Reset to Default
</Button>