Skip to content

Commit 4dabb5f

Browse files
jaaydenhjaaydenh
committed
fix: adding loading spinners
1 parent fd75278 commit 4dabb5f

File tree

4 files changed

+27
-13
lines changed

4 files changed

+27
-13
lines changed

‎site/src/pages/DeploymentSettingsPage/IdpOrgSyncPage/IdpOrgSyncPageView.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import {
3232
MultiSelectCombobox,
3333
type Option,
3434
} from "components/MultiSelectCombobox/MultiSelectCombobox";
35+
import { Spinner } from "components/Spinner/Spinner";
3536
import { Switch } from "components/Switch/Switch";
3637
import { useFormik } from "formik";
3738
import { Plus, SquareArrowOutUpRight, Trash } from "lucide-react";
@@ -132,6 +133,7 @@ export const IdpOrgSyncPageView: FC<IdpSyncPageViewProps> = ({
132133
form.handleSubmit();
133134
}}
134135
>
136+
<Spinner loading={form.isSubmitting} />
135137
Save
136138
</Button>
137139
</div>
@@ -221,7 +223,9 @@ export const IdpOrgSyncPageView: FC<IdpSyncPageViewProps> = ({
221223
setCoderOrgs([]);
222224
}}
223225
>
224-
<Plus size={14} />
226+
<Spinner loading={form.isSubmitting}>
227+
<Plus size={14} />
228+
</Spinner>
225229
Add IdP organization
226230
</Button>
227231
</div>
@@ -267,6 +271,7 @@ export const IdpOrgSyncPageView: FC<IdpSyncPageViewProps> = ({
267271
}}
268272
type="submit"
269273
>
274+
<Spinner loading={form.isSubmitting} />
270275
Confirm
271276
</Button>
272277
</DialogFooter>
@@ -344,7 +349,7 @@ const OrganizationRow: FC<OrganizationRowProps> = ({
344349
<TableCell>
345350
<Button
346351
variant="outline"
347-
className="w-8 h-8 px-1.5 py-1.5 text-content-secondary"
352+
className="w-8 h-8 min-w-10 text-content-primary"
348353
aria-label="delete"
349354
onClick={() => onDelete(idpOrg)}
350355
>

‎site/src/pages/ManagementSettingsPage/CustomRolesPage/CustomRolesPageView.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ export const CustomRolesPageView: FC<CustomRolesPageViewProps> = ({
4545
canAssignOrgRole,
4646
isCustomRolesEnabled,
4747
}) => {
48-
const theme = useTheme();
4948
return (
5049
<Stack spacing={4}>
5150
{!isCustomRolesEnabled && (

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

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import {
2020
MultiSelectCombobox,
2121
type Option,
2222
} from "components/MultiSelectCombobox/MultiSelectCombobox";
23+
import { Spinner } from "components/Spinner/Spinner";
2324
import { Switch } from "components/Switch/Switch";
2425
import { useFormik } from "formik";
2526
import { Plus, Trash } from "lucide-react";
@@ -144,6 +145,7 @@ export const IdpGroupSyncForm = ({
144145
form.handleSubmit();
145146
}}
146147
>
148+
<Spinner loading={form.isSubmitting} />
147149
Save
148150
</Button>
149151
</div>
@@ -154,14 +156,16 @@ export const IdpGroupSyncForm = ({
154156
</div>
155157
</div>
156158
<div className="flex flex-row items-center gap-3">
157-
<Switch
158-
id={AUTO_CREATE_MISSING_GROUPS_ID}
159-
checked={form.values.auto_create_missing_groups}
160-
onCheckedChange={async (checked) => {
161-
void form.setFieldValue("auto_create_missing_groups", checked);
162-
form.handleSubmit();
163-
}}
164-
/>
159+
<Spinner size="sm" loading={form.isSubmitting} className="w-9">
160+
<Switch
161+
id={AUTO_CREATE_MISSING_GROUPS_ID}
162+
checked={form.values.auto_create_missing_groups}
163+
onCheckedChange={async (checked) => {
164+
void form.setFieldValue("auto_create_missing_groups", checked);
165+
form.handleSubmit();
166+
}}
167+
/>
168+
</Spinner>
165169
<span className="flex flex-row items-center gap-1">
166170
<Label htmlFor={AUTO_CREATE_MISSING_GROUPS_ID}>
167171
Auto create missing groups
@@ -224,7 +228,9 @@ export const IdpGroupSyncForm = ({
224228
setCoderGroups([]);
225229
}}
226230
>
227-
<Plus size={14} />
231+
<Spinner loading={form.isSubmitting}>
232+
<Plus size={14} />
233+
</Spinner>
228234
Add IdP group
229235
</Button>
230236
</div>

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
MultiSelectCombobox,
99
type Option,
1010
} from "components/MultiSelectCombobox/MultiSelectCombobox";
11+
import { Spinner } from "components/Spinner/Spinner";
1112
import { useFormik } from "formik";
1213
import { Plus, Trash } from "lucide-react";
1314
import { type FC, useState } from "react";
@@ -105,6 +106,7 @@ export const IdpRoleSyncForm = ({
105106
form.handleSubmit();
106107
}}
107108
>
109+
<Spinner loading={form.isSubmitting} />
108110
Save
109111
</Button>
110112
</div>
@@ -168,7 +170,9 @@ export const IdpRoleSyncForm = ({
168170
setCoderRoles([]);
169171
}}
170172
>
171-
<Plus size={14} />
173+
<Spinner loading={form.isSubmitting}>
174+
<Plus size={14} />
175+
</Spinner>
172176
Add IdP role
173177
</Button>
174178
</div>

0 commit comments

Comments
 (0)