Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2025-03-31 22:51:25 -05:00
Code Issues Activity

fix(console): organization guide should check required fields on navigation (#4791)

Browse source
This commit is contained in:
Charles Zhao 2023-11-01 08:47:57 +08:00 • committed by GitHub
parent 8616496c61
commit 02edca0981
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
packages/console/src/pages/Organizations/Guide/CreatePermissions/index.tsx
View file

@ -68,29 +68,28 @@ function CreatePermissions() {
const { fields, append, remove } = useFieldArray({ control, name: 'permissions' });
const onSubmit = () => {
if (!isDirty) {
navigate(`../${steps.createRoles}`);
return;
}
void handleSubmit(
trySubmitSafe(async ({ permissions }) => {
if (data?.length) {
await Promise.all(
data.map(async ({ id }) => api.delete(`${organizationScopesPath}/${id}`))
);
}
await Promise.all(
permissions.map(async ({ name, description }) => {
await api.post(organizationScopesPath, { json: { name, description } });
})
);
const onSubmit = handleSubmit(
trySubmitSafe(async ({ permissions }) => {
// If user has pre-saved data and no changes, skip submit and go directly to next step
if (data?.length && !isDirty) {
navigate(`../${steps.createRoles}`);
})
)();
};
return;
}
if (data?.length) {
await Promise.all(
data.map(async ({ id }) => api.delete(`${organizationScopesPath}/${id}`))
);
}
await Promise.all(
permissions.map(async ({ name, description }) => {
await api.post(organizationScopesPath, { json: { name, description } });
})
);
navigate(`../${steps.createRoles}`);
})
);
return (
<>

57
packages/console/src/pages/Organizations/Guide/CreateRoles/index.tsx
View file

@ -68,37 +68,34 @@ function CreateRoles() {
const { fields, append, remove } = useFieldArray({ control, name: 'roles' });
const onSubmit = () => {
if (!isDirty) {
navigate(`../${steps.createOrganization}`);
return;
}
void handleSubmit(
trySubmitSafe(async ({ roles }) => {
if (data?.length) {
await Promise.all(
data.map(async ({ id }) => api.delete(`${organizationRolePath}/${id}`))
);
}
await Promise.all(
roles.map(async ({ name, description, scopes }) => {
const { id } = await api
.post(organizationRolePath, { json: { name, description } })
.json<OrganizationRole>();
if (scopes.length > 0) {
await api.put(`${organizationRolePath}/${id}/scopes`, {
json: { organizationScopeIds: scopes.map(({ value }) => value) },
});
}
})
);
const onSubmit = handleSubmit(
trySubmitSafe(async ({ roles }) => {
// If user has pre-saved data and no changes, skip submit and go directly to next step
if (data?.length && !isDirty) {
navigate(`../${steps.createOrganization}`);
})
)();
};
return;
}
if (data?.length) {
await Promise.all(data.map(async ({ id }) => api.delete(`${organizationRolePath}/${id}`)));
}
await Promise.all(
roles.map(async ({ name, description, scopes }) => {
const { id } = await api
.post(organizationRolePath, { json: { name, description } })
.json<OrganizationRole>();
if (scopes.length > 0) {
await api.put(`${organizationRolePath}/${id}/scopes`, {
json: { organizationScopeIds: scopes.map(({ value }) => value) },
});
}
})
);
navigate(`../${steps.createOrganization}`);
})
);
const onNavigateBack = () => {
reset();