diff --git a/.server-changes/regions-location-clarification.md b/.server-changes/regions-location-clarification.md new file mode 100644 index 00000000000..7619c68f34a --- /dev/null +++ b/.server-changes/regions-location-clarification.md @@ -0,0 +1,6 @@ +--- +area: webapp +type: improvement +--- + +Clarified on the Regions page that a region only affects where your runs execute, not where your data is stored. This shows as a tooltip on the Location column and in the confirmation dialog when you change your default region. diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.regions/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.regions/route.tsx index 783b60cb1ca..5a9eda2ea48 100644 --- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.regions/route.tsx +++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.regions/route.tsx @@ -16,7 +16,6 @@ import { CloudProviderIcon } from "~/assets/icons/CloudProviderIcon"; import { FlagIcon } from "~/assets/icons/RegionIcons"; import { cloudProviderTitle } from "~/components/CloudProvider"; import { Feedback } from "~/components/Feedback"; -import { V4Title } from "~/components/V4Badge"; import { AdminDebugTooltip } from "~/components/admin/debugTooltip"; import { MainCenteredContainer, PageBody, PageContainer } from "~/components/layout/AppLayout"; import { Badge } from "~/components/primitives/Badge"; @@ -47,6 +46,7 @@ import { TableRow, } from "~/components/primitives/Table"; import { TextLink } from "~/components/primitives/TextLink"; +import { InfoIconTooltip } from "~/components/primitives/Tooltip"; import { useFeatures } from "~/hooks/useFeatures"; import { useOrganization } from "~/hooks/useOrganizations"; import { useHasAdminAccess } from "~/hooks/useUser"; @@ -138,7 +138,7 @@ export default function Page() { return ( - Regions} /> + @@ -168,7 +168,15 @@ export default function Page() { Region Cloud Provider - Location + + + Location + + + Static IPs {isAdmin && Admin} - - Trigger.dev is fully GDPR compliant. Learn more in our{" "} + + Trigger.dev is fully{" "} + + GDPR compliant + + . Learn more in our{" "} security portal or{" "} } - defaultValue="help" + defaultValue="feedback" /> . @@ -341,6 +353,7 @@ function SetDefaultDialog({ newDefaultRegion: Region; }) { const [isOpen, setIsOpen] = useState(false); + const { isManagedCloud } = useFeatures(); const currentDefaultRegion = regions.find((r) => r.isDefault); return ( @@ -444,6 +457,27 @@ function SetDefaultDialog({ Runs triggered from now on will execute in "{newDefaultRegion.name}", unless you{" "} override when triggering. + + + + Region is where your runs execute, not where your data is stored. + {isManagedCloud ? ( + <> + {" "} + Trigger.dev is fully{" "} + + GDPR compliant + + . + + ) : null} + +