Files
triggerdotdev--trigger.dev/apps/webapp/app/components/primitives/SettingsLayout.tsx
James Ritchie bb450e608d
📚 Publish docs / publish (push) Has been cancelled
feat(webapp): SSO & Directory Sync settings UI improvements (#4196)
## Summary

UI/layout/copy pass over the org **SSO & Directory Sync** settings page
(formerly "Identity & Access"). No logic, gates, flags, or data flow
changed — server-side auth (`manage:sso`), Enterprise entitlement,
action validation, and data loading are all untouched.

- Renamed the nav item, page title, and meta from "Identity & Access" to
"SSO & Directory Sync".
- Added a reusable `SettingsLayout` component system (container,
section, header, row, block, actions) modeled on `/account/security`,
and refactored the SSO page onto it (section titles, dividers, left
title/subtitle + right action rows).
- Tightened all UI copy: concise, active voice, consistent labels, no
em-dashes.
- `Select` primitive: additive `wrap`, `popoverClassName`, and
`placement` props (all default to prior behavior) so role options show a
bright title with a wrapping description, right-aligned popover, and no
horizontal overflow.
- Removed the external-link arrow icon from buttons that open a modal;
kept it only on genuinely external actions (Contact us, Open in new
tab).
- Polished the admin portal link dialog: smaller description, tighter
spacing, `ClipboardField` with a permanent copy button, removed the
redundant Copy link button, and a provider-aware Open label (e.g. "Open
in WorkOS") derived from the link host with a safe fallback.

### SSO page UI
<img width="3568" height="2550" alt="CleanShot 2026-07-08 at 18 52
11@2x"
src="https://github.com/user-attachments/assets/009d2437-7552-4ff0-a457-64744a9fcd88"
/>

### Login with SSO and normal email test (local)


https://github.com/user-attachments/assets/b33a4ce9-c1fa-45c9-bd3c-077cb6fc9473



## Test plan

- [ ] Non-Enterprise org: SSO page shows the upsell state
- [ ] Enterprise org, non-Owner without `manage:sso`: 403
- [ ] Enterprise Owner: verify domains, configure SSO, connect
directory, JIT/default/group role selects, and enforcement toggle all
work
- [ ] Role select popovers: bright title + wrapping description,
right-aligned, no horizontal scroll
- [ ] Admin portal dialog: copy button works, "Open in WorkOS" opens the
portal in a new tab

---------

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-09 12:09:45 +01:00

217 lines
5.6 KiB
TypeScript

import { type ReactNode } from "react";
import { MainHorizontallyCenteredContainer } from "~/components/layout/AppLayout";
import { cn } from "~/utils/cn";
import { Header2, Header3 } from "./Headers";
import { Paragraph } from "./Paragraph";
// A composable layout system for settings pages: a centered container holds
// sections; each section has a header (title/description/action over a divide)
// followed by rows. A row lays out a title + description on the left and an
// action (button/switch/select/status) on the right, separated by divides and
// spacing rather than bordered boxes.
//
// Everything that renders text accepts `ReactNode`, and every piece takes a
// `className` so callers can restyle without forking. For layouts the built-in
// props don't cover, pass `children` to a row/block for full control.
const rowSize = {
sm: "py-3",
md: "py-4",
} as const;
type RowSize = keyof typeof rowSize;
/** Page-level wrapper that centers content and sets the settings column width. */
export function SettingsContainer({
children,
className,
}: {
children: ReactNode;
className?: string;
}) {
return (
<MainHorizontallyCenteredContainer
className={cn("max-w-[37.5rem] overflow-visible", className)}
>
{children}
</MainHorizontallyCenteredContainer>
);
}
/** A group of related rows. Adds vertical spacing between sibling sections. */
export function SettingsSection({
children,
className,
}: {
children: ReactNode;
className?: string;
}) {
return (
<section className={cn("w-full [&:not(:first-child)]:mt-12", className)}>{children}</section>
);
}
/**
* Section (or sub-section) heading with an optional description and a
* right-aligned action, sitting above a bottom divide. Use `as="h3"` for a
* heading nested inside a section.
*/
export function SettingsHeader({
title,
description,
action,
as = "h2",
className,
}: {
title: ReactNode;
description?: ReactNode;
action?: ReactNode;
as?: "h2" | "h3";
className?: string;
}) {
const Heading = as === "h3" ? Header3 : Header2;
return (
<div
className={cn(
"flex w-full items-end justify-between gap-8 border-b border-grid-dimmed",
// An h2 section header gets its top spacing from SettingsSection's margin,
// so it only needs bottom padding. An h3 sits mid-section among rows, so it
// takes the full row rhythm (py-4) to separate from the divide above it.
as === "h3" ? "py-4" : "pb-3",
className
)}
>
<div className="space-y-1">
<Heading>{title}</Heading>
{description ? <Paragraph variant="small">{description}</Paragraph> : null}
</div>
{action ? <div className="flex flex-none items-center">{action}</div> : null}
</div>
);
}
/** Title typography for a row. Renders a `<label>` when `htmlFor` is set. */
export function SettingsRowTitle({
children,
htmlFor,
className,
}: {
children: ReactNode;
htmlFor?: string;
className?: string;
}) {
const classes = cn("font-sans text-sm font-semibold leading-tight text-text-bright", className);
return htmlFor ? (
<label htmlFor={htmlFor} className={classes}>
{children}
</label>
) : (
<span className={classes}>{children}</span>
);
}
/** Description/subtitle typography for a row. */
export function SettingsRowDescription({
children,
className,
}: {
children: ReactNode;
className?: string;
}) {
return (
<Paragraph variant="small" className={className}>
{children}
</Paragraph>
);
}
/**
* A single settings row: title + description on the left, action on the right.
*
* Pass `title`/`description` for the common case, or `children` to supply
* custom left-hand content (the built-in title group is skipped when `children`
* is provided). `action` renders on the right in both cases.
*/
export function SettingsRow({
title,
description,
action,
htmlFor,
children,
className,
titleClassName,
size = "md",
align = "center",
bordered = true,
}: {
title?: ReactNode;
description?: ReactNode;
action?: ReactNode;
htmlFor?: string;
children?: ReactNode;
className?: string;
titleClassName?: string;
size?: RowSize;
align?: "center" | "start";
bordered?: boolean;
}) {
return (
<div
className={cn(
"flex w-full justify-between gap-8",
align === "center" ? "items-center" : "items-start",
rowSize[size],
bordered && "border-b border-grid-dimmed",
className
)}
>
{children ?? (
<div className="flex-1 space-y-1">
{title ? (
<SettingsRowTitle htmlFor={htmlFor} className={titleClassName}>
{title}
</SettingsRowTitle>
) : null}
{description ? <SettingsRowDescription>{description}</SettingsRowDescription> : null}
</div>
)}
{action ? <div className="flex flex-none items-center">{action}</div> : null}
</div>
);
}
/**
* Full-width row for arbitrary content (callouts, empty states, custom blocks)
* that shouldn't be split into a title/action layout.
*/
export function SettingsBlock({
children,
className,
size = "md",
bordered = true,
}: {
children: ReactNode;
className?: string;
size?: RowSize;
bordered?: boolean;
}) {
return (
<div
className={cn("w-full", rowSize[size], bordered && "border-b border-grid-dimmed", className)}
>
{children}
</div>
);
}
/** Right-aligned action bar, typically for a section's Save button. */
export function SettingsActions({
children,
className,
}: {
children: ReactNode;
className?: string;
}) {
return <div className={cn("flex justify-end gap-2 py-4", className)}>{children}</div>;
}