diff --git a/src/components/ExitNodesTable.tsx b/src/components/ExitNodesTable.tsx
index 67d819a47..73e96a96c 100644
--- a/src/components/ExitNodesTable.tsx
+++ b/src/components/ExitNodesTable.tsx
@@ -21,6 +21,7 @@ import { createApiClient } from "@app/lib/api";
import { useEnvContext } from "@app/hooks/useEnvContext";
import { useTranslations } from "next-intl";
import { Badge } from "@app/components/ui/badge";
+import { InfoPopup } from "@app/components/ui/info-popup";
export type RemoteExitNodeRow = {
id: string;
@@ -33,6 +34,7 @@ export type RemoteExitNodeRow = {
online: boolean;
dateCreated: string;
version?: string;
+ updateAvailable?: boolean;
};
type ExitNodesTableProps = {
@@ -233,13 +235,18 @@ export default function ExitNodesTable({
const originalRow = row.original;
return (
- {originalRow.version && originalRow.version ? (
+ {originalRow.version ? (
{"v" + originalRow.version}
) : (
"-"
)}
+ {originalRow.updateAvailable && (
+
+ )}
);
}
diff --git a/src/components/OrgIdpTable.tsx b/src/components/OrgIdpTable.tsx
index bdbaafa27..c0199c6d3 100644
--- a/src/components/OrgIdpTable.tsx
+++ b/src/components/OrgIdpTable.tsx
@@ -25,7 +25,6 @@ import {
import {
ArrowRight,
ArrowUpDown,
- KeyRound,
MoreHorizontal
} from "lucide-react";
import { useMemo, useState } from "react";
@@ -50,6 +49,7 @@ import { useQuery } from "@tanstack/react-query";
import { useDebounce } from "use-debounce";
import type { ListUserAdminOrgIdpsResponse } from "@server/routers/orgIdp/types";
import { cn } from "@app/lib/cn";
+import { Badge } from "@app/components/ui/badge";
import { usePaidStatus } from "@app/hooks/usePaidStatus";
import { tierMatrix } from "@server/lib/billing/tierMatrix";
import { isIdpGlobalModeBannerVisible } from "@app/components/IdpGlobalModeBanner";
@@ -63,6 +63,61 @@ export type IdpRow = {
type AdminIdpRow = ListUserAdminOrgIdpsResponse["idps"][number];
+type ImportSourceOrg = { orgId: string; orgName: string };
+
+type GroupedImportableIdp = {
+ idpId: number;
+ name: string;
+ type: string;
+ variant: string;
+ tags: string | null;
+ sources: ImportSourceOrg[];
+};
+
+function adminRowForImport(
+ group: GroupedImportableIdp,
+ source: ImportSourceOrg
+): AdminIdpRow {
+ return {
+ idpId: group.idpId,
+ orgId: source.orgId,
+ orgName: source.orgName,
+ name: group.name,
+ type: group.type,
+ variant: group.variant,
+ tags: group.tags
+ };
+}
+
+function groupImportableIdps(rows: AdminIdpRow[]): GroupedImportableIdp[] {
+ const map = new Map
();
+ for (const row of rows) {
+ let g = map.get(row.idpId);
+ if (!g) {
+ g = {
+ idpId: row.idpId,
+ name: row.name,
+ type: row.type,
+ variant: row.variant,
+ tags: row.tags,
+ sources: []
+ };
+ map.set(row.idpId, g);
+ }
+ if (!g.sources.some((s) => s.orgId === row.orgId)) {
+ g.sources.push({ orgId: row.orgId, orgName: row.orgName });
+ }
+ }
+ return Array.from(map.values())
+ .map((item) => ({
+ ...item,
+ sources: [...item.sources].sort((a, b) =>
+ a.orgName.localeCompare(b.orgName)
+ )
+ }))
+ .sort((a, b) => b.name.localeCompare(a.name));
+}
+
function IdpImportRowIcon({
type,
variant
@@ -114,16 +169,22 @@ export default function IdpTable({ idps, orgId }: Props) {
);
}, [adminIdpsRaw, orgId, idps]);
- const shownImportIdps = useMemo(() => {
+ const importableGrouped = useMemo(
+ () => groupImportableIdps(importableIdps),
+ [importableIdps]
+ );
+
+ const shownImportGrouped = useMemo(() => {
const q = debouncedImportSearch.trim().toLowerCase();
if (!q) {
- return importableIdps;
+ return importableGrouped;
}
- return importableIdps.filter((row) => {
- const hay = `${row.orgName} ${row.name}`.toLowerCase();
+ return importableGrouped.filter((group) => {
+ const hay =
+ `${group.name} ${group.sources.map((s) => s.orgName).join(" ")}`.toLowerCase();
return hay.includes(q);
});
- }, [importableIdps, debouncedImportSearch]);
+ }, [importableGrouped, debouncedImportSearch]);
const deleteIdp = async (idpId: number) => {
try {
@@ -364,31 +425,44 @@ export default function IdpTable({ idps, orgId }: Props) {
{t("idpImportEmpty")}
- {shownImportIdps.map((row) => (
+ {shownImportGrouped.map((group) => (
s.orgName).join(" ")}`}
disabled={!canImportOrgOidcIdp}
onSelect={() => {
if (!canImportOrgOidcIdp) {
return;
}
- void importIdp(row);
+ void importIdp(
+ adminRowForImport(
+ group,
+ group.sources[0]
+ )
+ );
}}
>
- {row.orgName}
+ {group.name}
-
- {row.name}
+
+ {group.sources.map((src) => (
+
+ {src.orgName}
+
+ ))}
diff --git a/src/components/OrgSignInLink.tsx b/src/components/OrgSignInLink.tsx
index 819a1dc7f..d900b98d3 100644
--- a/src/components/OrgSignInLink.tsx
+++ b/src/components/OrgSignInLink.tsx
@@ -5,11 +5,15 @@ import { useRouter } from "next/navigation";
import { useTranslations } from "next-intl";
import { Alert, AlertDescription, AlertTitle } from "@app/components/ui/alert";
import { Button } from "@app/components/ui/button";
+import { cn } from "@app/lib/cn";
+import { Building2 } from "lucide-react";
type OrgSignInLinkProps = {
href: string;
linkText: string;
descriptionText: string;
+ primaryActionVariant?: "link" | "button";
+ className?: string;
};
const STORAGE_KEY_CLICKED = "orgSignInLinkClicked";
@@ -18,7 +22,9 @@ const STORAGE_KEY_ACKNOWLEDGED = "orgSignInTipAcknowledged";
export default function OrgSignInLink({
href,
linkText,
- descriptionText
+ descriptionText,
+ primaryActionVariant = "link",
+ className
}: OrgSignInLinkProps) {
const router = useRouter();
const t = useTranslations();
@@ -93,14 +99,32 @@ export default function OrgSignInLink({
)}
-
-
{descriptionText}
-
+
+ {primaryActionVariant === "button" ? (
+
+ ) : (
+
+ )}
);
diff --git a/src/components/ProductUpdates.tsx b/src/components/ProductUpdates.tsx
index b1da32a93..0d88853a7 100644
--- a/src/components/ProductUpdates.tsx
+++ b/src/components/ProductUpdates.tsx
@@ -81,10 +81,10 @@ export default function ProductUpdates({
const showNewVersionPopup = Boolean(
latestVersion &&
- valid(latestVersion) &&
- valid(currentVersion) &&
- ignoredVersionUpdate !== latestVersion &&
- gt(latestVersion, currentVersion)
+ valid(latestVersion) &&
+ valid(currentVersion) &&
+ ignoredVersionUpdate !== latestVersion &&
+ gt(latestVersion, currentVersion)
);
const filteredUpdates = data.updates.filter(
@@ -103,40 +103,51 @@ export default function ProductUpdates({
)}
>
- {filteredUpdates.length > 1 && (
-
0 && (
+
+ {filteredUpdates.length > 1 && (
+
+
+
+ {showNewVersionPopup
+ ? t("productUpdateMoreInfo", {
+ noOfUpdates:
+ filteredUpdates.length
+ })
+ : t("productUpdateInfo", {
+ noOfUpdates:
+ filteredUpdates.length
+ })}
+
+
)}
- >
-
-
- {showNewVersionPopup
- ? t("productUpdateMoreInfo", {
- noOfUpdates: filteredUpdates.length
- })
- : t("productUpdateInfo", {
- noOfUpdates: filteredUpdates.length
- })}
-
-
+
0}
+ onDimissAll={() =>
+ setProductUpdatesRead([
+ ...productUpdatesRead,
+ ...filteredUpdates.map(
+ (update) => update.id
+ )
+ ])
+ }
+ onDimiss={(id) =>
+ setProductUpdatesRead([
+ ...productUpdatesRead,
+ id
+ ])
+ }
+ />
+
-
+
+
+ {t("passwordForgot")}
+
+
+
{(error || securityKeyError) && (
@@ -219,7 +264,7 @@ export default function SmartLoginForm({
-
+
+
+ {orgSignIn && (
+ <>
+
+
+
+
+
+
+ {t("idpContinue")}
+
+
+
+
+
+ )}
+
+
+
+ );
+ }
+
+ return (
+
+
+
+ {hasInternalAccount && (
+
+
+
+ )}
+
+ {groupedIdps.length > 0 ? (
+
+ {error && (
+
+ {error}
+
+ )}
+
+
+
+
+
+
+
+ {t("idpContinue")}
+
+
+
+
+
+ {params.get("gotoapp") ? (
+
+ ) : (
+ groupedIdps.map((group) => {
+ const effectiveType =
+ group.variant || group.name.toLowerCase();
+ const sourceOrgId = group.orgs[0].orgId;
+
+ return (
+
+ );
+ })
+ )}
+
+
+ ) : null}
+
+
+
+
+ {t("httpDestBodyTemplateDescription")}
+
+
+
(
+
+
+
+
+
+
+
+
+ )}
+ />
+ {useWatch({
+ control,
+ name: `actions.${index}.useBodyTemplate`
+ }) && (
+ (
+
+
+ {t("httpDestBodyTemplateLabel")}
+
+
+
+
+
+ {t("httpDestBodyTemplateHint")}
+
+
+
+ )}
+ />
+ )}
+
);
}
diff --git a/src/components/alert-rule-editor/AlertRuleGraphEditor.tsx b/src/components/alert-rule-editor/AlertRuleGraphEditor.tsx
index e1e71507b..7cac1960f 100644
--- a/src/components/alert-rule-editor/AlertRuleGraphEditor.tsx
+++ b/src/components/alert-rule-editor/AlertRuleGraphEditor.tsx
@@ -368,7 +368,9 @@ export default function AlertRuleGraphEditor({
customHeaderName:
"",
customHeaderValue:
- ""
+ "",
+ useBodyTemplate: false,
+ bodyTemplate: ""
});
}
}}
diff --git a/src/components/resource-target-address-item.tsx b/src/components/resource-target-address-item.tsx
index 08ce40dd3..abd4ed45b 100644
--- a/src/components/resource-target-address-item.tsx
+++ b/src/components/resource-target-address-item.tsx
@@ -113,10 +113,10 @@ export function ResourceTargetAddressItem({
? selectedSite?.name
: t("siteSelect")}
-
+
-
+
-
);
diff --git a/src/lib/alertRuleForm.ts b/src/lib/alertRuleForm.ts
index 039c367b6..4fea27af7 100644
--- a/src/lib/alertRuleForm.ts
+++ b/src/lib/alertRuleForm.ts
@@ -45,6 +45,8 @@ export type AlertRuleFormAction =
basicCredentials: string;
customHeaderName: string;
customHeaderValue: string;
+ useBodyTemplate: boolean;
+ bodyTemplate: string;
};
export type AlertRuleFormValues = {
@@ -130,6 +132,8 @@ export type AlertRuleApiResponse = {
customHeaderValue?: string;
headers?: { key: string; value: string }[];
method?: string;
+ useBodyTemplate?: boolean;
+ bodyTemplate?: string;
} | null;
}[];
};
@@ -187,7 +191,9 @@ export function buildFormSchema(t: (k: string) => string) {
bearerToken: z.string(),
basicCredentials: z.string(),
customHeaderName: z.string(),
- customHeaderValue: z.string()
+ customHeaderValue: z.string(),
+ useBodyTemplate: z.boolean().default(false),
+ bodyTemplate: z.string().default("")
})
])
)
@@ -415,7 +421,9 @@ export function apiResponseToFormValues(
bearerToken: cfg?.bearerToken ?? "",
basicCredentials: cfg?.basicCredentials ?? "",
customHeaderName: cfg?.customHeaderName ?? "",
- customHeaderValue: cfg?.customHeaderValue ?? ""
+ customHeaderValue: cfg?.customHeaderValue ?? "",
+ useBodyTemplate: cfg?.useBodyTemplate ?? false,
+ bodyTemplate: cfg?.bodyTemplate ?? ""
});
}
@@ -479,7 +487,11 @@ export function formValuesToApiPayload(
customHeaderName: action.customHeaderName || undefined,
customHeaderValue: action.customHeaderValue || undefined,
headers: action.headers.filter((h) => h.key.trim()),
- method: action.method
+ method: action.method,
+ useBodyTemplate: action.useBodyTemplate || undefined,
+ bodyTemplate: action.useBodyTemplate
+ ? action.bodyTemplate || undefined
+ : undefined
})
});
}