calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-06-05 15:26:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Working on ui

Browse Source
This commit is contained in:
Owen
2026-05-31 17:25:03 -07:00
parent cb2ee9c489
commit b99e9a6468
9 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/routers/resource/listResources.ts
View File

@@ -434,7 +434,16 @@ export async function listResources(
.from(targets)
.innerJoin(sites, eq(targets.siteId, sites.siteId))
.where(and(eq(sites.orgId, orgId), eq(sites.siteId, siteId)));
conditions.push(inArray(resources.resourceId, resourcesWithSite));
const resourcesWithBrowserGateway = db
.select({ resourceId: browserGatewayTarget.resourceId })
.from(browserGatewayTarget)
.where(eq(browserGatewayTarget.siteId, siteId));
conditions.push(
or(
inArray(resources.resourceId, resourcesWithSite),
inArray(resources.resourceId, resourcesWithBrowserGateway)
)
);
}
if (isLabelFeatureEnabled && labelFilter && labelFilter.length > 0) {

9
server/routers/siteResource/updateSiteResource.ts
View File

@@ -144,14 +144,13 @@ const updateSiteResourceSchema = z
data.destinationPort <= 65535
);
} else if (data.mode === "ssh") {
// just check the destinationPort
// destinationPort is optional for native mode; allow null/undefined
return (
data.destinationPort === undefined ||
(data.destinationPort !== null &&
data.destinationPort >= 1 &&
data.destinationPort <= 65535)
data.destinationPort == null ||
(data.destinationPort >= 1 && data.destinationPort <= 65535)
);
}
return true;
},
{
message:

4
src/app/[orgId]/settings/resources/client/page.tsx
View File

@@ -1,5 +1,5 @@
import type { InternalResourceRow } from "@app/components/ClientResourcesTable";
import ClientResourcesTable from "@app/components/ClientResourcesTable";
import PrivateResourcesTable from "@app/components/ClientResourcesTable";
import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
import PrivateResourcesBanner from "@app/components/PrivateResourcesBanner";
import { internal } from "@app/lib/api";
@@ -148,7 +148,7 @@ export default async function ClientResourcesPage(
<PrivateResourcesBanner orgId={params.orgId} />
<OrgProvider org={org}>
<ClientResourcesTable
<PrivateResourcesTable
internalResources={internalResourceRows}
orgId={params.orgId}
rowCount={pagination.total}

2
src/components/ContainersSelector.tsx
View File

@@ -130,7 +130,7 @@ const DockerContainersTable: FC<{
useState(true);
const [hideStoppedContainers, setHideStoppedContainers] = useState(false);
const [columnVisibility, setColumnVisibility] = useState<VisibilityState>({
labels: false
labels: true
});
const t = useTranslations();

16
src/components/MachineClientsTable.tsx
View File

@@ -24,17 +24,12 @@ import {
ArrowUp10Icon,
ChevronsUpDownIcon,
CircleSlash,
MoreHorizontal,
MoreHorizontal
} from "lucide-react";
import { useTranslations } from "next-intl";
import Link from "next/link";
import { useRouter } from "next/navigation";
import {
startTransition,
useMemo,
useState,
useTransition
} from "react";
import { startTransition, useMemo, useState, useTransition } from "react";
import { useDebouncedCallback } from "use-debounce";
import z from "zod";
import { ColumnFilterButton } from "./ColumnFilterButton";
@@ -110,7 +105,7 @@ export default function MachineClientsTable({
subnet: false,
userId: false,
niceId: false,
labels: false
labels: true
};
const refreshData = () => {
@@ -614,7 +609,10 @@ function MachineClientLabelCell({
}: MachineClientLabelCellProps) {
const t = useTranslations();
const api = createApiClient(useEnvContext());
const [localLabels, setLocalLabels] = useLocalLabels(client.labels, client.id);
const [localLabels, setLocalLabels] = useLocalLabels(
client.labels,
client.id
);
function toggleClientLabel(
label: SelectedLabel,

4
src/components/PrivateResourceForm.tsx
View File

@@ -1128,9 +1128,7 @@ export function PrivateResourceForm({
/>
</div>
)}
{(mode === "host" ||
(mode === "ssh" &&
sshServerMode !== "native")) && (
{(mode === "host" || mode === "ssh") && (
<div className="min-w-0">
<FormField
control={form.control}

21
src/components/ClientResourcesTable.tsx → src/components/PrivateResourcesTable.tsx
View File

@@ -129,7 +129,7 @@ type ClientResourcesTableProps = {
initialFilterSite?: Selectedsite | null;
};
export default function ClientResourcesTable({
export default function PrivateResourcesTable({
internalResources,
orgId,
pagination,
@@ -400,13 +400,16 @@ export default function ClientResourcesTable({
cell: ({ row }) => {
const resourceRow = row.original;
const display = formatDestinationDisplay(resourceRow);
return (
<CopyToClipboard
text={display}
isLink={false}
displayText={display}
/>
);
if (resourceRow.destination) {
return (
<CopyToClipboard
text={display}
isLink={false}
displayText={display}
/>
);
}
return <span>-</span>;
}
},
{
@@ -656,7 +659,7 @@ export default function ClientResourcesTable({
columnVisibility={{
niceId: false,
aliasAddress: false,
labels: false
labels: true
}}
stickyLeftColumn="name"
stickyRightColumn="actions"

2
src/components/ProxyResourcesTable.tsx
View File

@@ -755,7 +755,7 @@ export default function ProxyResourcesTable({
columnVisibility={{
niceId: false,
protocol: false,
labels: false
labels: true
}}
stickyLeftColumn="name"
stickyRightColumn="actions"

4
src/components/SitesTable.tsx
View File

@@ -36,7 +36,7 @@ import {
ArrowUpRight,
ChevronDown,
ChevronsUpDownIcon,
MoreHorizontal,
MoreHorizontal
} from "lucide-react";
import { useTranslations } from "next-intl";
import Link from "next/link";
@@ -670,7 +670,7 @@ export default function SitesTable({
nice: false,
exitNode: false,
address: false,
labels: false
labels: true
}}
enableColumnVisibility
stickyLeftColumn="name"