From 0aaff51a31afc27d0a00038db4d1c59e9f4e04ab Mon Sep 17 00:00:00 2001 From: Herrera Date: Tue, 10 Mar 2026 10:45:25 -0700 Subject: [PATCH 1/3] PSP-6586 : List-view Tables: all text box search filters do not TRIM white space --- .../Areas/Acquisition/Models/AcquisitionFilterModel.cs | 8 ++++---- .../Areas/Disposition/Models/DispositionFilterModel.cs | 4 ++-- .../api/Areas/Projects/Models/ProjectFilterModel.cs | 4 ++-- source/backend/core/Extensions/DictionaryExtensions.cs | 2 +- source/backend/entities/Models/ProjectFilter.cs | 8 ++++---- source/backend/ltsa/LtsaService.cs | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/source/backend/api/Areas/Acquisition/Models/AcquisitionFilterModel.cs b/source/backend/api/Areas/Acquisition/Models/AcquisitionFilterModel.cs index 939844eecf..1d78e31e50 100644 --- a/source/backend/api/Areas/Acquisition/Models/AcquisitionFilterModel.cs +++ b/source/backend/api/Areas/Acquisition/Models/AcquisitionFilterModel.cs @@ -110,11 +110,11 @@ public static explicit operator AcquisitionFilter(AcquisitionFilterModel model) Pid = model.Pid, Pin = model.Pin, - Address = model.Address, + Address = model.Address.Trim(), AcquisitionFileStatusTypeCode = model.AcquisitionFileStatusTypeCode, - AcquisitionFileNameOrNumber = model.AcquisitionFileNameOrNumber, - ProjectNameOrNumber = model.ProjectNameOrNumber, - OwnerName = model.OwnerName, + AcquisitionFileNameOrNumber = model.AcquisitionFileNameOrNumber.Trim(), + ProjectNameOrNumber = model.ProjectNameOrNumber.Trim(), + OwnerName = model.OwnerName.Trim(), AcquisitionTeamMemberPersonId = model.AcquisitionTeamMemberPersonId, AcquisitionTeamMemberOrganizationId = model.AcquisitionTeamMemberOrganizationId, HasNoticeOfClaim = model.HasNoticeOfClaim, diff --git a/source/backend/api/Areas/Disposition/Models/DispositionFilterModel.cs b/source/backend/api/Areas/Disposition/Models/DispositionFilterModel.cs index ea76ca7d00..45375f3baa 100644 --- a/source/backend/api/Areas/Disposition/Models/DispositionFilterModel.cs +++ b/source/backend/api/Areas/Disposition/Models/DispositionFilterModel.cs @@ -103,8 +103,8 @@ public static explicit operator DispositionFilter(DispositionFilterModel model) Pid = model.Pid, Pin = model.Pin, - Address = model.Address, - FileNameOrNumberOrReference = model.FileNameOrNumberOrReference, + Address = model.Address.Trim(), + FileNameOrNumberOrReference = model.FileNameOrNumberOrReference.Trim(), DispositionFileStatusCode = model.DispositionFileStatusCode, DispositionStatusCode = model.DispositionStatusCode, DispositionTypeCode = model.DispositionTypeCode, diff --git a/source/backend/api/Areas/Projects/Models/ProjectFilterModel.cs b/source/backend/api/Areas/Projects/Models/ProjectFilterModel.cs index 496bf60a25..8ccd8120f3 100644 --- a/source/backend/api/Areas/Projects/Models/ProjectFilterModel.cs +++ b/source/backend/api/Areas/Projects/Models/ProjectFilterModel.cs @@ -23,8 +23,8 @@ public static explicit operator ProjectFilter(ProjectFilterModel model) Page = model.Page, Quantity = model.Quantity, - ProjectNumber = model.ProjectNumber, - ProjectName = model.ProjectName, + ProjectNumber = model.ProjectNumber.Trim(), + ProjectName = model.ProjectName.Trim(), ProjectStatusCode = model.ProjectStatusCode, ProjectRegionCode = model.ProjectRegionCode, diff --git a/source/backend/core/Extensions/DictionaryExtensions.cs b/source/backend/core/Extensions/DictionaryExtensions.cs index e76b9bcfa2..2690f44820 100644 --- a/source/backend/core/Extensions/DictionaryExtensions.cs +++ b/source/backend/core/Extensions/DictionaryExtensions.cs @@ -198,7 +198,7 @@ public static double GetDoubleValue(this IDictionary public static string GetStringValue(this IDictionary dict, string key, string defaultValue = null) { - return dict.TryGetValue(key, out Microsoft.Extensions.Primitives.StringValues value) ? value.ToString() : defaultValue; + return dict.TryGetValue(key, out Microsoft.Extensions.Primitives.StringValues value) ? value.ToString().Trim() : defaultValue; } /// diff --git a/source/backend/entities/Models/ProjectFilter.cs b/source/backend/entities/Models/ProjectFilter.cs index ecd2cc6ac3..c8571d5fa7 100644 --- a/source/backend/entities/Models/ProjectFilter.cs +++ b/source/backend/entities/Models/ProjectFilter.cs @@ -8,10 +8,10 @@ public ProjectFilter() public ProjectFilter(string projectNumber, string projectName, string projectStatus, string projectRegion) { - this.ProjectNumber = projectNumber; - this.ProjectName = projectName; - this.ProjectStatusCode = projectStatus; - this.ProjectRegionCode = projectRegion; + ProjectNumber = projectNumber; + ProjectName = projectName; + ProjectStatusCode = projectStatus; + ProjectRegionCode = projectRegion; } public string ProjectNumber { get; set; } diff --git a/source/backend/ltsa/LtsaService.cs b/source/backend/ltsa/LtsaService.cs index 02008030c5..9c4e502a5d 100644 --- a/source/backend/ltsa/LtsaService.cs +++ b/source/backend/ltsa/LtsaService.cs @@ -366,7 +366,7 @@ public async Task>> PostParcelInfoOrder(str public async Task>> PostSpcpOrder(string strataPlanNumber) { var url = Options.HostUri.AppendToURL(Options.OrdersEndpoint); - SpcpOrder order = new(new StrataPlanCommonPropertyOrderParameters(strataPlanNumber), productType: OrderParent.ProductTypeEnum.commonProperty); + SpcpOrder order = new(new StrataPlanCommonPropertyOrderParameters(strataPlanNumber.Trim()), productType: OrderParent.ProductTypeEnum.commonProperty); return await PostOrderAsync>(url, new OrderWrapper(order)); } From d533a6eb19c0ef863b6b79e9c889b1e36bb1b4b5 Mon Sep 17 00:00:00 2001 From: Herrera Date: Tue, 10 Mar 2026 12:52:53 -0700 Subject: [PATCH 2/3] - test updates --- .../api/Areas/Disposition/Models/DispositionFilterModel.cs | 4 ++-- .../backend/api/Areas/Projects/Models/ProjectFilterModel.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/backend/api/Areas/Disposition/Models/DispositionFilterModel.cs b/source/backend/api/Areas/Disposition/Models/DispositionFilterModel.cs index 45375f3baa..22c3e64f3b 100644 --- a/source/backend/api/Areas/Disposition/Models/DispositionFilterModel.cs +++ b/source/backend/api/Areas/Disposition/Models/DispositionFilterModel.cs @@ -103,8 +103,8 @@ public static explicit operator DispositionFilter(DispositionFilterModel model) Pid = model.Pid, Pin = model.Pin, - Address = model.Address.Trim(), - FileNameOrNumberOrReference = model.FileNameOrNumberOrReference.Trim(), + Address = model.Address?.Trim(), + FileNameOrNumberOrReference = model.FileNameOrNumberOrReference?.Trim(), DispositionFileStatusCode = model.DispositionFileStatusCode, DispositionStatusCode = model.DispositionStatusCode, DispositionTypeCode = model.DispositionTypeCode, diff --git a/source/backend/api/Areas/Projects/Models/ProjectFilterModel.cs b/source/backend/api/Areas/Projects/Models/ProjectFilterModel.cs index 8ccd8120f3..932a21c81e 100644 --- a/source/backend/api/Areas/Projects/Models/ProjectFilterModel.cs +++ b/source/backend/api/Areas/Projects/Models/ProjectFilterModel.cs @@ -23,8 +23,8 @@ public static explicit operator ProjectFilter(ProjectFilterModel model) Page = model.Page, Quantity = model.Quantity, - ProjectNumber = model.ProjectNumber.Trim(), - ProjectName = model.ProjectName.Trim(), + ProjectNumber = model.ProjectNumber?.Trim(), + ProjectName = model.ProjectName?.Trim(), ProjectStatusCode = model.ProjectStatusCode, ProjectRegionCode = model.ProjectRegionCode, From eb4287c961e2b589e9f4264952ebb31dc6ce60cf Mon Sep 17 00:00:00 2001 From: Herrera Date: Thu, 12 Mar 2026 11:07:52 -0700 Subject: [PATCH 3/3] - Updates --- .../Acquisition/Models/AcquisitionFilterModel.cs | 12 ++++++------ .../Contacts/Models/Search/ContactFilterModel.cs | 4 ++-- .../Disposition/Models/DispositionFilterModel.cs | 4 ++-- .../api/Areas/Leases/Models/LeaseFilterModel.cs | 14 +++++++------- .../Models/ManagementActivityFilterModel.cs | 10 +++++----- .../Management/Models/ManagementFilterModel.cs | 10 +++++----- .../Areas/Property/Models/PropertyFilterModel.cs | 10 +++++----- .../Areas/Research/Models/ResearchFilterModel.cs | 10 +++++----- 8 files changed, 37 insertions(+), 37 deletions(-) diff --git a/source/backend/api/Areas/Acquisition/Models/AcquisitionFilterModel.cs b/source/backend/api/Areas/Acquisition/Models/AcquisitionFilterModel.cs index 1d78e31e50..1d7427cd1d 100644 --- a/source/backend/api/Areas/Acquisition/Models/AcquisitionFilterModel.cs +++ b/source/backend/api/Areas/Acquisition/Models/AcquisitionFilterModel.cs @@ -108,13 +108,13 @@ public static explicit operator AcquisitionFilter(AcquisitionFilterModel model) Page = model.Page, Quantity = model.Quantity, - Pid = model.Pid, - Pin = model.Pin, - Address = model.Address.Trim(), + Pid = model.Pid?.Trim(), + Pin = model.Pin?.Trim(), + Address = model.Address?.Trim(), AcquisitionFileStatusTypeCode = model.AcquisitionFileStatusTypeCode, - AcquisitionFileNameOrNumber = model.AcquisitionFileNameOrNumber.Trim(), - ProjectNameOrNumber = model.ProjectNameOrNumber.Trim(), - OwnerName = model.OwnerName.Trim(), + AcquisitionFileNameOrNumber = model.AcquisitionFileNameOrNumber?.Trim(), + ProjectNameOrNumber = model.ProjectNameOrNumber?.Trim(), + OwnerName = model.OwnerName?.Trim(), AcquisitionTeamMemberPersonId = model.AcquisitionTeamMemberPersonId, AcquisitionTeamMemberOrganizationId = model.AcquisitionTeamMemberOrganizationId, HasNoticeOfClaim = model.HasNoticeOfClaim, diff --git a/source/backend/api/Areas/Contacts/Models/Search/ContactFilterModel.cs b/source/backend/api/Areas/Contacts/Models/Search/ContactFilterModel.cs index 28a8afe970..950e00d5e9 100644 --- a/source/backend/api/Areas/Contacts/Models/Search/ContactFilterModel.cs +++ b/source/backend/api/Areas/Contacts/Models/Search/ContactFilterModel.cs @@ -71,8 +71,8 @@ public static explicit operator ContactFilter(ContactFilterModel model) Quantity = model.Quantity, SearchBy = model.SearchBy, - Summary = model.Summary, - Municipality = model.Municipality, + Summary = model.Summary?.Trim(), + Municipality = model.Municipality?.Trim(), ActiveContactsOnly = model.ActiveContactsOnly, Sort = model.Sort, diff --git a/source/backend/api/Areas/Disposition/Models/DispositionFilterModel.cs b/source/backend/api/Areas/Disposition/Models/DispositionFilterModel.cs index 22c3e64f3b..b12b61d0dd 100644 --- a/source/backend/api/Areas/Disposition/Models/DispositionFilterModel.cs +++ b/source/backend/api/Areas/Disposition/Models/DispositionFilterModel.cs @@ -101,8 +101,8 @@ public static explicit operator DispositionFilter(DispositionFilterModel model) Page = model.Page, Quantity = model.Quantity, - Pid = model.Pid, - Pin = model.Pin, + Pid = model.Pid?.Trim(), + Pin = model.Pin?.Trim(), Address = model.Address?.Trim(), FileNameOrNumberOrReference = model.FileNameOrNumberOrReference?.Trim(), DispositionFileStatusCode = model.DispositionFileStatusCode, diff --git a/source/backend/api/Areas/Leases/Models/LeaseFilterModel.cs b/source/backend/api/Areas/Leases/Models/LeaseFilterModel.cs index a5468452fc..ea59d1545c 100644 --- a/source/backend/api/Areas/Leases/Models/LeaseFilterModel.cs +++ b/source/backend/api/Areas/Leases/Models/LeaseFilterModel.cs @@ -136,18 +136,18 @@ public static explicit operator LeaseFilter(LeaseFilterModel model) Page = model.Page, Quantity = model.Quantity, - Pid = model.Pid, - Pin = model.Pin, - LFileNo = model.LFileNo, - Address = model.Address, - Historical = model.Historical, + Pid = model.Pid?.Trim(), + Pin = model.Pin?.Trim(), + LFileNo = model.LFileNo?.Trim(), + Address = model.Address?.Trim(), + Historical = model.Historical?.Trim(), LeaseStatusTypes = model.LeaseStatusTypes, - TenantName = model.TenantName, + TenantName = model.TenantName?.Trim(), Programs = model.Programs, ExpiryStartDate = model.ExpiryStartDate, ExpiryEndDate = model.ExpiryEndDate, RegionType = model.RegionType, - Details = model.Details, + Details = model.Details?.Trim(), LeaseTeamOrganizationId = model.LeaseTeamOrganizationId, LeaseTeamPersonId = model.LeaseTeamPersonId, IsReceivable = model.IsReceivable, diff --git a/source/backend/api/Areas/Management/Models/ManagementActivityFilterModel.cs b/source/backend/api/Areas/Management/Models/ManagementActivityFilterModel.cs index ef71c246d0..3b0ad0f2a8 100644 --- a/source/backend/api/Areas/Management/Models/ManagementActivityFilterModel.cs +++ b/source/backend/api/Areas/Management/Models/ManagementActivityFilterModel.cs @@ -89,14 +89,14 @@ public static explicit operator ManagementActivityFilter(ManagementActivityFilte Page = model.Page, Quantity = model.Quantity, - Pid = model.Pid, - Pin = model.Pin, + Pid = model.Pid?.Trim(), + Pin = model.Pin?.Trim(), RegionCode = model.RegionCode, - Address = model.Address, - FileNameOrNumberOrReference = model.FileNameOrNumberOrReference, + Address = model.Address?.Trim(), + FileNameOrNumberOrReference = model.FileNameOrNumberOrReference?.Trim(), ActivityTypeCode = model.ActivityTypeCode, ActivityStatusCode = model.ActivityStatusCode, - ProjectNameOrNumber = model.ProjectNameOrNumber, + ProjectNameOrNumber = model.ProjectNameOrNumber?.Trim(), ManagementFileStatusCode = model.ManagementFileStatusCode, ManagementFilePurposeCode = model.ManagementFilePurposeCode, diff --git a/source/backend/api/Areas/Management/Models/ManagementFilterModel.cs b/source/backend/api/Areas/Management/Models/ManagementFilterModel.cs index f14f3ca80d..dc13226533 100644 --- a/source/backend/api/Areas/Management/Models/ManagementFilterModel.cs +++ b/source/backend/api/Areas/Management/Models/ManagementFilterModel.cs @@ -119,13 +119,13 @@ public static explicit operator ManagementFilter(ManagementFilterModel model) Page = model.Page, Quantity = model.Quantity, - Pid = model.Pid, - Pin = model.Pin, + Pid = model.Pid?.Trim(), + Pin = model.Pin?.Trim(), RegionCode = model.RegionCode, - Address = model.Address, - FileNameOrNumberOrReference = model.FileNameOrNumberOrReference, + Address = model.Address?.Trim(), + FileNameOrNumberOrReference = model.FileNameOrNumberOrReference?.Trim(), ManagementFileStatusCode = model.ManagementFileStatusCode, - ProjectNameOrNumber = model.ProjectNameOrNumber, + ProjectNameOrNumber = model.ProjectNameOrNumber?.Trim(), ManagementFilePurposeCode = model.ManagementFilePurposeCode, TeamMemberPersonId = model.TeamMemberPersonId, TeamMemberOrganizationId = model.TeamMemberOrganizationId, diff --git a/source/backend/api/Areas/Property/Models/PropertyFilterModel.cs b/source/backend/api/Areas/Property/Models/PropertyFilterModel.cs index d906fbb78c..d751085148 100644 --- a/source/backend/api/Areas/Property/Models/PropertyFilterModel.cs +++ b/source/backend/api/Areas/Property/Models/PropertyFilterModel.cs @@ -121,11 +121,11 @@ public static explicit operator PropertyFilter(PropertyFilterModel model) Quantity = model.Quantity, Sort = model.Sort, - Pid = model.Pid, - Pin = model.Pin, - Address = model.Address, - PlanNumber = model.PlanNumber, - Historical = model.Historical, + Pid = model.Pid?.Trim(), + Pin = model.Pin?.Trim(), + Address = model.Address?.Trim(), + PlanNumber = model.PlanNumber?.Trim(), + Historical = model.Historical?.Trim(), Ownership = model.Ownership, TenureCleanup = model.TenureCleanup, }; diff --git a/source/backend/api/Areas/Research/Models/ResearchFilterModel.cs b/source/backend/api/Areas/Research/Models/ResearchFilterModel.cs index 08860f4651..45410a6737 100644 --- a/source/backend/api/Areas/Research/Models/ResearchFilterModel.cs +++ b/source/backend/api/Areas/Research/Models/ResearchFilterModel.cs @@ -121,15 +121,15 @@ public static explicit operator ResearchFilter(ResearchFilterModel model) { var filter = new ResearchFilter { - Pid = model.Pid, - Pin = model.Pin, + Pid = model.Pid?.Trim(), + Pin = model.Pin?.Trim(), Page = model.Page, Quantity = model.Quantity, RegionCode = model.RegionCode, - RFileNumber = model.RFileNumber, + RFileNumber = model.RFileNumber?.Trim(), ResearchFileStatusTypeCode = model.ResearchFileStatusTypeCode, - Name = model.Name, - RoadOrAlias = model.RoadOrAlias, + Name = model.Name?.Trim(), + RoadOrAlias = model.RoadOrAlias?.Trim(), AppCreateUserid = model.AppCreateUserid, CreatedOnStartDate = model.CreatedOnStartDate, CreatedOnEndDate = model.CreatedOnEndDate,