Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tapan - Fixed UI for Create New Role Without Name and Permission #2031

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/components/PermissionsManagement/NewRolePopUp.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ function CreateNewRolePopup({ toggle, addNewRole, roleNames }) {
const handleSubmit = async e => {
e.preventDefault();

if (!isValidRole) {
if (newRoleName.trim() === '') {
toast.error('Please enter a role name');
} else if (permissionsChecked.length === 0) {
toast.error('Please select at least one permission');
} else if (!isValidRole) {
toast.error('Please enter a valid role name');
} else if (!isNotDuplicateRole) {
toast.error('Please enter a non duplicate role name');
Expand All @@ -38,6 +42,7 @@ function CreateNewRolePopup({ toggle, addNewRole, roleNames }) {
const regexTest = noSymbolsRegex.test(value);
const duplicateTest = checkIfDuplicate(value);
if (value.trim() === '') {
/* Changes Made */
setNewRoleName(value);
setErrorMessage('Please enter a role name');
setIsValidRole(false);
Expand Down
Loading