PIMS Release v6.3.1-122.7#5334
Merged
Merged
Conversation
ETL Release 6.1 and 6.2 items
# Conflicts: # source/frontend/src/features/acquisition/list/AcquisitionFilter/AcquisitionFilter.test.tsx # source/frontend/src/features/projects/list/ProjectFilter/ProjectFilter.test.tsx # source/frontend/src/features/projects/list/ProjectListView.test.tsx
Playwright setup
- Added smoke-test project & setup
ETL Release 6.1 and 6.2 items
PSP-11363 : Checklist header
Bump version IS-122
- Help desk page smoke test
PSP-11549: Playwright
PSP-11586 : FT: Checklists - when using the header checklist and the user saves, changes are not saved.
PSP-11192 : DEV: When a user doesn't have a specific region on their access but chooses on a map a property from that region and creates a file, the backend gives a 403 error.
PSP-5677: List-view Tables: Filter projects and research by Created By
# Conflicts: # source/backend/entities/Models/ProjectFilter.cs # source/frontend/src/features/projects/interfaces.ts # source/frontend/src/features/projects/list/ProjectFilter/ProjectFilter.test.tsx # source/frontend/src/features/projects/list/ProjectFilter/ProjectFilter.tsx # source/frontend/src/features/projects/list/ProjectFilter/models/ProjectFilterModel.ts # source/frontend/src/features/projects/list/ProjectListView.tsx
PSP-11374: Add team member role to team member search
UAT release 6.3.122
…PIMS API) (#5332) * Refactor logging configuration: move settings from appsettings to a separate logging.json file * Refactor database context configuration: enable sensitive data logging only in local environment * Increment hotfix number * Linting
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
|
|
||
| import * as API from '@/constants/API'; | ||
| import { MultiSelectOption } from '@/interfaces/MultiSelectOption'; | ||
| import { IUsersFilter } from '@/interfaces'; |
|
|
||
| import { LeaseListView } from './LeaseListView'; | ||
| import { mockLookups } from '@/mocks/lookups.mock'; | ||
| import { IPaginateParams } from '@/constants/API'; |
| import { LeaseListView } from './LeaseListView'; | ||
| import { mockLookups } from '@/mocks/lookups.mock'; | ||
| import { IPaginateParams } from '@/constants/API'; | ||
| import { IUsersFilter } from '@/interfaces'; |
|
| predicate = predicate.And(disp => disp.PimsDispositionFileTeams.Any(x => x.PersonId == filter.TeamMemberPersonId.Value)); | ||
| } | ||
|
|
||
| if (filter.TeamMemberOrganizationId.HasValue) |
| predicateBuilder = predicateBuilder.And(l => l.PimsLeaseLicenseTeams.Any(lt => lt.PersonId == filter.LeaseTeamPersonId.Value)); | ||
| } | ||
|
|
||
| if (filter.LeaseTeamOrganizationId.HasValue) |
| } | ||
|
|
||
| if (filter.TeamMemberOrganizationId.HasValue) | ||
| if(!string.IsNullOrWhiteSpace(filter.TeamMemberProfileTypeCode) && filter.TeamMemberOrganizationId.HasValue) |
| if(filter.TeamMemberPersonId.HasValue) | ||
| { | ||
| query = query.Where(x => x.PimsProjectPeople.Any(x => x.PersonId == filter.TeamMemberPersonId.Value)); | ||
| } |
|
|
||
| if (filter.ActiveOnly == true) | ||
| { | ||
| query = query.Where(u => u.IsDisabled == false); |
Contributor
|
See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/5334 |
1 similar comment
Contributor
|
See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/5334 |
JamesPayer
approved these changes
Jun 11, 2026
JamesPayer
left a comment
JamesPayer
left a comment
Collaborator
There was a problem hiding this comment.
PROD Env Release 6.3.1-122.7
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.