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

fix: update user management filters for emails with special characters #1129

Merged
Merged
Show file tree
Hide file tree
Changes from 2 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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,12 @@
- **Technical User Management**
- Display technicalUserManagement button based on role validation [#1073](https://github.com/eclipse-tractusx/portal-frontend/pull/1073)
- **OSP Consent form**

ss-nikunj marked this conversation as resolved.
Show resolved Hide resolved
- Display invited company name in OSP consent form (Previously hard coded with 'BMW') [#1083](https://github.com/eclipse-tractusx/portal-frontend/pull/1083)

- **User Management**
- Fixed special characters in user management email filters [#1128](https://github.com/eclipse-tractusx/portal-frontend/issues/1128)

## 2.2.0

### Change
Expand Down
2 changes: 1 addition & 1 deletion src/components/shared/frame/UserList/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export const UserList = ({
const searchInputData = useSelector(appManagementSelector)

const validateSearchText = (expr: string) => {
const validateExpr = /^[ A-Za-z0-9._!@-]*$/.test(expr)
const validateExpr = /^[ A-Za-z0-9._!@+-]*$/.test(expr)
ss-nikunj marked this conversation as resolved.
Show resolved Hide resolved
if (validateExpr) dispatch(setSearchInput({ open: true, text: expr }))
return validateExpr
}
Expand Down
2 changes: 1 addition & 1 deletion src/features/admin/userApiSlice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ export const apiSlice = createApi({
query: (fetchArgs) =>
`/api/administration/user/owncompany/users?status=ACTIVE&size=${PAGE_SIZE}&page=${
fetchArgs.page
}&email=${fetchArgs.args!.expr}`,
}&email=${encodeURIComponent(fetchArgs.args!.expr)}`,
}),
fetchUsersRoles: builder.query<PaginResult<TenantUser>, string>({
query: (companyUserId) =>
Expand Down
Loading