calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-05-17 22:44:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly respect flags.disableEnterpriseFeatures

Browse Source
This commit is contained in:
Owen
2026-05-06 16:13:07 -07:00
parent ac0d88d9b7
commit 998364b09d
4 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
messages/en-US.json
View File

@@ -2660,19 +2660,19 @@
"noMoreAuthMethods": "No Valid Auth", "noMoreAuthMethods": "No Valid Auth",
"ip": "IP", "ip": "IP",
"reason": "Reason", "reason": "Reason",
"requestLogs": "HTTPS Request Logs", "requestLogs": "HTTP Request Logs",
"requestAnalytics": "Request Analytics", "requestAnalytics": "Request Analytics",
"host": "Host", "host": "Host",
"location": "Location", "location": "Location",
"actionLogs": "Admin Action Logs", "actionLogs": "Admin Action Logs",
"sidebarLogsRequest": "HTTPS Request Logs", "sidebarLogsRequest": "HTTP Request Logs",
"sidebarLogsAccess": "Authentication Logs", "sidebarLogsAccess": "Authentication Logs",
"sidebarLogsAction": "Admin Action Logs", "sidebarLogsAction": "Admin Action Logs",
"logRetention": "Log Retention", "logRetention": "Log Retention",
"logRetentionDescription": "Manage how long different types of logs are retained for this organization or disable them", "logRetentionDescription": "Manage how long different types of logs are retained for this organization or disable them",
"requestLogsDescription": "View detailed request logs for HTTPS resources in this organization", "requestLogsDescription": "View detailed request logs for HTTPS resources in this organization",
"requestAnalyticsDescription": "View detailed request analytics for resources in this organization", "requestAnalyticsDescription": "View detailed request analytics for resources in this organization",
"logRetentionRequestLabel": "HTTPS Request Log Retention", "logRetentionRequestLabel": "HTTP Request Log Retention",
"logRetentionRequestDescription": "How long to retain request logs", "logRetentionRequestDescription": "How long to retain request logs",
"logRetentionAccessLabel": "Authentication Log Retention", "logRetentionAccessLabel": "Authentication Log Retention",
"logRetentionAccessDescription": "How long to retain access logs", "logRetentionAccessDescription": "How long to retain access logs",
@@ -3134,7 +3134,7 @@
"httpDestActionLogsDescription": "Administrative actions performed by users within the organization.", "httpDestActionLogsDescription": "Administrative actions performed by users within the organization.",
"httpDestConnectionLogsTitle": "Network Logs", "httpDestConnectionLogsTitle": "Network Logs",
"httpDestConnectionLogsDescription": "Site and tunnel connection events, including connects and disconnects.", "httpDestConnectionLogsDescription": "Site and tunnel connection events, including connects and disconnects.",
"httpDestRequestLogsTitle": "HTTPS Request Logs", "httpDestRequestLogsTitle": "HTTP Request Logs",
"httpDestRequestLogsDescription": "HTTP request logs for proxied resources, including method, path, and response code.", "httpDestRequestLogsDescription": "HTTP request logs for proxied resources, including method, path, and response code.",
"httpDestSaveChanges": "Save Changes", "httpDestSaveChanges": "Save Changes",
"httpDestCreateDestination": "Create Destination", "httpDestCreateDestination": "Create Destination",

14
src/app/navigation.tsx
View File

@@ -217,15 +217,17 @@ export const orgNavSections = (
{ {
title: "sidebarAlerting", title: "sidebarAlerting",
href: "/{orgId}/settings/alerting", href: "/{orgId}/settings/alerting",
icon: <BellRing className="size-4 flex-none" /> icon: (
<BellRing className="size-4 flex-none" />
)
},
{
title: "sidebarProvisioning",
href: "/{orgId}/settings/provisioning",
icon: <Boxes className="size-4 flex-none" />
} }
] ]
: []), : []),
{
title: "sidebarProvisioning",
href: "/{orgId}/settings/provisioning",
icon: <Boxes className="size-4 flex-none" />
},
{ {
title: "sidebarBluePrints", title: "sidebarBluePrints",
href: "/{orgId}/settings/blueprints", href: "/{orgId}/settings/blueprints",

16
src/components/InternalResourceForm.tsx
View File

@@ -840,12 +840,16 @@ export function InternalResourceForm({
modeCidrKey modeCidrKey
) )
}, },
{ ...(!disableEnterpriseFeatures
value: "http", ? [
label: t( {
modeHttpKey value: "http" as const,
) label: t(
} modeHttpKey
)
}
]
: [])
]; ];
return ( return (
<FormItem> <FormItem>

8
src/components/UptimeAlertSection.tsx
View File

@@ -53,10 +53,12 @@ export default function UptimeAlertSection({
days = 90 days = 90
}: UptimeAlertSectionProps) { }: UptimeAlertSectionProps) {
const t = useTranslations(); const t = useTranslations();
const api = createApiClient(useEnvContext()); const envContext = useEnvContext();
const api = createApiClient(envContext);
const queryClient = useQueryClient(); const queryClient = useQueryClient();
const { isPaidUser } = usePaidStatus(); const { isPaidUser } = usePaidStatus();
const isPaid = isPaidUser(tierMatrix.alertingRules); const isPaid = isPaidUser(tierMatrix.alertingRules);
const { env } = envContext;
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
const [name, setName] = useState( const [name, setName] = useState(
@@ -176,7 +178,9 @@ export default function UptimeAlertSection({
{t("uptimeSectionDescription", { days })} {t("uptimeSectionDescription", { days })}
</SettingsSectionDescription> </SettingsSectionDescription>
</div> </div>
{alertButton} {!env.flags.disableEnterpriseFeatures
? alertButton
: null}
</div> </div>
</SettingsSectionHeader> </SettingsSectionHeader>
<SettingsSectionBody> <SettingsSectionBody>