Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
6aaad18
MDS-67432 Initial search rewamp
simensma-fresh Dec 9, 2025
eaa31be
Updated search interface
simensma-fresh Dec 22, 2025
ff23395
Fixed pgsync docker compose
simensma-fresh Dec 22, 2025
13fb992
Added missing changes
simensma-fresh Dec 22, 2025
b27dbd0
Re-instanted feature flag
simensma-fresh Jan 5, 2026
ed8fa13
Added missing files
simensma-fresh Jan 5, 2026
722d404
Cleanup of search experience
simensma-fresh Jan 15, 2026
21afa57
Added pgsync github actions
simensma-fresh Jan 15, 2026
cb61d90
MDS-6743 Updated search v2 tests
simensma-fresh Jan 20, 2026
92f5b56
cleanup
simensma-fresh Jan 24, 2026
4cfabb2
MDS-6743 Cleanup
simensma-fresh Jan 29, 2026
ea0c937
MDS-6743 Refactored global search service
simensma-fresh Jan 29, 2026
be17398
MDS-6743 Tweak styling of search bar component
simensma-fresh Jan 30, 2026
14e2365
[MDS-6743] Fixed facet counts
simensma-fresh Feb 2, 2026
acc4d9b
MDS-6743 Cleanup
simensma-fresh Feb 2, 2026
57e5ba0
MDS-6743 Fixed search slice implementation
simensma-fresh Feb 2, 2026
818ad13
MDS-6743 Fixed broken tests
simensma-fresh Feb 2, 2026
a881b76
MDS-6743 Fixed tz in basic info test
simensma-fresh Feb 2, 2026
f7b97ca
MDS-6743 Fixed sonarcloud issues
simensma-fresh Feb 2, 2026
29f1f18
MDS-6743 Fixed RecentSearches
simensma-fresh Feb 3, 2026
a6526db
MDS-6743 CLeanup of searchv2 component
simensma-fresh Feb 3, 2026
29f8f20
MDS-6743 Fixed lint errors
simensma-fresh Feb 3, 2026
3c02210
MDS-6743 Clean up search result styling
simensma-fresh Feb 3, 2026
1e60844
MDS-6743 Fix pgsync glob
simensma-fresh Feb 3, 2026
31af138
MDS-6743 Fixed global search
simensma-fresh Feb 3, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions .github/workflows/pgsync.build.dev.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: PGSync Image Build DEV

on:
workflow_dispatch:
push:
branches:
- develop
paths:
- .github/workflows/pgsync.build.dev.yaml

env:
INITIAL_TAG: latest
TAG: dev
NAME: pgsync
CONTEXT: services/pgsync/

jobs:
build-pgsync:
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Login
run: |
docker login -u ${{ secrets.CLUSTER_REGISTRY_USER }} -p ${{ secrets.BUILD_TOKEN }} ${{ secrets.CLUSTER_REGISTRY }}
- name: Build n Tag
run: |
docker build -t ${{ env.NAME }}:${{ env.INITIAL_TAG }} ${{ env.CONTEXT }} -f ${{ env.CONTEXT }}Dockerfile
docker tag ${{ env.NAME }}:${{ env.INITIAL_TAG }} ${{ secrets.CLUSTER_REGISTRY }}/${{ secrets.NS_TOOLS }}/${{ env.NAME }}:${{ env.INITIAL_TAG }}
docker tag ${{ env.NAME }}:${{ env.INITIAL_TAG }} ${{ secrets.CLUSTER_REGISTRY }}/${{ secrets.NS_TOOLS }}/${{ env.NAME }}:${{ env.TAG }}
- name: Push
run: |
docker push --all-tags ${{ secrets.CLUSTER_REGISTRY }}/${{ secrets.NS_TOOLS }}/${{ env.NAME }}
65 changes: 65 additions & 0 deletions .github/workflows/pgsync.deploy.prod.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
name: PGSync - Promote PROD

on:
workflow_dispatch:

env:
ORIG_TAG: test
PROMOTE_TAG: prod
IMAGE: pgsync

jobs:
promote-image:
name: promote-image
runs-on: ubuntu-24.04
steps:
- name: Install oc
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.7"

- name: oc login
run: |
oc login --token=${{ secrets.BUILD_TOKEN }} --server=${{ secrets.CLUSTER_API }}

- name: Promote from test to prod
run: |
oc -n ${{secrets.NS_TOOLS}} tag \
${{ secrets.NS_TOOLS }}/${{ env.IMAGE }}:${{ env.ORIG_TAG }} \
${{ secrets.NS_TOOLS }}/${{ env.IMAGE }}:${{ env.PROMOTE_TAG }}

trigger-gitops:
runs-on: ubuntu-24.04
timeout-minutes: 10
needs: promote-image
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Setup SSH Agent
uses: ./.github/actions/setup-ssh
with:
ssh-private-key: ${{ secrets.GITOPS_REPO_DEPLOY_KEY }}

- name: Git Ops Push
run: ./gitops/commit.sh ${{ env.IMAGE }} test prod ${{ github.actor }}
- name: Install oc
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.7"
- name: Setup ArgoCD CLI
uses: imajeetyadav/argocd-cli@v1
with:
version: v2.7.9 # optional
- name: oc login
run: oc login --token=${{ secrets.BUILD_TOKEN }} --server=${{ secrets.CLUSTER_API }}
- name: Notification
run: ./gitops/watch-deployment.sh pgsync prod ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }} ${{ secrets.ARGOCD_SERVER }} ${{ secrets.ARGO_CD_CLI_JWT }}

run-if-failed:
runs-on: ubuntu-24.04
needs: [trigger-gitops]
if: always() && (needs.trigger-gitops.result == 'failure')
steps:
- name: Notification
run: ./gitops/watch-deployment.sh pgsync prod ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }} 1
65 changes: 65 additions & 0 deletions .github/workflows/pgsync.deploy.test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
name: PGSync - Promote Test

on:
workflow_dispatch:

env:
ORIG_TAG: dev
PROMOTE_TAG: test
IMAGE: pgsync

jobs:
promote-image:
name: promote-image
runs-on: ubuntu-24.04
steps:
- name: Install oc
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.7"

- name: oc login
run: |
oc login --token=${{ secrets.BUILD_TOKEN }} --server=${{ secrets.CLUSTER_API }}

- name: Promote from dev to test
run: |
oc -n ${{secrets.NS_TOOLS}} tag \
${{ secrets.NS_TOOLS }}/${{ env.IMAGE }}:${{ env.ORIG_TAG }} \
${{ secrets.NS_TOOLS }}/${{ env.IMAGE }}:${{ env.PROMOTE_TAG }}

trigger-gitops:
runs-on: ubuntu-24.04
timeout-minutes: 10
needs: promote-image
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Setup SSH Agent
uses: ./.github/actions/setup-ssh
with:
ssh-private-key: ${{ secrets.GITOPS_REPO_DEPLOY_KEY }}

- name: Git Ops Push
run: ./gitops/commit.sh ${{ env.IMAGE }} dev test ${{ github.actor }}
- name: Install oc
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.7"
- name: Setup ArgoCD CLI
uses: imajeetyadav/argocd-cli@v1
with:
version: v2.7.9 # optional
- name: oc login
run: oc login --token=${{ secrets.BUILD_TOKEN }} --server=${{ secrets.CLUSTER_API }}
- name: Notification
run: ./gitops/watch-deployment.sh pgsync test ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }} ${{ secrets.ARGOCD_SERVER }} ${{ secrets.ARGO_CD_CLI_JWT }}

run-if-failed:
runs-on: ubuntu-24.04
needs: [trigger-gitops]
if: always() && (needs.trigger-gitops.result == 'failure')
steps:
- name: Notification
run: ./gitops/watch-deployment.sh pgsync test ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }} 1
3 changes: 3 additions & 0 deletions bin/setenv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ AZURE_SEARCH_API_KEY
ELASTICSEARCH_CA_CERT
SYNCFUSION_LICENSE_KEY
SYNCFUSION_FRONTEND_LICENSE_KEY
AZURE_STORAGE_CONNECTION_STRING
AZURE_STORAGE_CONTAINER
AZURE_STORAGE_BLOB_SERVICE_ENDPOINT
"

bold=$(tput bold)
Expand Down
72 changes: 54 additions & 18 deletions docker-compose.M1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ version: "3"
include:
- ./services/permits/docker-compose.yaml
services:

####################### Keycloak for Cypress #######################
keycloak:
build:
Expand All @@ -24,7 +23,7 @@ services:
####################### Open Telemetry #######################
otelcollector:
image: otel/opentelemetry-collector
command: [ --config=/etc/otel-collector-config.yaml ]
command: [--config=/etc/otel-collector-config.yaml]
volumes:
- ./otel-collector-config.yaml:/etc/otel-collector-config.yaml
ports:
Expand Down Expand Up @@ -67,10 +66,9 @@ services:
- ./services/postgres/postgresql.conf:/config/postgresql.conf
- ./services/postgres/pg_hba.conf:/config/pg_hba.conf
- postgres_data:/var/lib/postgresql/data
command:
postgres -c 'config_file=/config/postgresql.conf' -c 'hba_file=/config/pg_hba.conf'
command: postgres -c 'config_file=/config/postgresql.conf' -c 'hba_file=/config/pg_hba.conf'
healthcheck:
test: [ "CMD", "pg_isready" ]
test: ["CMD", "pg_isready"]
interval: 5s
timeout: 5s
retries: 5
Expand All @@ -84,12 +82,12 @@ services:
context: services/postgres
dockerfile: Dockerfile_update
environment:
- PGUSER=mds
- POSTGRES_PASSWORD=test
- POSTGRES_INITDB_ARGS=-U mds
- PGUSER=mds
- POSTGRES_PASSWORD=test
- POSTGRES_INITDB_ARGS=-U mds
volumes:
- postgres_data_bkp:/var/lib/postgresql/13/data
- postgres_data:/var/lib/postgresql/16/data
- postgres_data_bkp:/var/lib/postgresql/13/data
- postgres_data:/var/lib/postgresql/16/data

####################### Flyway Migration Definition #######################
flyway:
Expand Down Expand Up @@ -118,6 +116,40 @@ services:
depends_on:
- postgres
####################### Backend Definition #######################

pgsync:
build:
context: services/pgsync
container_name: mds_pgsync
platform: linux/amd64
environment:
- PG_HOST=postgres
- PG_PORT=5432
- PG_USER=mds
- PG_PASSWORD=test
- PG_DATABASE=mds
- ELASTICSEARCH_HOST=elasticsearch
- ELASTICSEARCH_PORT=9200
- ELASTICSEARCH_SCHEME=https
- ELASTICSEARCH_USER=elastic
- ELASTICSEARCH_PASSWORD=elastic
- ELASTICSEARCH_VERIFY_CERTS=false
- ELASTICSEARCH_CA_CERTS=/certs/ca/ca.crt
- PGSYNC_CHECKPOINT_PATH=/tmp
- REDIS_HOST=redis
- REDIS_PORT=6379
- REDIS_DB=0
- REDIS_AUTH=redis-password
volumes:
- ./services/pgsync:/config
- certs:/certs
depends_on:
postgres:
condition: service_healthy
elasticsearch:
condition: service_healthy
redis:
condition: service_healthy
backend:
restart: always
user: 1000:1000
Expand All @@ -131,6 +163,7 @@ services:
- ./migrations:/migrations
- ./services/core-api:/app
- core_api_logs:/var/log/core-api
- certs:/certs
depends_on:
- flyway
- nris_backend
Expand All @@ -139,12 +172,13 @@ services:
- filesystem_provider
- postgres
- redis
- pgsync
- jaeger
- otelcollector
- keycloak
- core_api_celery
healthcheck:
test: [ "CMD", "curl", "localhost:5000/health" ]
test: ["CMD", "curl", "localhost:5000/health"]
interval: 5s
timeout: 5s
retries: 5
Expand All @@ -159,6 +193,7 @@ services:
- 5556:5555
volumes:
- ./services/core-api:/app
- certs:/certs
depends_on:
- postgres
- redis
Expand All @@ -173,7 +208,7 @@ services:
ports:
- "6379:6379"
healthcheck:
test: [ "CMD", "redis-cli", "ping" ]
test: ["CMD", "redis-cli", "ping"]
interval: 5s
timeout: 5s
retries: 5
Expand All @@ -186,7 +221,7 @@ services:
platform: linux/amd64
build:
context: services/core-web
command: [ "npm", "run", "serve" ]
command: ["npm", "run", "serve"]
volumes:
- ./services/core-web/src:/app/src
ports:
Expand All @@ -195,7 +230,7 @@ services:
- backend
env_file: ./services/core-web/.env
healthcheck:
test: [ "CMD", "curl", "localhost:3000/health" ]
test: ["CMD", "curl", "localhost:3000/health"]
interval: 15s
timeout: 5s
retries: 5
Expand All @@ -209,7 +244,7 @@ services:
platform: linux/amd64
build:
context: services/minespace-web
command: [ "npm", "run", "serve" ]
command: ["npm", "run", "serve"]
volumes:
- ./services/minespace-web/src:/app/src
ports:
Expand All @@ -218,7 +253,7 @@ services:
- backend
env_file: ./services/minespace-web/.env
healthcheck:
test: [ "CMD", "curl", "localhost:3020/health" ]
test: ["CMD", "curl", "localhost:3020/health"]
interval: 5s
timeout: 5s
retries: 5
Expand All @@ -239,7 +274,7 @@ services:
- nris_migrate
env_file: ./services/nris-api/backend/.env
healthcheck:
test: [ "CMD", "curl", "localhost:5500/health" ]
test: ["CMD", "curl", "localhost:5500/health"]
interval: 5s
timeout: 5s
retries: 5
Expand Down Expand Up @@ -269,6 +304,7 @@ services:
####################### Syncfusion Filesystem Provider Definition #######################
filesystem_provider:
container_name: filesystem_provider
platform: linux/amd64
build:
context: services/filesystem-provider
ports:
Expand Down Expand Up @@ -329,7 +365,7 @@ services:
restart: always
container_name: docgen_api
image: bcgovimages/common-document-generation-service:2.4.1
command: [ "npm", "run", "start" ]
command: ["npm", "run", "start"]
environment:
- SERVER_PORT=3030
- APP_PORT=3030
Expand Down
Loading
Loading