Skip to content

Commit 6030922

Browse files
jaaydenhjaaydenh
committed
fix: update error handling
1 parent 0e7e3c3 commit 6030922

File tree

2 files changed

+32
-59
lines changed

2 files changed

+32
-59
lines changed

‎site/src/pages/ManagementSettingsPage/IdpSyncPage/IdpSyncPage.tsx

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -58,28 +58,6 @@ export const IdpSyncPage: FC = () => {
5858
patchRoleSyncSettings(organizationName, queryClient),
5959
);
6060

61-
useEffect(() => {
62-
if (patchGroupSyncSettingsMutation.error) {
63-
displayError(
64-
getErrorMessage(
65-
patchGroupSyncSettingsMutation.error,
66-
"Error updating IdP group sync settings.",
67-
),
68-
);
69-
}
70-
}, [patchGroupSyncSettingsMutation.error]);
71-
72-
useEffect(() => {
73-
if (patchRoleSyncSettingsMutation.error) {
74-
displayError(
75-
getErrorMessage(
76-
patchRoleSyncSettingsMutation.error,
77-
"Error updating IdP role sync settings.",
78-
),
79-
);
80-
}
81-
}, [patchRoleSyncSettingsMutation.error]);
82-
8361
const error =
8462
groupIdpSyncSettingsQuery.error ||
8563
roleIdpSyncSettingsQuery.error ||

‎site/src/pages/ManagementSettingsPage/IdpSyncPage/IdpSyncPageView.tsx

Lines changed: 32 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -81,48 +81,43 @@ export const IdpSyncPageView: FC<IdpSyncPageViewProps> = ({
8181
? Object.entries(roleSyncSettings.mapping).length
8282
: 0;
8383

84-
if (error) {
85-
return <ErrorAlert error={error} />;
86-
}
87-
8884
if (!groupSyncSettings || !roleSyncSettings || !groups) {
8985
return <Loader />;
9086
}
9187

9288
return (
93-
<>
94-
<div className="flex flex-col gap-4">
95-
<Tabs active={tab}>
96-
<TabsList>
97-
<TabLink to="?tab=groups" value="groups">
98-
Group sync settings
99-
</TabLink>
100-
<TabLink to="?tab=roles" value="roles">
101-
Role sync settings
102-
</TabLink>
103-
</TabsList>
104-
</Tabs>
105-
{tab === "groups" ? (
106-
<IdpGroupSyncForm
107-
groupSyncSettings={groupSyncSettings}
108-
groupMappingCount={groupMappingCount}
109-
legacyGroupMappingCount={legacyGroupMappingCount}
110-
groups={groups}
111-
groupsMap={groupsMap}
112-
organization={organization}
113-
onSubmit={onSubmitGroupSyncSettings}
114-
/>
115-
) : (
116-
<IdpRoleSyncForm
117-
roleSyncSettings={roleSyncSettings}
118-
roleMappingCount={roleMappingCount}
119-
roles={roles || []}
120-
organization={organization}
121-
onSubmit={onSubmitRoleSyncSettings}
122-
/>
123-
)}
124-
</div>
125-
</>
89+
<div className="flex flex-col gap-4">
90+
{Boolean(error) && <ErrorAlert error={error} />}
91+
<Tabs active={tab}>
92+
<TabsList>
93+
<TabLink to="?tab=groups" value="groups">
94+
Group sync settings
95+
</TabLink>
96+
<TabLink to="?tab=roles" value="roles">
97+
Role sync settings
98+
</TabLink>
99+
</TabsList>
100+
</Tabs>
101+
{tab === "groups" ? (
102+
<IdpGroupSyncForm
103+
groupSyncSettings={groupSyncSettings}
104+
groupMappingCount={groupMappingCount}
105+
legacyGroupMappingCount={legacyGroupMappingCount}
106+
groups={groups}
107+
groupsMap={groupsMap}
108+
organization={organization}
109+
onSubmit={onSubmitGroupSyncSettings}
110+
/>
111+
) : (
112+
<IdpRoleSyncForm
113+
roleSyncSettings={roleSyncSettings}
114+
roleMappingCount={roleMappingCount}
115+
roles={roles || []}
116+
organization={organization}
117+
onSubmit={onSubmitRoleSyncSettings}
118+
/>
119+
)}
120+
</div>
126121
);
127122
};
128123

0 commit comments

Comments
 (0)