Merge branch 'main' into NDT-502-CCBC-Summary-Page-Improvements

bcgov · Aug 30, 2024 · 942b573 · 942b573
2 parents 7491012 + cf0c395
commit 942b573
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# [1.189.0](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.188.0...v1.189.0) (2024-08-30)
+
+### Features
+
+- change to announced by bc/ised in gcpe report ([cbb5871](https://github.com/bcgov/CONN-CCBC-portal/commit/cbb58714e29ab57a08ac4ceeac4d016a03155294))
+
+# [1.188.0](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.187.0...v1.188.0) (2024-08-30)
+
+### Features
+
+- colour is now a background colour ([46584e5](https://github.com/bcgov/CONN-CCBC-portal/commit/46584e5e4d9beacbbf21bf9313cb6bd88092b526))
+
 # [1.187.0](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.186.4...v1.187.0) (2024-08-29)
 
 ### Features

diff --git a/app/backend/lib/reporting/header.ts b/app/backend/lib/reporting/header.ts
@@ -10,7 +10,7 @@ const HEADER_ROW: Row = [
     wrap: true,
   },
   {
-    value: 'Announced by Province',
+    value: 'Announced by BC/ISED',
     fontWeight: 'bold',
     type: String,
     height: 95,

diff --git a/app/backend/lib/reporting/util.ts b/app/backend/lib/reporting/util.ts
@@ -126,7 +126,7 @@ export const compareAndMarkArrays = (array1: any, array2: any) => {
       if (item?.value !== item2?.value) {
         return {
           ...item,
-          color: '#2FA7DD',
+          backgroundColor: '#2FA7DD',
         };
       }
 

diff --git a/app/tests/backend/lib/reporting/testData.ts b/app/tests/backend/lib/reporting/testData.ts
@@ -34,7 +34,7 @@ export const regenerateGcpeReportQueryResult = {
           },
           {
             wrap: true,
-            value: 'Announced by Province',
+            value: 'Announced by BC/ISED',
             height: 95,
             fontWeight: 'bold',
           },

diff --git a/db/sqitch.plan b/db/sqitch.plan
@@ -654,3 +654,5 @@ tables/communities_source_data_001_service_account 2024-08-28T16:32:48Z Rafael S
 @1.186.3 2024-08-28T17:01:51Z CCBC Service Account <ccbc@button.is> # release v1.186.3
 @1.186.4 2024-08-29T17:49:49Z CCBC Service Account <ccbc@button.is> # release v1.186.4
 @1.187.0 2024-08-29T20:15:20Z CCBC Service Account <ccbc@button.is> # release v1.187.0
+@1.188.0 2024-08-30T17:51:56Z CCBC Service Account <ccbc@button.is> # release v1.188.0
+@1.189.0 2024-08-30T18:07:26Z CCBC Service Account <ccbc@button.is> # release v1.189.0
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CONN-CCBC-portal",
-  "version": "1.187.0",
+  "version": "1.189.0",
   "main": "index.js",
   "repository": "https://github.com/bcgov/CONN-CCBC-portal.git",
   "author": "Romer, Meherzad CITZ:EX <Meherzad.Romer@gov.bc.ca>",