Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 08:58:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fixed error message conflicts

Browse source
This commit is contained in:
Muhsin Shah 2023-10-18 14:25:06 +05:30
parent 3ea8d6e3ca
commit 4cdd446043
5 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/Editor/Header/GlobalSettings.jsx
View file

@ -62,7 +62,7 @@ export const GlobalSettings = ({
error: null,
});
const error = validateName(value, `App ${field}`, false, !(field === 'slug'), !(field === 'slug'));
const error = validateName(value, `App ${field}`, true, false, !(field === 'slug'), !(field === 'slug'));
if (!_.isEmpty(value) && value !== oldSlug && _.isEmpty(error.errorMsg)) {
setSlugProgress(true);

2
frontend/src/Editor/ManageAppUsers.jsx
View file

@ -129,7 +129,7 @@ class ManageAppUsersComponent extends React.Component {
},
});
const error = validateName(value, `App ${field}`, false, !(field === 'slug'), !(field === 'slug'));
const error = validateName(value, `App ${field}`, true, false, !(field === 'slug'), !(field === 'slug'));
if (!_.isEmpty(value) && value !== this.props.slug && _.isEmpty(error.errorMsg)) {
this.setState({

2
frontend/src/HomePage/Folders.jsx
View file

@ -188,7 +188,7 @@ export const Folders = function Folders({
const handleInputChange = (e) => {
setErrorText('');
const error = validateName(e.target.value, 'Folder name', false, false);
const error = validateName(e.target.value, 'Folder name', true, false, false);
if (!error.status) {
setErrorText(error.errorMsg);
}

1
frontend/src/_components/OrganizationManager/CreateOrganization.jsx
View file

@ -57,6 +57,7 @@ export const CreateOrganization = ({ showCreateOrg, setShowCreateOrg }) => {
let error = validateName(
value,
`Workspace ${field}`,
true,
false,
!(field === 'slug'),
!(field === 'slug'),

1
frontend/src/_components/OrganizationManager/EditOrganization.jsx
View file

@ -81,6 +81,7 @@ export const EditOrganization = ({ showEditOrg, setShowEditOrg, currentValue })
let error = validateName(
value,
`Workspace ${field}`,
true,
false,
!(field === 'slug'),
!(field === 'slug'),