diff --git a/src/components/resource-policy/PolicyAuthStackSectionEdit.tsx b/src/components/resource-policy/PolicyAuthStackSectionEdit.tsx
index 7ecd7a8a8..bbf882a07 100644
--- a/src/components/resource-policy/PolicyAuthStackSectionEdit.tsx
+++ b/src/components/resource-policy/PolicyAuthStackSectionEdit.tsx
@@ -48,20 +48,43 @@ import {
getPasscodeSummary,
getPincodeSummary
} from "./policy-auth-summaries";
+import { SharedPolicyResourceNotice } from "./SharedPolicyResourceNotice";
+import z from "zod";
type OverlaySelectedRole = SelectedRole & { isAdmin: boolean };
-const authStackSchema = createPolicySchema.pick({
- sso: true,
- skipToIdpId: true,
- roles: true,
- users: true,
- password: true,
- pincode: true,
- headerAuth: true,
- emailWhitelistEnabled: true,
- emails: true
-});
+// Edit mode keeps placeholder values for configured methods; only validate on save when changed.
+const authStackEditSchema = createPolicySchema
+ .pick({
+ sso: true,
+ skipToIdpId: true,
+ roles: true,
+ users: true,
+ emailWhitelistEnabled: true,
+ emails: true
+ })
+ .extend({
+ password: z
+ .object({
+ password: z.string()
+ })
+ .nullable()
+ .optional(),
+ pincode: z
+ .object({
+ pincode: z.string()
+ })
+ .nullable()
+ .optional(),
+ headerAuth: z
+ .object({
+ user: z.string(),
+ password: z.string(),
+ extendedCompatibility: z.boolean().default(true)
+ })
+ .nullable()
+ .optional()
+ });
export type PolicyAuthStackSectionEditProps = {
orgId: string;
@@ -182,14 +205,14 @@ export function PolicyAuthStackSectionEdit({
]);
const form = useForm({
- resolver: zodResolver(authStackSchema),
+ resolver: zodResolver(authStackEditSchema),
defaultValues: {
sso: policy.sso,
skipToIdpId: policy.idpId,
roles: policyRoleItems,
users: policyUserItems,
- password: policy.passwordId ? { password: "" } : null,
- pincode: policy.pincodeId ? { pincode: "" } : null,
+ password: null,
+ pincode: null,
headerAuth: policy.headerAuth
? {
user: "",
@@ -247,7 +270,14 @@ export function PolicyAuthStackSectionEdit({
}
const isValid = await form.trigger();
- if (!isValid) return;
+ if (!isValid) {
+ toast({
+ variant: "destructive",
+ title: t("policyErrorUpdate"),
+ description: t("policyErrorUpdateMessageDescription")
+ });
+ return;
+ }
const payload = form.getValues();
const requests: Array | void>> = [];
@@ -441,184 +471,219 @@ export function PolicyAuthStackSectionEdit({
-
-
- form.setValue("sso", active)
- }
- skipToIdpId={skipToIdpId}
- onSkipToIdpChange={(id) =>
- form.setValue("skipToIdpId", id)
- }
- allIdps={allIdps}
- disabled={authReadonly}
- idpDisabled={authReadonly}
- rolesEditor={
- isResourceOverlay ? (
-
- setCombinedRoles(
- selected.map((role) => ({
- ...role,
- isAdmin: Boolean(
- role.isAdmin
+
+ {isResourceOverlay && (
+
+ )}
+
+
+ form.setValue("sso", active)
+ }
+ skipToIdpId={skipToIdpId}
+ onSkipToIdpChange={(id) =>
+ form.setValue("skipToIdpId", id)
+ }
+ allIdps={allIdps}
+ disabled={authReadonly}
+ idpDisabled={authReadonly}
+ rolesEditor={
+ isResourceOverlay ? (
+
+ setCombinedRoles(
+ selected.map(
+ (role) => ({
+ ...role,
+ isAdmin:
+ Boolean(
+ role.isAdmin
+ )
+ })
)
- }))
+ )
+ }
+ disabled={isLoading}
+ restrictAdminRole
+ lockedIds={policyRoleLockedIds}
+ />
+ ) : (
+ (
+
+ form.setValue(
+ "roles",
+ selected
+ )
+ }
+ disabled={readonly}
+ restrictAdminRole
+ />
+ )}
+ />
+ )
+ }
+ usersEditor={
+ isResourceOverlay ? (
+
+ ) : (
+ (
+
+ form.setValue(
+ "users",
+ selected
+ )
+ }
+ disabled={readonly}
+ />
+ )}
+ />
+ )
+ }
+ />
+
+
+
+
+ {t("policyAuthOtherMethodsTitle")}
+
+
+ {t("policyAuthOtherMethodsDescription")}
+
+
+
+
+
+ openMethodEditor("pincode")
+ }
+ onToggle={(active) =>
+ handleToggle("pincode", active, () => {
+ setPinActive(false);
+ form.setValue("pincode", null);
+ })
+ }
+ disabled={authReadonly}
+ />
+
+
+ openMethodEditor("passcode")
+ }
+ onToggle={(active) =>
+ handleToggle("passcode", active, () => {
+ setPasscodeActive(false);
+ form.setValue("password", null);
+ })
+ }
+ disabled={authReadonly}
+ />
+
+
+ openMethodEditor("email")
+ }
+ onToggle={(active) =>
+ handleToggle(
+ "email",
+ active,
+ () =>
+ form.setValue(
+ "emailWhitelistEnabled",
+ false
+ ),
+ () =>
+ form.setValue(
+ "emailWhitelistEnabled",
+ true
)
+ )
+ }
+ disabled={authReadonly || !emailEnabled}
+ />
+
+
-
-
-
- {t("policyAuthOtherMethodsTitle")}
-
-
- {t("policyAuthOtherMethodsDescription")}
-
-
-
-
-
openMethodEditor("pincode")}
- onToggle={(active) =>
- handleToggle("pincode", active, () => {
- setPinActive(false);
- form.setValue("pincode", null);
- })
- }
- disabled={authReadonly}
- />
-
- openMethodEditor("passcode")}
- onToggle={(active) =>
- handleToggle("passcode", active, () => {
- setPasscodeActive(false);
- form.setValue("password", null);
- })
- }
- disabled={authReadonly}
- />
-
- openMethodEditor("email")}
- onToggle={(active) =>
- handleToggle(
- "email",
- active,
- () =>
- form.setValue(
- "emailWhitelistEnabled",
- false
- ),
- () =>
- form.setValue(
- "emailWhitelistEnabled",
- true
- )
- )
- }
- disabled={authReadonly || !emailEnabled}
- />
-
-
+ {t("none")}
+
+ {t("sharedPolicyNoneDescription")}
+
+
+
+ {policiesShown.map((policy) => (
+
+ onSelectPolicy({
+ resourcePolicyId: policy.resourcePolicyId,
+ name: policy.name
+ })
+ }
+ >
+
+
+ {policy.name}
+
+
+ ))}
+
+
+
+ );
+}
+
+export type SharedPolicySelectProps = {
+ orgId: string;
+ value: number | null;
+ onChange: (value: number | null) => void;
+ className?: string;
+ disabled?: boolean;
+};
+
+export function SharedPolicySelect({
+ orgId,
+ value,
+ onChange,
+ className,
+ disabled
+}: SharedPolicySelectProps) {
+ const t = useTranslations();
+ const [open, setOpen] = useState(false);
+ const [selectedLabel, setSelectedLabel] = useState<{
+ resourcePolicyId: number;
+ name: string;
+ } | null>(null);
+
+ const resolvedLabel =
+ selectedLabel?.resourcePolicyId === value ? selectedLabel.name : null;
+
+ const { data: fetchedPolicy } = useQuery({
+ ...orgQueries.resourcePolicy({
+ resourcePolicyId: value!
+ }),
+ enabled: value !== null && resolvedLabel === null
+ });
+
+ const selectedPolicy = useMemo((): SelectedSharedPolicy | null => {
+ if (value === null) {
+ return null;
+ }
+
+ return {
+ resourcePolicyId: value,
+ name: resolvedLabel ?? fetchedPolicy?.name ?? ""
+ };
+ }, [value, resolvedLabel, fetchedPolicy?.name]);
+
+ const triggerLabel =
+ value === null
+ ? t("none")
+ : (resolvedLabel ??
+ fetchedPolicy?.name ??
+ t("resourcePolicySelect"));
+
+ return (
+
+
+
+
+
+ {
+ onChange(policy?.resourcePolicyId ?? null);
+ setSelectedLabel(
+ policy
+ ? {
+ resourcePolicyId: policy.resourcePolicyId,
+ name: policy.name
+ }
+ : null
+ );
+ setOpen(false);
+ }}
+ />
+
+
+ );
+}
diff --git a/src/components/ui/alert.tsx b/src/components/ui/alert.tsx
index dce25949a..90a87bee6 100644
--- a/src/components/ui/alert.tsx
+++ b/src/components/ui/alert.tsx
@@ -4,7 +4,7 @@ import { cva, type VariantProps } from "class-variance-authority";
import { cn } from "@app/lib/cn";
const alertVariants = cva(
- "relative w-full rounded-lg p-4 [&>svg~*]:pl-7 [&>svg+div]:translate-y-[-3px] [&>svg]:absolute [&>svg]:left-4 [&>svg]:top-4 [&>svg]:text-foreground",
+ "relative w-full rounded-lg p-4 has-[>svg]:grid has-[>svg]:grid-cols-[auto_1fr] has-[>svg]:gap-x-3 gap-y-1 [&>svg]:col-start-1 [&>svg]:row-start-1 [&>svg]:row-span-full [&>svg]:size-4 [&>svg]:shrink-0 [&>svg]:self-center [&>svg]:text-foreground [&>svg~*]:col-start-2",
{
variants: {
variant: {
diff --git a/src/components/ui/select.tsx b/src/components/ui/select.tsx
index 6d065e7aa..c91799712 100644
--- a/src/components/ui/select.tsx
+++ b/src/components/ui/select.tsx
@@ -105,13 +105,17 @@ function SelectLabel({
function SelectItem({
className,
children,
+ description,
...props
-}: React.ComponentProps) {
+}: React.ComponentProps & {
+ description?: React.ReactNode;
+}) {
return (
- {children}
+ {description ? (
+
+
+ {children}
+
+
+ {description}
+
+
+ ) : (
+ {children}
+ )}
);
}
diff --git a/src/lib/queries.ts b/src/lib/queries.ts
index 17377af8f..7d224c7b1 100644
--- a/src/lib/queries.ts
+++ b/src/lib/queries.ts
@@ -45,6 +45,7 @@ import type { ListOrgLabelsResponse } from "@server/routers/labels/types";
import { ListHealthChecksResponse } from "@server/routers/healthChecks/types";
import { StatusHistoryResponse } from "@server/lib/statusHistory";
import type { ListResourcePoliciesResponse } from "@server/routers/resource/types";
+import type { GetResourcePolicyResponse } from "@server/routers/policy";
export type ProductUpdate = {
link: string | null;
@@ -581,16 +582,16 @@ export const orgQueries = {
}
}),
- policies: ({ orgId, name }: { orgId: string; name?: string }) =>
+ policies: ({ orgId, query }: { orgId: string; query?: string }) =>
queryOptions({
- queryKey: ["ORG", orgId, "RESOURCES_POLICIES", name] as const,
+ queryKey: ["ORG", orgId, "RESOURCES_POLICIES", query] as const,
queryFn: async ({ signal, meta }) => {
const sp = new URLSearchParams({
pageSize: "10"
});
- if (name) {
- sp.set("query", name);
+ if (query) {
+ sp.set("query", query);
}
const res = await meta!.api.get<
@@ -601,6 +602,18 @@ export const orgQueries = {
return res.data.data.policies;
}
+ }),
+
+ resourcePolicy: ({ resourcePolicyId }: { resourcePolicyId: number }) =>
+ queryOptions({
+ queryKey: ["RESOURCE_POLICY", resourcePolicyId] as const,
+ queryFn: async ({ signal, meta }) => {
+ const res = await meta!.api.get<
+ AxiosResponse
+ >(`/resource-policy/${resourcePolicyId}`, { signal });
+
+ return res.data.data;
+ }
})
};