chore: extract UUID regex

coder · jaaydenh · Dec 4, 2024 · Nov 13, 2024 · Nov 15, 2024 · Nov 17, 2024
commit c6e07ffe86c95ff46ff4a5ecb1c12fc74bb71b80
diff --git a/site/src/pages/DeploymentSettingsPage/IdpOrgSyncPage/OrganizationPills.tsx b/site/src/pages/DeploymentSettingsPage/IdpOrgSyncPage/OrganizationPills.tsx
@@ -7,15 +7,12 @@ import {
 } from "components/Popover/Popover";
 import type { FC } from "react";
 import { cn } from "utils/cn";
+import { UUID } from "utils/idp";
 
 interface OrganizationPillsProps {
 	organizations: readonly string[];
 }
 
-// used to check if the organization is a UUID
-const UUID =
-	/^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
-
 export const OrganizationPills: FC<OrganizationPillsProps> = ({
 	organizations,
 }) => {

diff --git a/site/src/pages/ManagementSettingsPage/IdpSyncPage/IdpPillList.tsx b/site/src/pages/ManagementSettingsPage/IdpSyncPage/IdpPillList.tsx
@@ -7,15 +7,12 @@ import {
 	PopoverTrigger,
 } from "components/Popover/Popover";
 import type { FC } from "react";
+import { UUID } from "utils/idp";
 
 interface PillListProps {
 	roles: readonly string[];
 }
 
-// used to check if the role is a UUID
-const UUID =
-	/^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
-
 export const IdpPillList: FC<PillListProps> = ({ roles }) => {
 	return (
 		<Stack direction="row" spacing={1}>

diff --git a/site/src/utils/idp.ts b/site/src/utils/idp.ts
@@ -0,0 +1,2 @@
+export const UUID =
+	/^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export const UUID =
		/^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
jaaydenh marked this conversation as resolved. Show resolved Hide resolved