Commit da6253b3dd3a2fbf5040c236775b1c48fd757856 | the-knife

author	Dominic Roy <dominic@goauthentik.io> 2026-08-12 19:13:06-04:00
committer	GitHub <noreply@github.com> 2026-08-12 16:13:06-07:00
log	da6253b3dd3a2fbf5040c236775b1c48fd757856
tree	c40bb9a1cc08f4ce379afac408bca735a5babd66
parent	ac1264e2cab1f357cc683bc52c32bcec23845f32
signature	Signed by PGP key B5690EEEBB952194

web/settings: fix source control scan on relay environments (#6230)

1 files changed, 14 insertions(+), 4 deletions(-)

apps
- web
  - src
    components
    settings
    SourceControlSettings.tsx

apps/web/src/components/settings/SourceControlSettings.tsx+14-4

 @@ -19,7 +19,7 @@ import {
 import { usePrimarySettings, useUpdatePrimarySettings } from "../../hooks/useSettings";
 import { cn } from "../../lib/utils";
-import { usePrimaryEnvironment } from "../../state/environments";
+import { useEnvironments, usePrimaryEnvironment } from "../../state/environments";
 import { useEnvironmentQuery } from "../../state/query";
 import { sourceControlEnvironment } from "../../state/sourceControl";
 import { Badge } from "../ui/badge";
 @@ -508,7 +508,15 @@ function EmptySourceControlDiscovery({
 }
 export function SourceControlSettingsPanel() {
-  const environmentId = usePrimaryEnvironment()?.environmentId ?? null;
+  const { environments } = useEnvironments();
+  const primaryEnvironment = usePrimaryEnvironment();
+  const fallbackEnvironment =
+    environments.find((environment) => environment.connection.phase === "connected") ??
+    environments[0] ??
+    null;
+  const environmentId =
+    primaryEnvironment?.environmentId ?? fallbackEnvironment?.environmentId ?? null;
+  const isPrimaryEnvironment = environmentId === primaryEnvironment?.environmentId;
   const discovery = useEnvironmentQuery(
     environmentId === null
       ? null
 @@ -561,7 +569,9 @@ export function SourceControlSettingsPanel() {
             >
               {result.versionControlSystems.map((item) => (
                 <DiscoveryItemRow key={`vcs:${item.kind}`} item={item}>
-                  {item.kind === "git" ? <GitFetchIntervalSettings /> : undefined}
+                  {item.kind === "git" && isPrimaryEnvironment ? (
+                    <GitFetchIntervalSettings />
+                  ) : undefined}
                 </DiscoveryItemRow>
               ))}
             </SettingsSection>
 @@ -587,7 +597,7 @@ export function SourceControlSettingsPanel() {
         />
       )}
-      {environmentId !== null ? <SourceControlWritingSettingsSection /> : null}
+      {isPrimaryEnvironment ? <SourceControlWritingSettingsSection /> : null}
     </SettingsPageContainer>
   );
 }