Skip to content

Commit b661b81

Browse files
committed
fix: remove empty strings from the user input
1 parent 92e8467 commit b661b81

File tree

2 files changed

+13
-15
lines changed

2 files changed

+13
-15
lines changed

src/authz-module/libraries-manager/components/AddNewTeamMemberModal/AddNewTeamMemberTrigger.test.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ describe('AddNewTeamMemberTrigger', () => {
133133
const [, { onSuccess }] = mockMutate.mock.calls[0];
134134
onSuccess({
135135
completed: [
136-
{ user: '[email protected]', status: 'role_added' },
137-
{ user: '[email protected]', status: 'added_to_team' },
136+
{ userIdentifier: '[email protected]', status: 'role_added' },
137+
{ userIdentifier: '[email protected]', status: 'added_to_team' },
138138
],
139139
errors: [],
140140
});
@@ -160,10 +160,10 @@ describe('AddNewTeamMemberTrigger', () => {
160160
const [, { onSuccess }] = mockMutate.mock.calls[0];
161161
onSuccess({
162162
completed: [
163-
{ user: '[email protected]', status: 'role_added' },
163+
{ userIdentifier: '[email protected]', status: 'role_added' },
164164
],
165165
errors: [
166-
{ user: '[email protected]', error: 'user_not_found' },
166+
{ userIdentifier: '[email protected]', error: 'user_not_found' },
167167
],
168168
});
169169

@@ -191,8 +191,8 @@ describe('AddNewTeamMemberTrigger', () => {
191191
onSuccess({
192192
completed: [],
193193
errors: [
194-
{ user: '[email protected]', error: 'user_not_found' },
195-
{ user: '[email protected]', error: 'user_not_found' },
194+
{ userIdentifier: '[email protected]', error: 'user_not_found' },
195+
{ userIdentifier: '[email protected]', error: 'user_not_found' },
196196
],
197197
});
198198

@@ -222,7 +222,7 @@ describe('AddNewTeamMemberTrigger', () => {
222222
// Simulate successful response with no errors
223223
const [, { onSuccess }] = mockMutate.mock.calls[0];
224224
onSuccess({
225-
completed: [{ user: '[email protected]', status: 'role_added' }],
225+
completed: [{ userIdentifier: '[email protected]', status: 'role_added' }],
226226
errors: [],
227227
});
228228

@@ -249,7 +249,7 @@ describe('AddNewTeamMemberTrigger', () => {
249249
// Simulate successful response
250250
const [, { onSuccess }] = mockMutate.mock.calls[0];
251251
onSuccess({
252-
completed: [{ user: '[email protected]', status: 'role_added' }],
252+
completed: [{ userIdentifier: '[email protected]', status: 'role_added' }],
253253
errors: [],
254254
});
255255

src/authz-module/libraries-manager/components/AddNewTeamMemberModal/AddNewTeamMemberTrigger.tsx

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const AddNewTeamMemberTrigger: FC<AddNewTeamMemberTriggerProps> = ({
4444
const handleErrors = (errors: PutAssignTeamMembersRoleResponse['errors']) => {
4545
setIsError(false);
4646
const notFoundUsers = errors.filter(err => err.error === RoleOperationErrorStatus.USER_NOT_FOUND)
47-
.map(err => err.userIdentifier);
47+
.map(err => err.userIdentifier.trim());
4848

4949
if (errors.length === 1 && errors[0].error === RoleOperationErrorStatus.USER_ALREADY_HAS_ROLE) {
5050
setFormValues(DEFAULT_FORM_VALUES);
@@ -55,12 +55,9 @@ const AddNewTeamMemberTrigger: FC<AddNewTeamMemberTriggerProps> = ({
5555
setIsError(true);
5656
setFormValues((prev) => ({
5757
...prev,
58-
users: prev.users
59-
.split(',')
60-
.map(user => user.trim())
61-
.filter(user => notFoundUsers.includes(user))
62-
.join(', '),
58+
users: notFoundUsers.join(', '),
6359
}));
60+
6461
setAdditionMessage((prevMessage) => (
6562
`${prevMessage ? `${prevMessage} ` : ''}${intl.formatMessage(
6663
messages['libraries.authz.manage.add.member.failure'],
@@ -72,8 +69,9 @@ const AddNewTeamMemberTrigger: FC<AddNewTeamMemberTriggerProps> = ({
7269
};
7370

7471
const handleAddTeamMember = () => {
72+
const normalizedUsers = new Set(formValues.users.split(',').map(user => user.trim()).filter(user => user));
7573
const data = {
76-
users: formValues.users.split(',').map(user => user.trim()),
74+
users: [...normalizedUsers],
7775
role: formValues.role,
7876
scope: libraryId,
7977
};

0 commit comments

Comments
 (0)