Merge branch 'main' into feat/FSADT1-1631

bcgov · Dec 18, 2024 · 77265e3 · 77265e3
2 parents baf3c7b + d162b23
commit 77265e3
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 46 deletions.
diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
@@ -579,7 +579,7 @@ jobs:
 
   results:
     name: PR Results
-    needs: [builds, pre-tools, deploy-tools, deploy, cypress-run, scale-down-after, recreate-database, scale-up-legacy]
+    needs: [builds, pre-tools, deploy-tools, deploy, cypress-run]
     if: always()
     runs-on: ubuntu-24.04
     steps:

diff --git a/.github/workflows/pr-validate.yml b/.github/workflows/pr-validate.yml
@@ -27,52 +27,9 @@ jobs:
       markdown_links: |
         Any successful deployments (not always required) will be available [here](https://${{ github.event.repository.name }}-${{ needs.vars.outputs.url }}-frontend.apps.silver.devops.gov.bc.ca/)
 
-  changelog:
-    name: Pull Request Validation
-    runs-on: ubuntu-24.04
-    permissions:
-      contents: read
-      pull-requests: write
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Checkout branch
-        uses: actions/checkout@v4
-        with:
-          ref: refs/heads/${{ github.head_ref }}
-
-      - name: Conventional Changelog Update
-        id: changelog
-        continue-on-error: true
-        uses: TriPSs/conventional-changelog-action@v5
-        with:
-          github-token: ${{ github.token }}
-          output-file: "CHANGELOG.md"
-          skip-version-file: "true"
-          skip-commit: "true"
-          git-push: "false"
-          git-branch: refs/heads/${{ github.head_ref }}
-
-      - name: Checkout pr
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - name: Comment PR
-        continue-on-error: true
-        uses: thollander/actions-comment-pull-request@v3
-        if: ${{ steps.changelog.outputs.skipped == 'false' }}
-        with:
-          message: |
-            # Current changelog
-
-            ${{ steps.changelog.outputs.clean_changelog }}
-          comment_tag: "# Current changelog"
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
   results:
     name: Validate Results
-    needs: [changelog, validate]
+    needs: [validate]
     if: always()
     runs-on: ubuntu-24.04
     steps:

diff --git a/frontend/src/pages/ClientDetailsPage.vue b/frontend/src/pages/ClientDetailsPage.vue
@@ -81,7 +81,7 @@ const compareString = (a: string, b: string) => {
 };
 
 const sortedLocations = computed(() =>
-  data.value.addresses.toSorted((a, b) => compareString(a.clientLocnCode, b.clientLocnCode)),
+  data.value.addresses?.toSorted((a, b) => compareString(a.clientLocnCode, b.clientLocnCode)),
 );
 </script>
 

diff --git a/frontend/stub/__files/response-clients-details-null.json b/frontend/stub/__files/response-clients-details-null.json
@@ -0,0 +1,16 @@
+{
+    "registryCompanyTypeCode": "GP",
+    "corpRegnNmbr": "{{randomValue length=8 type='NUMERIC'}}",
+    "clientNumber":"{{randomValue length=4 type='NUMERIC'}}",
+    "clientName": "KOVACEK, THOMPSON AND BOYER",
+    "clientAcronym": "KTB",
+    "clientTypeCode": "P",
+    "clientTypeDesc": "General Partnership",
+    "goodStandingInd": "Y",
+    "clientStatusCode": "A",
+    "clientStatusDesc": "Active",
+    "clientComment": "Email from Cheryl Bibby to request any letters for sec deposits be mailed to 3000, 28th St, Vernon",
+    "wcbFirmNumber": "{{randomValue length=7 type='NUMERIC'}}",
+    "contacts": null,
+    "addresses": null
+}
diff --git a/frontend/stub/mappings/client_details.json b/frontend/stub/mappings/client_details.json
@@ -90,6 +90,21 @@
         "fixedDelayMilliseconds": 500
       }
     },
+    {
+      "name": "Client Details Individual - null addresses and contacts",
+      "request": {
+        "urlPattern": "/api/clients/details/null(.*)",
+        "method": "GET"
+      },
+      "response": {
+        "status": 200,
+        "bodyFileName": "response-clients-details-null.json",
+        "transformers": [
+          "response-template"
+        ],
+        "fixedDelayMilliseconds": 500
+      }
+    },
     {
       "name": "Client Details - Error 400",
       "request": {