Skip to content

feat: show warning on unrecognized idp group and role mapping claims #16485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Feb 7, 2025
Merged

feat: show warning on unrecognized idp group and role mapping claims #16485

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
5c09338
hoot
aslilac Feb 5, 2025
c52982e
feat: show warning on unrecognized idp org mapping claims
aslilac Feb 6, 2025
5634be1
Merge branch 'main' into lilac/idp-sync-missing-given-warning
aslilac Feb 6, 2025
63ca763
🧹
aslilac Feb 6, 2025
e55e0a8
add warning description
aslilac Feb 6, 2025
72a7986
toolptipp
aslilac Feb 6, 2025
eedf797
tweak text colors
aslilac Feb 6, 2025
06ba32d
Update site/src/pages/DeploymentSettingsPage/IdpOrgSyncPage/IdpOrgSyn…
aslilac Feb 6, 2025
9600624
this is something
aslilac Feb 6, 2025
6ffcc94
- `toString()`
aslilac Feb 6, 2025
506cca1
polish
aslilac Feb 6, 2025
c91cd1a
🧼
aslilac Feb 6, 2025
97de7f4
rename
aslilac Feb 6, 2025
06715fa
sad moment
aslilac Feb 6, 2025
42ceb1b
cntnd.
aslilac Feb 6, 2025
820cca3
huh
aslilac Feb 6, 2025
da68f4b
Merge branch 'lilac/idp-sync-missing-given-warning' into lilac/group-…
aslilac Feb 6, 2025
7a1bee3
Merge branch 'main' into lilac/group-role-sync-missing-given-warning
aslilac Feb 6, 2025
b955e4b
yet again
aslilac Feb 6, 2025
d3873ab
group tooltip thing too
aslilac Feb 7, 2025
a743cea
🧹
aslilac Feb 7, 2025
5948a61
who did this, you must be held ACCOUNTABLE (it was me)
aslilac Feb 7, 2025
ce46b06
thank you typescript I love you typescript
aslilac Feb 7, 2025
a76a243
fix tooltip positioning
aslilac Feb 7, 2025
e9a5bff
one last bit of polish
aslilac Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rename
  • Loading branch information
@aslilac
aslilac committed Feb 6, 2025
commit 97de7f4b72fb31b96de2ad0352eabaf5515d1d40
12 changes: 6 additions & 6 deletions site/src/pages/DeploymentSettingsPage/IdpOrgSyncPage/IdpOrgSyncPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ import { OrganizationPills } from "./OrganizationPills";

interface IdpSyncPageViewProps {
organizationSyncSettings: OrganizationSyncSettings | undefined;
fieldValues: readonly string[] | undefined;
claimFieldValues: readonly string[] | undefined;
organizations: readonly Organization[];
onSubmit: (data: OrganizationSyncSettings) => void;
onSyncFieldChange: (value: string) => void;
Expand Down Expand Up @@ -85,7 +85,7 @@ const validationSchema = Yup.object({

export const IdpOrgSyncPageView: FC<IdpSyncPageViewProps> = ({
organizationSyncSettings,
fieldValues,
claimFieldValues,
organizations,
onSubmit,
onSyncFieldChange,
Expand Down Expand Up @@ -137,7 +137,7 @@ export const IdpOrgSyncPageView: FC<IdpSyncPageViewProps> = ({
if (
event.key === "Enter" &&
inputValue &&
!fieldValues?.some((value) => value === inputValue.toLowerCase())
!claimFieldValues?.some((value) => value === inputValue.toLowerCase())
) {
event.preventDefault();
setIdpOrgName(inputValue);
Expand Down Expand Up @@ -220,10 +220,10 @@ export const IdpOrgSyncPageView: FC<IdpSyncPageViewProps> = ({
IdP organization name
</Label>

{fieldValues ? (
{claimFieldValues ? (
<Combobox
value={idpOrgName}
options={fieldValues}
options={claimFieldValues}
placeholder="Select IdP organization"
open={open}
onOpenChange={setOpen}
Expand Down Expand Up @@ -314,7 +314,7 @@ export const IdpOrgSyncPageView: FC<IdpSyncPageViewProps> = ({
idpOrg={idpOrg}
coderOrgs={getOrgNames(organizations)}
onDelete={handleDelete}
exists={fieldValues?.includes(idpOrg)}
exists={claimFieldValues?.includes(idpOrg)}
/>
))}
</IdpMappingTable>
Expand Down
Loading