From 25c1d7b4bf045892ce0191f3b6cd4c6f88cf6419 Mon Sep 17 00:00:00 2001 From: Smith Date: Thu, 10 Jul 2025 09:22:52 -0700 Subject: [PATCH 1/3] fix incorrect assumption on draft/disabled marker display --- source/backend/api/Pims.Api.csproj | 4 ++-- source/frontend/package-lock.json | 2 +- source/frontend/package.json | 2 +- .../components/maps/leaflet/Layers/FilePropertiesLayer.tsx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/backend/api/Pims.Api.csproj b/source/backend/api/Pims.Api.csproj index f6cf02cdc1..ae6f1aeb2a 100644 --- a/source/backend/api/Pims.Api.csproj +++ b/source/backend/api/Pims.Api.csproj @@ -2,8 +2,8 @@ 0ef6255f-9ea0-49ec-8c65-c172304b4926 - 5.11.0-106.36 - 5.11.0.106 + 5.11.1-106.36 + 5.11.1.106 true {16BC0468-78F6-4C91-87DA-7403C919E646} net8.0 diff --git a/source/frontend/package-lock.json b/source/frontend/package-lock.json index 5a3484b683..68dcb28b04 100644 --- a/source/frontend/package-lock.json +++ b/source/frontend/package-lock.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "5.11.0-106.0", + "version": "5.11.1-106.0", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/source/frontend/package.json b/source/frontend/package.json index 7f5f56c0bb..bc1702e75e 100644 --- a/source/frontend/package.json +++ b/source/frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "5.11.0-106.36", + "version": "5.11.1-106.36", "private": true, "dependencies": { "@bcgov/bc-sans": "1.0.1", diff --git a/source/frontend/src/components/maps/leaflet/Layers/FilePropertiesLayer.tsx b/source/frontend/src/components/maps/leaflet/Layers/FilePropertiesLayer.tsx index 8d170e5c4a..00734a2f64 100644 --- a/source/frontend/src/components/maps/leaflet/Layers/FilePropertiesLayer.tsx +++ b/source/frontend/src/components/maps/leaflet/Layers/FilePropertiesLayer.tsx @@ -87,7 +87,7 @@ export const FilePropertiesLayer: React.FunctionComponent = () => { key={uuidv4()} position={draftPoint.location} icon={ - draftPoint.isActive + draftPoint.isActive !== false ? getDraftIcon((index + 1).toString()) : getDisabledDraftIcon((index + 1).toString()) } From 6d98a9eb175de6df255f7fdff8ef93e0d570180e Mon Sep 17 00:00:00 2001 From: devinleighsmith Date: Mon, 14 Jul 2025 15:17:42 -0700 Subject: [PATCH 2/3] do not draw remove icon on next line. --- .../selectedPropertyList/SelectedPropertyRow.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/frontend/src/components/propertySelector/selectedPropertyList/SelectedPropertyRow.tsx b/source/frontend/src/components/propertySelector/selectedPropertyList/SelectedPropertyRow.tsx index 26e7cc3c3d..4f26b72034 100644 --- a/source/frontend/src/components/propertySelector/selectedPropertyList/SelectedPropertyRow.tsx +++ b/source/frontend/src/components/propertySelector/selectedPropertyList/SelectedPropertyRow.tsx @@ -78,7 +78,7 @@ export const SelectedPropertyRow: React.FunctionComponent - + Date: Mon, 14 Jul 2025 15:35:02 -0700 Subject: [PATCH 3/3] Only affect length when row disabled --- .../selectedPropertyList/SelectedPropertyRow.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/frontend/src/components/propertySelector/selectedPropertyList/SelectedPropertyRow.tsx b/source/frontend/src/components/propertySelector/selectedPropertyList/SelectedPropertyRow.tsx index 4f26b72034..c4f8c872dc 100644 --- a/source/frontend/src/components/propertySelector/selectedPropertyList/SelectedPropertyRow.tsx +++ b/source/frontend/src/components/propertySelector/selectedPropertyList/SelectedPropertyRow.tsx @@ -78,7 +78,7 @@ export const SelectedPropertyRow: React.FunctionComponent - +