From 4ae37919c0f1f2db9cd31e6739fa6c3e04812168 Mon Sep 17 00:00:00 2001
From: Eduard Gert <kontakt@eduardgert.de>
Date: Tue, 16 Jun 2026 12:24:06 +0200
Subject: [PATCH] keep general settings tab visible when update settings are
 locked

---
 .../frontend/src/modules/settings/SettingsGeneral.tsx  |  6 +++---
 .../src/modules/settings/SettingsNavigation.tsx        | 10 +++++-----
 .../ui/frontend/src/modules/settings/SettingsPage.tsx  |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/client/ui/frontend/src/modules/settings/SettingsGeneral.tsx b/client/ui/frontend/src/modules/settings/SettingsGeneral.tsx
index 13b692776..a1db1ab39 100644
--- a/client/ui/frontend/src/modules/settings/SettingsGeneral.tsx
+++ b/client/ui/frontend/src/modules/settings/SettingsGeneral.tsx
@@ -18,7 +18,7 @@ export function SettingsGeneral() {
     const { autostart, setAutostartEnabled } = useAutostartSetting();
     const { mode, setMode, setUrl, displayUrl, showError, canSave, save, checking, unreachable } =
         useManagementUrl();
-    const { mdm } = useRestrictions();
+    const { mdm, features } = useRestrictions();
 
     const inputRef = useRef<HTMLInputElement>(null);
     const prevMode = useRef(mode);
@@ -39,7 +39,7 @@ export function SettingsGeneral() {
                     label={t("settings.general.notifications.label")}
                     helpText={t("settings.general.notifications.help")}
                 />
-                {!mdm.disableAutoConnect && (
+                {!mdm.disableAutoConnect && !features.disableUpdateSettings && (
                     <FancyToggleSwitch
                         value={!config.disableAutoConnect}
                         onChange={(v) => setField("disableAutoConnect", !v)}
@@ -58,7 +58,7 @@ export function SettingsGeneral() {
                 )}
             </SectionGroup>
 
-            {!mdm.managementURL && (
+            {!mdm.managementURL && !features.disableUpdateSettings && (
                 <SectionGroup title={t("settings.general.section.connection")}>
                     <div>
                         <div className={"flex items-start gap-3"}>
diff --git a/client/ui/frontend/src/modules/settings/SettingsNavigation.tsx b/client/ui/frontend/src/modules/settings/SettingsNavigation.tsx
index 13dbbe30f..61f330230 100644
--- a/client/ui/frontend/src/modules/settings/SettingsNavigation.tsx
+++ b/client/ui/frontend/src/modules/settings/SettingsNavigation.tsx
@@ -30,13 +30,13 @@ export const SettingsNavigation = () => {
     return (
         <div className={"flex flex-col w-52 shrink-0 items-center select-none"}>
             <VerticalTabs.List>
+                <VerticalTabs.Trigger
+                    value={"general"}
+                    icon={SlidersHorizontalIcon}
+                    title={t("settings.tabs.general")}
+                />
                 {!features.disableUpdateSettings && (
                     <>
-                        <VerticalTabs.Trigger
-                            value={"general"}
-                            icon={SlidersHorizontalIcon}
-                            title={t("settings.tabs.general")}
-                        />
                         <VerticalTabs.Trigger
                             value={"network"}
                             icon={NetworkIcon}
diff --git a/client/ui/frontend/src/modules/settings/SettingsPage.tsx b/client/ui/frontend/src/modules/settings/SettingsPage.tsx
index 49ba99754..0624cdc96 100644
--- a/client/ui/frontend/src/modules/settings/SettingsPage.tsx
+++ b/client/ui/frontend/src/modules/settings/SettingsPage.tsx
@@ -50,7 +50,7 @@ export const SettingsPage = () => {
     const visibleTabs = useMemo<Tab[]>(() => {
         const editable = !features.disableUpdateSettings;
         const visibility: Record<Tab, boolean> = {
-            [Tab.General]: editable,
+            [Tab.General]: true,
             [Tab.Network]: editable,
             [Tab.Security]: editable,
             [Tab.Profiles]: !features.disableProfiles,