Merge branch 'main' into remaining-pinia-stores

bcgov · Jan 27, 2025 · 3d241d7 · 3d241d7
2 parents 91018c0 + 2234d49
commit 3d241d7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/.github/workflows/build_release.yaml b/.github/workflows/build_release.yaml
@@ -4,6 +4,11 @@ on:
   release:
     types: [published]
   workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Tag to build (leave empty for latest)'
+        required: false
+        default: ''
 
 permissions:
   packages: write
@@ -15,7 +20,11 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository_owner == 'bcgov'
     steps:
-      - uses: actions/checkout@v4    
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: ${{ github.event.inputs.tag || github.ref }}
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -33,10 +42,10 @@ jobs:
         with:
           images: ghcr.io/${{ github.repository }}/orgbook-bc-client
           tags: |
+            type=raw,value=${{ github.event.inputs.tag }}
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
-            type=ref
-            type=sha
+            type=ref,event=tag
 
       - name: Build and push image
         id: builder

diff --git a/src/components/entity/EntityResult.vue b/src/components/entity/EntityResult.vue
@@ -177,7 +177,7 @@
                       .related_topic &&
                     businessAsRelationship[i + relationshipStartIndex]
                       .related_topic.source_id
-                  }/type/registration.registries.ca`"
+                  }`"
                   class="font-weight-bold"
                   >{{
                     getRelationshipName(
@@ -308,7 +308,7 @@
                 :to="`/entity/${
                   ownedByRelationship[i].related_topic &&
                   ownedByRelationship[i].related_topic.source_id
-                }/type/registration.registries.ca`"
+                }`"
                 class="font-weight-bold"
               >
                 {{ getRelationshipName(ownedByRelationship[i]) }}

diff --git a/src/router/index.ts b/src/router/index.ts
@@ -10,6 +10,10 @@ const routes: Array<RouteConfig> = [
     name: "Search",
     component: Search,
   },
+  {
+    path: "/entity/:sourceId",
+    redirect: "/entity/:sourceId/type/registration.registries.ca",
+  },
   {
     path: "/entity/:sourceId/type/:type",
     name: "Entity",