Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-24 09:28:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

workspace name re-render (#12585)

Browse source
This commit is contained in:
Rudhra Deep Biswas 2025-04-15 17:58:40 +05:30 committed by GitHub
parent 20e76dcd22
commit 8ee3bca147
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
frontend/src/modules/common/components/BaseManageOrgConstants/BaseManageOrgConstants.jsx
View file

@ -348,10 +348,10 @@ const BaseManageOrgConstants = ({
toast.success('Constant updated successfully');
onCancelBtnClicked();
})
.catch(({ error }) => {
.catch(({ error, data }) => {
setErrors(error);
toast.error(error);
if (error === NoPermissionMessage) {
toast.error(data?.statusCode === 403 ? 'You do not have permissions to perform this action' : data?.message);
if (error === NoPermissionMessage || data?.statusCode === 403) {
redirectToWorkspace();
}
})
@ -364,10 +364,10 @@ const BaseManageOrgConstants = ({
toast.success(`${variable.type} constant created successfully!`);
onCancelBtnClicked();
})
.catch(({ error }) => {
.catch(({ error, data }) => {
setErrors(error);
toast.error(error || 'Constant could not be created');
if (error === NoPermissionMessage) {
toast.error(data?.statusCode === 403 ? 'You do not have permissions to perform this action' : data?.message);
if (error === NoPermissionMessage || data?.statusCode === 403) {
redirectToWorkspace();
}
})
@ -390,9 +390,10 @@ const BaseManageOrgConstants = ({
setSelectedConstant(null);
setMode(MODES.NULL);
})
.catch(({ error }) => {
toast.error(error);
if (error === NoPermissionMessage) {
.catch(({ error, data }) => {
setErrors(error);
toast.error(data?.statusCode === 403 ? 'You do not have permissions to perform this action' : data?.message);
if (error === NoPermissionMessage || data?.statusCode === 403) {
redirectToWorkspace();
}
})

4
frontend/src/modules/onboarding/components/OnboardingQuestions/components/WorkspaceNameForm/WorkspaceNameForm.jsx
View file

@ -83,7 +83,9 @@ const WorkspaceNameForm = () => {
setFormData({ workspaceName: defaultWorkspaceName });
setIsFormValid(true);
};
handleDefaultWorkspaceName();
if (!formData.workspaceName || formData.workspaceName === '') {
handleDefaultWorkspaceName();
}
}, [adminDetails.email, inviteeEmail]);
const isWorkspaceNameUnique = async (value) => {