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

Moving to mode replacing http and protocol fields

Browse Source
This commit is contained in:
Owen
2026-05-27 12:04:00 -07:00
parent 464d4990df
commit 06cc13c637
15 changed files with 150 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/[orgId]/settings/resources/proxy/[niceId]/general/page.tsx
View File

@@ -559,7 +559,7 @@ export default function GeneralForm() {
<SettingsContainer>
{resource?.resourceId &&
resource?.orgId &&
resource.browserAccessType == "http" && (
resource.mode == "http" && (
<UptimeAlertSection
orgId={resource.orgId}
resourceId={resource.resourceId}

4
src/app/[orgId]/settings/resources/proxy/[niceId]/layout.tsx
View File

@@ -86,8 +86,8 @@ export default async function ResourceLayout(props: ResourceLayoutProps) {
href: `/{orgId}/settings/resources/proxy/{niceId}/general`
},
{
title: t(`${resource.browserAccessType}Settings`),
href: `/{orgId}/settings/resources/proxy/{niceId}/${resource.browserAccessType}`
title: t(`${resource.mode}Settings`),
href: `/{orgId}/settings/resources/proxy/{niceId}/${resource.mode}`
}
];

18
src/app/[orgId]/settings/resources/proxy/[niceId]/rules/page.tsx
View File

@@ -149,10 +149,7 @@ export default function ResourceRules(props: {
resolver: zodResolver(addRuleSchema),
defaultValues: {
action: "ACCEPT",
match:
resource.http && resource.browserAccessType == "http"
? "PATH"
: "IP",
match: resource.http && resource.mode == "http" ? "PATH" : "IP",
value: ""
}
});
@@ -580,12 +577,11 @@ export default function ResourceRules(props: {
<SelectValue />
</SelectTrigger>
<SelectContent>
{resource.http &&
resource.browserAccessType == "http" && (
<SelectItem value="PATH">
{RuleMatch.PATH}
</SelectItem>
)}
{resource.http && resource.mode == "http" && (
<SelectItem value="PATH">
{RuleMatch.PATH}
</SelectItem>
)}
<SelectItem value="IP">{RuleMatch.IP}</SelectItem>
<SelectItem value="CIDR">{RuleMatch.CIDR}</SelectItem>
{isMaxmindAvailable && (
@@ -1042,7 +1038,7 @@ export default function ResourceRules(props: {
</SelectTrigger>
<SelectContent>
{resource.http &&
resource.browserAccessType ==
resource.mode ==
"http" && (
<SelectItem value="PATH">
{

2
src/app/[orgId]/settings/resources/proxy/create/page.tsx
View File

@@ -423,7 +423,7 @@ export default function Page() {
: undefined,
domainId: httpData.domainId,
protocol: "tcp",
browserAccessType: resourceType,
mode: resourceType,
pamMode,
authDaemonMode: effectiveMode,
authDaemonPort: effectivePort

2
src/app/[orgId]/settings/resources/proxy/page.tsx
View File

@@ -126,7 +126,7 @@ export default async function ProxyResourcesPage(
fullDomain: resource.fullDomain ?? null,
ssl: resource.ssl,
wildcard: resource.wildcard,
browserAccessType: resource.browserAccessType,
mode: resource.mode,
targets: resource.targets?.map((target) => ({
targetId: target.targetId,
ip: target.ip,

12
src/components/ProxyResourcesTable.tsx
View File

@@ -88,7 +88,7 @@ export type ResourceRow = {
name: string;
orgId: string;
domain: string;
browserAccessType: string | null;
mode: string | null;
authState: string;
http: boolean;
protocol: string;
@@ -412,10 +412,7 @@ export default function ProxyResourcesTable({
),
cell: ({ row }) => {
const resourceRow = row.original;
if (
!resourceRow.http ||
resourceRow.browserAccessType !== "http"
) {
if (!resourceRow.http || resourceRow.mode !== "http") {
return <span>-</span>;
}
return (
@@ -446,10 +443,7 @@ export default function ProxyResourcesTable({
header: () => <span className="p-3">{t("uptime30d")}</span>,
cell: ({ row }) => {
const resourceRow = row.original;
if (
!resourceRow.http ||
resourceRow.browserAccessType !== "http"
) {
if (!resourceRow.http || resourceRow.mode !== "http") {
return <span>-</span>;
}
return (

6
src/components/ResourceInfoBox.tsx
View File

@@ -36,9 +36,9 @@ export default function ResourceInfoBox({}: ResourceInfoBoxType) {
resource.fullDomain &&
build != "oss"
);
const showType = !!(resource.http && resource.browserAccessType);
const showType = !!(resource.http && resource.mode);
const showHealth =
!["ssh", "rdp", "vnc"].includes(resource.browserAccessType || "") &&
!["ssh", "rdp", "vnc"].includes(resource.mode || "") &&
!!resource.health &&
resource.health !== "unknown";
const showVisibility = !resource.enabled;
@@ -88,7 +88,7 @@ export default function ResourceInfoBox({}: ResourceInfoBoxType) {
</InfoSectionTitle>
<InfoSectionContent>
<span className="inline-flex items-center">
{resource.browserAccessType!.toUpperCase()}
{resource.mode!.toUpperCase()}
</span>
</InfoSectionContent>
</InfoSection>