Skip to content

feat: integrate backend with idp sync page #14755

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 13 commits into from
Sep 24, 2024
Merged

feat: integrate backend with idp sync page #14755

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a40ba7d
feat: idp sync initial commit
jaaydenh Sep 17, 2024
7ff9a07
fix: hookup backend data for groups and roles
jaaydenh Sep 20, 2024
6e303f4
chore: cleanup
jaaydenh Sep 20, 2024
310726b
feat: separate groups and roles into tabs
jaaydenh Sep 21, 2024
615c8d3
feat: implement export policy button
jaaydenh Sep 22, 2024
45f4d13
feat: handle missing groups
jaaydenh Sep 22, 2024
080b032
chore: add story for missing groups
jaaydenh Sep 22, 2024
8e1e021
chore: add stories for export policy button
jaaydenh Sep 22, 2024
c863619
fix: updates for PR review
jaaydenh Sep 23, 2024
41631f0
chore: update tests
jaaydenh Sep 24, 2024
3db9f48
chore: document uuid regex
jaaydenh Sep 24, 2024
431beea
chore: remove unused
jaaydenh Sep 24, 2024
f166784
fix: fix stories
jaaydenh Sep 24, 2024
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
chore: cleanup
  • Loading branch information
@jaaydenh
jaaydenh committed Sep 20, 2024
commit 6e303f42df0b1a25e03bc06df49697a85236eb89
7 changes: 7 additions & 0 deletions site/src/api/queries/organizations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,13 @@ export const organizationsPermissions = (
},
action: "read",
},
viewIdpSyncSettings: {
object: {
resource_type: "idpsync_settings",
organization_id: organizationId,
},
action: "read",
},
});

// The endpoint takes a flat array, so to avoid collisions prepend each
Expand Down
22 changes: 14 additions & 8 deletions site/src/pages/ManagementSettingsPage/IdpSyncPage/IdpSyncPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
organizationsPermissions,
roleIdpSyncSettings,
} from "api/queries/organizations";
import { ErrorAlert } from "components/Alert/ErrorAlert";
import { EmptyState } from "components/EmptyState/EmptyState";
import { FeatureStageBadge } from "components/FeatureStageBadge/FeatureStageBadge";
import { Loader } from "components/Loader/Loader";
Expand All @@ -27,12 +28,6 @@ export const IdpSyncPage: FC = () => {
const { organization: organizationName } = useParams() as {
organization: string;
};

// feature visibility and permissions to be implemented when integrating with backend
// const feats = useFeatureVisibility();
// const { organization: organizationName } = useParams() as {
// organization: string;
// };
const { organizations } = useOrganizationSettings();

const organization = organizations?.find((o) => o.name === organizationName);
Expand All @@ -48,8 +43,6 @@ export const IdpSyncPage: FC = () => {
roleIdpSyncSettings(organizationName),
);

// const permissions = permissionsQuery.data;

if (!organization) {
return <EmptyState message="Organization not found" />;
}
Expand All @@ -62,6 +55,19 @@ export const IdpSyncPage: FC = () => {
return <Loader />;
}

const error =
groupIdpSyncSettingsQuery.error ||
roleIdpSyncSettingsQuery.error ||
groupsQuery.error;
if (
error ||
!groupIdpSyncSettingsQuery.data ||
!roleIdpSyncSettingsQuery.data ||
!groupsQuery.data
) {
return <ErrorAlert error={error} />;
}

return (
<>
<Helmet>
Expand Down
26 changes: 23 additions & 3 deletions site/src/pages/ManagementSettingsPage/IdpSyncPage/IdpSyncPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import type { Interpolation, Theme } from "@emotion/react";
import { useTheme } from "@emotion/react";
import LaunchOutlined from "@mui/icons-material/LaunchOutlined";
import Button from "@mui/material/Button";
import Skeleton from "@mui/material/Skeleton";
Expand Down Expand Up @@ -39,8 +38,6 @@ export const IdpSyncPageView: FC<IdpSyncPageViewProps> = ({
roleSyncSettings,
groups,
}) => {
// const theme = useTheme();

const groupsMap = new Map<string, string>();
if (groups) {
for (const group of groups) {
Expand Down Expand Up @@ -101,6 +98,29 @@ export const IdpSyncPageView: FC<IdpSyncPageViewProps> = ({
</Stack>
</fieldset>
</Stack>
{groupSyncSettings?.mapping && roleSyncSettings?.mapping && (
<div
css={(theme) => ({
margin: 0,
fontSize: 13,
paddingBottom: 14,
color: theme.palette.text.secondary,
"& strong": {
color: theme.palette.text.primary,
},
})}
>
Showing{" "}
<strong>
{Object.entries(groupSyncSettings?.mapping).length}
</strong>{" "}
groups and{" "}
<strong>
{Object.entries(roleSyncSettings?.mapping).length}
</strong>{" "}
provisioners
</div>
)}
<Stack spacing={6}>
<IdpMappingTable
type="Group"
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/ManagementSettingsPage/SidebarView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ const OrganizationSettingsNavigation: FC<
Provisioners
</SidebarNavSubItem>
)}
{organization.permissions.editMembers && (
{organization.permissions.viewIdpSyncSettings && (
<SidebarNavSubItem
href={urlForSubpage(organization.name, "idp-sync")}
>
Expand Down
Loading