From 63d1544ffd2c1b90ff9ac6dbc91b4023aa6ef658 Mon Sep 17 00:00:00 2001
From: Andrew Bolyachevets <Andriy.Bolyachevets@gov.bc.ca>
Date: Wed, 3 Sep 2025 20:58:55 -0700
Subject: [PATCH 1/4] test github app (#1578)

- verify pre-view build workflow using github app instead of token
---
 app/devops/cloudbuild-pr.yaml | 113 +++++++++++++++++++++++++++-------
 app/package.json              |   3 +-
 2 files changed, 92 insertions(+), 24 deletions(-)

diff --git a/app/devops/cloudbuild-pr.yaml b/app/devops/cloudbuild-pr.yaml
index 4b038a61b..3c0c65799 100644
--- a/app/devops/cloudbuild-pr.yaml
+++ b/app/devops/cloudbuild-pr.yaml
@@ -1,18 +1,18 @@
 steps:
-  # install / setup ci
+  # Install / setup CI
   - name: node:20.5.1
     entrypoint: npm
     args: ['install']
+    dir: app  # <-- ADD THIS
 
-  # setup .env
+  # Setup .env
   - name: 'bash'
     script: |
       #!/usr/bin/env bash
       cp .env.example .env
+    dir: app  # <-- ADD THIS
 
-  #
   # Generate the static site
-  #
   - name: node:20.5.1
     entrypoint: npm
     env:
@@ -21,38 +21,105 @@ steps:
       - 'NUXT_PROJECT_ID=$_NUXT_PROJECT_ID'
       - 'NUXT_APP_ID=$_NUXT_APP_ID'
     args: ['run', 'build']
+    dir: app  # <-- ADD THIS
 
-  #
-  # Deploy to firebase channel, using the PR #
-  # store log to /workspace to get the channel URL
-  #
+  # Deploy to Firebase channel using the PR #
   - name: gcr.io/yfthig-dev/firebase
     entrypoint: bash
     args: ['-c', 'firebase hosting:channel:deploy --project=yfthig-dev PR-$_PR_NUMBER > /workspace/firebase-deploy.txt']
+    dir: app  # <-- ADD THIS
+
+  # Generate GitHub App installation token
+  - id: "Generate GitHub App token"
+    name: python:3.11
+    entrypoint: bash
+    args:
+      - -c
+      - |
+        pip install pyjwt cryptography requests
+        python <<EOF
+        import os, time, jwt, requests
+        from cryptography.hazmat.primitives import serialization
+
+        # Load GitHub App info from env
+        app_id = os.environ["GITHUB_APP_ID"]
+        installation_id = os.environ["GITHUB_INSTALLATION_ID"]
+        private_key = os.environ["GITHUB_APP_PRIVATE_KEY"]
+
+        # Build JWT
+        now = int(time.time())
+        payload = {
+            "iat": now,
+            "exp": now + 540,  # 9 minutes
+            "iss": app_id,
+        }
+        key = serialization.load_pem_private_key(private_key.encode(), password=None)
+        jwt_token = jwt.encode(payload, key, algorithm="RS256")
+
+        # Exchange for installation token
+        headers = {"Authorization": f"Bearer {jwt_token}", "Accept": "application/vnd.github.v3+json"}
+        url = f"https://api.github.com/app/installations/{installation_id}/access_tokens"
+        r = requests.post(url, headers=headers)
+        r.raise_for_status()
+        token = r.json()["token"]
+
+        # Write token for next steps
+        with open("/workspace/github_token.txt", "w") as f:
+            f.write(token)
+        EOF
+    secretEnv:
+      - GITHUB_APP_PRIVATE_KEY
+      - GITHUB_APP_ID
+      - GITHUB_INSTALLATION_ID
 
-  #
   # Update the PR with the temporary URL
-  #
   - id: "Update the PR"
     name: gcr.io/cloud-builders/curl
     entrypoint: bash
     args:
       - -c
       - |
-        # Read from "/workspace"
-        cat /workspace/firebase-deploy.txt
-        url=`cat /workspace/firebase-deploy.txt| grep 'Channel URL' | grep -Eo "https://[a-zA-Z0-9./?=_%:-]*"`
-        echo "this is the body:"
-        echo '{"body": "Temporary Url for review:'"$url"'"}'
+        # Read Firebase URL
+        url=$(grep 'Channel URL' /workspace/firebase-deploy.txt | grep -Eo "https://[a-zA-Z0-9./?=_%:-]*")
+        echo "Posting PR comment with URL: $url"
+
+        # Read GitHub App installation token
+        GITHUB_TOKEN=$(cat /workspace/github_token.txt)
+
+        curl -X POST \
+          https://api.github.com/repos/bcgov/name-examination/issues/$_PR_NUMBER/comments \
+          --header "Authorization: token $$GITHUB_TOKEN" \
+          --header "Accept: application/vnd.github.v3+json" \
+          --data-binary '{"body": "Temporary Url for review: '"$url"'"}'
+
+  # Run smoke test workflow
+  - id: "Run Smoke Test"
+    name: gcr.io/cloud-builders/curl
+    entrypoint: bash
+    args:
+      - -c
+      - |
+        # Read Firebase URL
+        url=$(grep 'Channel URL' /workspace/firebase-deploy.txt | grep -Eo "https://[a-zA-Z0-9./?=_%:-]*")
+        echo "Triggering smoke test workflow with URL: $url"
+
+        # Read GitHub App installation token
+        GITHUB_TOKEN=$(cat /workspace/github_token.txt)
+
         curl -X POST \
-        https://api.github.com/repos/bcgov/name-examination/issues/$_PR_NUMBER/comments \
-        --header "Authorization: Token $$TOKEN" \
-        --header "Accept: application/vnd.github.v3+json" \
-        --data-binary '{"body": "Temporary Url for review: '"$url"'"}'
-    secretEnv: ['TOKEN']
+          -H "Accept: application/vnd.github+json" \
+          -H "Authorization: token $$GITHUB_TOKEN" \
+          https://api.github.com/repos/bcgov/name-examination/actions/workflows/e2e.yml/dispatches \
+          -d '{"ref":"main","inputs":{"url_parameter":"'"$url"'"}}'
+
 availableSecrets:
   secretManager:
-  - versionName: projects/$PROJECT_ID/secrets/token-pr-review/versions/latest
-    env: 'TOKEN'
+    - versionName: projects/$PROJECT_ID/secrets/private-key-pr-review/versions/latest
+      env: 'GITHUB_APP_PRIVATE_KEY'
+    - versionName: projects/$PROJECT_ID/secrets/app-id-pr-review/versions/latest
+      env: 'GITHUB_APP_ID'
+    - versionName: projects/$PROJECT_ID/secrets/installation-id-pr-review/versions/latest
+      env: 'GITHUB_INSTALLATION_ID'
+
 options:
-    dynamic_substitutions: true
+  dynamicSubstitutions: false
diff --git a/app/package.json b/app/package.json
index 91bb2154e..22cdad27a 100644
--- a/app/package.json
+++ b/app/package.json
@@ -4,6 +4,7 @@
   "private": true,
   "scripts": {
     "build": "nuxt generate",
+    "build-check": "nuxt generate",
     "dev": "nuxt dev",
     "generate": "nuxt generate",
     "preview": "nuxt preview",
@@ -78,4 +79,4 @@
   "engines": {
     "node": "=20.5.1"
   }
-}
\ No newline at end of file
+}

From 80cac41b035adb5467eab186fc0610fa618e994a Mon Sep 17 00:00:00 2001
From: eve-git <54647458+eve-git@users.noreply.github.com>
Date: Wed, 12 Nov 2025 09:03:15 -0800
Subject: [PATCH 2/4] 31118 bug fix: SUBMITTED DATE SORT does not work (#1581)

* bug fix: SUBMITTED DATE SORT does not work

* order on submitted date only
---
 app/components/search/ResultsBox.vue | 2 +-
 app/package.json                     | 2 +-
 app/store/search.ts                  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/components/search/ResultsBox.vue b/app/components/search/ResultsBox.vue
index b45c0949b..662c01451 100644
--- a/app/components/search/ResultsBox.vue
+++ b/app/components/search/ResultsBox.vue
@@ -193,7 +193,7 @@ const layout: ILayout = {
     dropdown: Object.values(Submitted),
     clickable: {
       icon: computed(() =>
-        search.submittedDateOrder === 'asc' ? ArrowDownIcon : ArrowUpIcon
+        search.submittedDateOrder === 'asc' ? ArrowUpIcon : ArrowDownIcon
       ),
       onClick: search.toggleSubmittedDateOrder,
     },
diff --git a/app/package.json b/app/package.json
index 22cdad27a..acb0052bf 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "name-examination",
-  "version": "1.2.44",
+  "version": "1.2.45",
   "private": true,
   "scripts": {
     "build": "nuxt generate",
diff --git a/app/store/search.ts b/app/store/search.ts
index 72be96ae9..b13e19df4 100644
--- a/app/store/search.ts
+++ b/app/store/search.ts
@@ -51,8 +51,8 @@ export const useSearchStore = defineStore('search', () => {
   const isLoading = ref(true)
 
   const formattedSearchParams = computed(() => {
-    const params = {
-      order: `priorityCd:desc,submittedDate:${submittedDateOrder.value}`,
+      const params = {
+      order: `submittedDate:${submittedDateOrder.value}`,
       queue:
         filters[SearchColumns.Status] === StatusSearchFilter.All
           ? ''

From 3f1bfc0839380237a8ee897144215c34c3582aec Mon Sep 17 00:00:00 2001
From: eve-git <54647458+eve-git@users.noreply.github.com>
Date: Thu, 27 Nov 2025 10:41:52 -0800
Subject: [PATCH 3/4] 30614 Add expiration date validation to edit (#1583)

* add expiration date validation to edit

* update
---
 app/components/ComboSelect.vue                       |  9 ++-------
 .../dates_and_expiry/ExpiryAndConsentEditable.vue    | 12 +++++++++---
 app/components/search/ResultsBox.vue                 | 11 +++++------
 app/package.json                                     |  2 +-
 app/pages/Stats.vue                                  |  8 +++++---
 5 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/app/components/ComboSelect.vue b/app/components/ComboSelect.vue
index c002e033e..867a95792 100644
--- a/app/components/ComboSelect.vue
+++ b/app/components/ComboSelect.vue
@@ -86,19 +86,14 @@ import {
 } from '@headlessui/vue'
 import { CheckIcon, ChevronUpDownIcon } from '@heroicons/vue/20/solid'
 
-const { options, multiple } = withDefaults(
-  defineProps<{
+const { options, multiple, optionsDisplay = (option: any) => option} = defineProps<{
     modelValue: any
     options: ComputedRef<Array<any>>
     /** Whether multiple options can be selected */
     multiple?: boolean
     /** Function called for getting the display string for a given option */
     optionsDisplay?: (option: any) => string
-  }>(),
-  {
-    optionsDisplay: (option: any) => option,
-  }
-)
+  }>()
 
 const query = ref('')
 const filteredOptions = computed(() =>
diff --git a/app/components/examine/request_info/dates_and_expiry/ExpiryAndConsentEditable.vue b/app/components/examine/request_info/dates_and_expiry/ExpiryAndConsentEditable.vue
index d4708f384..847f94021 100644
--- a/app/components/examine/request_info/dates_and_expiry/ExpiryAndConsentEditable.vue
+++ b/app/components/examine/request_info/dates_and_expiry/ExpiryAndConsentEditable.vue
@@ -88,10 +88,16 @@ function setDefaultInputValues() {
 examine.addEditAction({
   validate() {
     let isValid = true
-    if (examine.expiryDate && !expiry.value) {
-      expiryDateErrorText.value = 'Expiry date is required'
-      isValid = false
+    if (examine.expiryDate) {
+      if (expiry.value) {
+        isValid = DateTime.fromISO(expiry.value).startOf('day') >= DateTime.now().startOf('day')
+        expiryDateErrorText.value = isValid ? '' : 'Expiry date must be today or later';
+      } else {
+        expiryDateErrorText.value = 'Expiry date is required'
+        isValid = false
+      }
     }
+
     if (consentFlag.value === ConsentFlag.Received && !consentDate.value) {
       consentDateErrorText.value = 'Consent date is required'
       isValid = false
diff --git a/app/components/search/ResultsBox.vue b/app/components/search/ResultsBox.vue
index 662c01451..b53e64208 100644
--- a/app/components/search/ResultsBox.vue
+++ b/app/components/search/ResultsBox.vue
@@ -98,14 +98,13 @@
           </td>
         </tr>
       </tbody>
-
-      <div
-        class="absolute bottom-1/2 right-1/2 translate-x-1/2 translate-y-1/2 transform"
-      >
-        <LoadingSpinner v-if="search.isLoading" />
-      </div>
     </table>
 
+    <div v-if="search.isLoading"
+         class="absolute bottom-1/2 right-1/2 translate-x-1/2 translate-y-1/2 transform">
+      <LoadingSpinner />
+    </div>
+
     <PopupDialog :show="showDateDialog">
       <template #title>Choose a Date Range</template>
       <SearchDateForm
diff --git a/app/package.json b/app/package.json
index acb0052bf..232494b98 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "name-examination",
-  "version": "1.2.45",
+  "version": "1.2.46",
   "private": true,
   "scripts": {
     "build": "nuxt generate",
diff --git a/app/pages/Stats.vue b/app/pages/Stats.vue
index 775907e6f..f16cf9654 100644
--- a/app/pages/Stats.vue
+++ b/app/pages/Stats.vue
@@ -98,10 +98,12 @@
             <td>{{ item.furnished }}</td>
           </tr>
         </tbody>
-        <div class="absolute bottom-1/2 right-1/2 translate-x-1/2 translate-y-1/2 transform">
-          <LoadingSpinner v-if="isLoading" />
-        </div>
       </table>
+      <div v-if="isLoading"
+           class="absolute bottom-1/2 right-1/2 translate-x-1/2 translate-y-1/2 transform">
+        <LoadingSpinner />
+      </div>
+
     </div>
   </div>
 </template>

From 6ac9b1b397be5c0305ba0eb70374a1ffb7c476f3 Mon Sep 17 00:00:00 2001
From: Hrvoje Fekete <hrvoje.fekete@gmail.com>
Date: Mon, 15 Dec 2025 10:17:15 -0800
Subject: [PATCH 4/4] 31568 - Chore: remove broken link (#1584)

* 31568 - Chore: remove broken link

* 31569 - Test: update search test to match current order criteria
---
 app/components/app_footer/index.vue | 1 -
 app/package.json                    | 2 +-
 app/tests/store/search.spec.ts      | 4 +++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/components/app_footer/index.vue b/app/components/app_footer/index.vue
index 4e2f840e9..4605e8bed 100644
--- a/app/components/app_footer/index.vue
+++ b/app/components/app_footer/index.vue
@@ -29,7 +29,6 @@
 <script setup lang="ts">
 const links = [
   { text: 'Home', route: '/', target: '_self' },
-  { text: 'Release Notes', route: 'https://www.release-notes.bcregistry.gov.bc.ca' },
   { text: 'Disclaimer', route: 'https://www2.gov.bc.ca/gov/content/home/disclaimer' },
   { text: 'Privacy', route: 'https://www2.gov.bc.ca/gov/content/home/privacy' },
   { text: 'Accessibility', route: 'https://www2.gov.bc.ca/gov/content/home/accessibility' },
diff --git a/app/package.json b/app/package.json
index 232494b98..4e991a385 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "name-examination",
-  "version": "1.2.46",
+  "version": "1.2.47",
   "private": true,
   "scripts": {
     "build": "nuxt generate",
diff --git a/app/tests/store/search.spec.ts b/app/tests/store/search.spec.ts
index f54ed922e..9fbd69522 100644
--- a/app/tests/store/search.spec.ts
+++ b/app/tests/store/search.spec.ts
@@ -28,7 +28,9 @@ describe('Search store tests', () => {
     search.filters[SearchColumns.ApplicantFirstName] = testName
 
     let expectedParams = new URLSearchParams({
-      order: 'priorityCd:desc,submittedDate:asc',
+      // this is to match current code, verify with business if this is correct
+      // order: 'priorityCd:desc,submittedDate:asc',
+      order: 'submittedDate:asc',
       queue: Status.Hold,
       consentOption: ConsentRequired.All,
       ranking: Priority.All,