From 585d19c1a224fb8c17f084f8ac902be2426cd3df Mon Sep 17 00:00:00 2001 From: Jaayden Halko Date: Thu, 5 Jun 2025 21:00:29 +0000 Subject: [PATCH 1/2] fix: dont display everyone group for idp group sync --- .../IdpSyncPage/IdpGroupSyncForm.tsx | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx b/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx index 284267f4487e1..da34c6bab08e5 100644 --- a/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx +++ b/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx @@ -12,6 +12,7 @@ import { HelpTooltipTitle, HelpTooltipTrigger, } from "components/HelpTooltip/HelpTooltip"; +import { isEveryoneGroup } from "utils/groups"; import { Input } from "components/Input/Input"; import { Label } from "components/Label/Label"; import { Link } from "components/Link/Link"; @@ -259,15 +260,17 @@ export const IdpGroupSyncForm: FC = ({ className="min-w-60 max-w-3xl" value={coderGroups} onChange={setCoderGroups} - options={groups.map((group) => ({ - label: group.display_name || group.name, - value: group.id, - }))} + options={groups + .filter((group) => !isEveryoneGroup(group)) + .map((group) => ({ + label: group.display_name || group.name, + value: group.id, + }))} hidePlaceholderWhenSelected placeholder="Select group" emptyIndicator={

- All groups selected + No more groups to select

} /> From 07664b629dc54e350b7db33b92f1eff3105ffc0c Mon Sep 17 00:00:00 2001 From: Jaayden Halko Date: Thu, 5 Jun 2025 21:04:21 +0000 Subject: [PATCH 2/2] fix: format --- .../OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx b/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx index da34c6bab08e5..9282bd6bfd2b1 100644 --- a/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx +++ b/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx @@ -12,7 +12,6 @@ import { HelpTooltipTitle, HelpTooltipTrigger, } from "components/HelpTooltip/HelpTooltip"; -import { isEveryoneGroup } from "utils/groups"; import { Input } from "components/Input/Input"; import { Label } from "components/Label/Label"; import { Link } from "components/Link/Link"; @@ -33,6 +32,7 @@ import { useFormik } from "formik"; import { Plus, Trash, TriangleAlert } from "lucide-react"; import { type FC, type KeyboardEventHandler, useId, useState } from "react"; import { docs } from "utils/docs"; +import { isEveryoneGroup } from "utils/groups"; import { isUUID } from "utils/uuid"; import * as Yup from "yup"; import { ExportPolicyButton } from "./ExportPolicyButton";