gsadmin/headplane
1
0
Fork 0
mirror of https://github.com/tale/headplane.git synced 2026-08-27 15:37:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: handle empty ACLs

Browse Source
This commit is contained in:
Aarnav Tale
2026-04-06 22:48:14 -04:00
parent 10278d0cc9
commit 33f7bbb0cf
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/routes/acls/acl-loader.ts
+4 -1
View File
@@ -38,8 +38,11 @@ export async function aclLoader({ request, context }: Route.LoaderArgs) {
return flags; return flags;
} catch (error) { } catch (error) {
if (isDataWithApiError(error)) { if (isDataWithApiError(error)) {
// Headscale returns "acl policy not found" when the policy mode is
// set to file but no file exists, and returns a 500 when database
// mode is used but the policies table is empty.
// https://github.com/juanfont/headscale/blob/c4600346f9c29b514dc9725ac103efb9d0381f23/hscontrol/types/policy.go#L10 // https://github.com/juanfont/headscale/blob/c4600346f9c29b514dc9725ac103efb9d0381f23/hscontrol/types/policy.go#L10
if (error.data.rawData.includes("acl policy not found")) { if (error.data.rawData.includes("acl policy not found") || error.data.statusCode === 500) {
flags.policy = ""; flags.policy = "";
flags.writable = true; flags.writable = true;
return flags; return flags;
app/routes/acls/overview.tsx
+15 -4
View File
@@ -1,5 +1,5 @@
import { AlertCircle, Construction, Eye, FlaskConical, Pencil } from "lucide-react"; import { AlertCircle, Construction, Eye, FlaskConical, Pencil } from "lucide-react";
import { useEffect, useState } from "react"; import { Suspense, lazy, useEffect, useState } from "react";
import { isRouteErrorResponse, useFetcher, useRevalidator } from "react-router"; import { isRouteErrorResponse, useFetcher, useRevalidator } from "react-router";
import Button from "~/components/button"; import Button from "~/components/button";
@@ -15,7 +15,14 @@ import toast from "~/utils/toast";
import type { Route } from "./+types/overview"; import type { Route } from "./+types/overview";
import { aclAction } from "./acl-action"; import { aclAction } from "./acl-action";
import { aclLoader } from "./acl-loader"; import { aclLoader } from "./acl-loader";
import { Differ, Editor } from "./components/cm.client"; import Fallback from "./components/fallback";
const LazyEditor = lazy(() =>
import("./components/cm.client").then((m) => ({ default: m.Editor })),
);
const LazyDiffer = lazy(() =>
import("./components/cm.client").then((m) => ({ default: m.Differ })),
);
export const loader = aclLoader; export const loader = aclLoader;
export const action = aclAction; export const action = aclAction;
@@ -101,10 +108,14 @@ export default function Page({ loaderData: { access, writable, policy } }: Route
</TabsTab> </TabsTab>
</TabsList> </TabsList>
<TabsPanel value="edit"> <TabsPanel value="edit">
<Editor isDisabled={disabled} onChange={setCodePolicy} value={codePolicy} /> <Suspense fallback={<Fallback acl={codePolicy} />}>
<LazyEditor isDisabled={disabled} onChange={setCodePolicy} value={codePolicy} />
</Suspense>
</TabsPanel> </TabsPanel>
<TabsPanel value="diff"> <TabsPanel value="diff">
<Differ left={policy} right={codePolicy} /> <Suspense fallback={<Fallback acl={codePolicy} />}>
<LazyDiffer left={policy} right={codePolicy} />
</Suspense>
</TabsPanel> </TabsPanel>
<TabsPanel value="preview"> <TabsPanel value="preview">
<div className="flex flex-col items-center py-8"> <div className="flex flex-col items-center py-8">