IntersectMBO · MSzalowski · Apr 16, 2025 · Apr 16, 2025
diff --git a/.github/workflows/build-and-deploy-test-stack.yml b/.github/workflows/build-and-deploy-test-stack.yml
@@ -14,7 +14,7 @@ env:
 jobs:
   deploy:
     name: Deploy app
-    environment: "preview-govtool"
+    environment: 'preview-govtool'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -62,13 +62,15 @@ jobs:
             cd $DEST_DIR/tests/test-infrastructure
             ./build-and-deploy.sh update-images
             yes | docker system prune -f || echo "Ignoring system prune eror"
-          envs: GOVTOOL_TAG, GRAFANA_ADMIN_PASSWORD, GRAFANA_SLACK_RECIPIENT, GRAFANA_SLACK_OAUTH_TOKEN, SENTRY_DSN_BACKEND, SENTRY_DSN_FRONTEND, PIPELINE_URL, USERSNAP_SPACE_API_KEY, APP_ENV, PDF_API_URL, KUBER_API_KEY, IPFS_GATEWAY, IPFS_PROJECT_ID, OUTCOMES_API_URL
+          envs: GOVTOOL_TAG, GRAFANA_ADMIN_PASSWORD, GRAFANA_SLACK_RECIPIENT, GRAFANA_SLACK_OAUTH_TOKEN, SENTRY_DSN_BACKEND, GTM_ID, NPMRC_TOKEN, SENTRY_DSN_FRONTEND, PIPELINE_URL, USERSNAP_SPACE_API_KEY, APP_ENV, PDF_API_URL, KUBER_API_KEY, IPFS_GATEWAY, IPFS_PROJECT_ID, OUTCOMES_API_URL
         env:
           GOVTOOL_TAG: ${{ github.sha }}
           GRAFANA_ADMIN_PASSWORD: ${{ secrets.GRAFANA_ADMIN_PASSWORD }}
           GRAFANA_SLACK_RECIPIENT: ${{ secrets.GRAFANA_SLACK_RECIPIENT }}
           GRAFANA_SLACK_OAUTH_TOKEN: ${{ secrets.GRAFANA_SLACK_OAUTH_TOKEN }}
           SENTRY_DSN_BACKEND: ${{ secrets.SENTRY_DSN_BACKEND }}
+          GTM_ID: ${{ secrets.GTM_ID }}
+          NPMRC_TOKEN: ${{ secrets.NPMRC_TOKEN }}
           SENTRY_DSN_FRONTEND: ${{ secrets.SENTRY_DSN_FRONTEND }}
           PIPELINE_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
           USERSNAP_SPACE_API_KEY: ${{ secrets.USERSNAP_SPACE_API_KEY }}

diff --git a/.github/workflows/build-from-main.yml b/.github/workflows/build-from-main.yml
@@ -189,6 +189,7 @@ jobs:
             echo "TAG=${SANITIZED_BRANCH}-${{ github.sha }}-${{ github.run_number }}" >> $GITHUB_ENV
           fi
           echo "Generated TAG: $TAG"
+
 
       - name: Lint Dockerfile
         id: hadolint
@@ -253,7 +254,7 @@ jobs:
 
       - name: Set ENVIRONMENT Variable
         run: echo "ENVIRONMENT=${{ matrix.network }}" >> $GITHUB_ENV
-
+      
       - name: Sanitize Network Name
         run: |
           CLEAN_NETWORK=$(echo "${{ matrix.network }}" | sed 's/-govtool$//')
@@ -273,8 +274,10 @@ jobs:
             VITE_APP_ENV=${{ secrets.VITE_APP_ENV }}
             VITE_BASE_URL=${{ secrets.VITE_BASE_URL }}
             VITE_METADATA_API_URL=${{ secrets.VITE_METADATA_API_URL }}
+            VITE_GTM_ID=${{ secrets.VITE_GTM_ID }}
             VITE_NETWORK_FLAG=${{ secrets.VITE_NETWORK_FLAG }}
             VITE_SENTRY_DSN=${{ secrets.VITE_SENTRY_DSN }}
+            NPMRC_TOKEN=${{ secrets.NPMRC_TOKEN }}
             VITE_USERSNAP_SPACE_API_KEY=${{ secrets.VITE_USERSNAP_SPACE_API_KEY }}
             VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED=${{ secrets.VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED }}
             VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED=${{ secrets.VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED }}
@@ -307,11 +310,11 @@ jobs:
 
       - name: Debug TAG Before Docker Push
         run: |
-          echo "Lowercase Image: ${{ steps.image_lowercase.outputs.lowercase }}"
-          echo "Network: ${{ matrix.network }}"
-          echo "TAG: ${{ env.TAG }}"
-          echo "Final Docker Tag: ${{ steps.image_lowercase.outputs.lowercase }}-${{ matrix.network}}:${{ env.TAG }}"
-
+            echo "Lowercase Image: ${{ steps.image_lowercase.outputs.lowercase }}"
+            echo "Network: ${{ matrix.network }}"
+            echo "TAG: ${{ env.TAG }}"
+            echo "Final Docker Tag: ${{ steps.image_lowercase.outputs.lowercase }}-${{ matrix.network}}:${{ env.TAG }}"
+            
       - name: Push Docker image to GHCR
         run: |
           docker load -i '/tmp/image-${{ matrix.name }}-${{ env.ENVIRONMENT }}.tar'

diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml
@@ -1,6 +1,7 @@
 name: Check,Build,Deploy
 
-on: workflow_dispatch
+on:
+  workflow_dispatch
 
 permissions:
   contents: write
@@ -122,8 +123,10 @@ jobs:
             VITE_APP_ENV=${{ secrets.VITE_APP_ENV }}
             VITE_BASE_URL=${{ secrets.VITE_BASE_URL }}
             VITE_METADATA_API_URL=${{ secrets.VITE_METADATA_API_URL }}
+            VITE_GTM_ID=${{ secrets.VITE_GTM_ID }}
             VITE_NETWORK_FLAG=${{ secrets.VITE_NETWORK_FLAG }}
             VITE_SENTRY_DSN=${{ secrets.VITE_SENTRY_DSN }}
+            NPMRC_TOKEN=${{ secrets.NPMRC_TOKEN }}
             VITE_USERSNAP_SPACE_API_KEY=${{ secrets.VITE_USERSNAP_SPACE_API_KEY }}
             VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED=${{ secrets.VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED }}
             VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED=${{ secrets.VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED }}

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -115,8 +115,10 @@ jobs:
             VITE_APP_ENV=${{ secrets.VITE_APP_ENV }}
             VITE_BASE_URL=${{ secrets.VITE_BASE_URL }}
             VITE_METADATA_API_URL=${{ secrets.VITE_METADATA_API_URL }}
+            VITE_GTM_ID=${{ secrets.VITE_GTM_ID }}
             VITE_NETWORK_FLAG=${{ secrets.VITE_NETWORK_FLAG }}
             VITE_SENTRY_DSN=${{ secrets.VITE_SENTRY_DSN }}
+            NPMRC_TOKEN=${{ secrets.NPMRC_TOKEN }}
             VITE_USERSNAP_SPACE_API_KEY=${{ secrets.VITE_USERSNAP_SPACE_API_KEY }}
             VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED=${{ secrets.VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED }}
             VITE_PDF_API_URL=${{ secrets.VITE_PDF_API_URL }}

diff --git a/govtool/frontend/.env.example b/govtool/frontend/.env.example
@@ -3,6 +3,7 @@ VITE_BASE_URL=""
 VITE_METADATA_API_URL=""
 VITE_NETWORK_FLAG=0
 VITE_SENTRY_DSN=""
+VITE_GTM_ID=""
 VITE_IS_DEV=true
 VITE_USERSNAP_SPACE_API_KEY=""
 VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED='true'

diff --git a/govtool/frontend/Dockerfile b/govtool/frontend/Dockerfile
@@ -3,8 +3,10 @@ FROM node:20.18.1-alpine as builder
 ARG VITE_APP_ENV='beta'
 ARG VITE_BASE_URL
 ARG VITE_METADATA_API_URL
+ARG VITE_GTM_ID
 ARG VITE_NETWORK_FLAG=0
 ARG VITE_SENTRY_DSN
+ARG NPMRC_TOKEN
 ARG VITE_USERSNAP_SPACE_API_KEY
 ARG VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED='true'
 ARG VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED='false'
@@ -20,8 +22,10 @@ RUN \
   : "${VITE_APP_ENV:?Build argument VITE_APP_ENV is not set}" && \
   : "${VITE_BASE_URL:?Build argument VITE_BASE_URL is not set}" && \
   : "${VITE_METADATA_API_URL:?Build argument VITE_METADATA_API_URL is not set}" && \
+  : "${VITE_GTM_ID:?Build argument VITE_GTM_ID is not set}" && \
   : "${VITE_NETWORK_FLAG:?Build argument VITE_NETWORK_FLAG is not set}" && \
   : "${VITE_SENTRY_DSN:?Build argument VITE_SENTRY_DSN is not set}" && \
+  : "${NPMRC_TOKEN:?Build argument NPMRC_TOKEN is not set}" && \
   : "${VITE_USERSNAP_SPACE_API_KEY:?Build argument VITE_USERSNAP_SPACE_API_KEY is not set}" && \
   : "${VITE_PDF_API_URL:?Build argument VITE_PDF_API_URL is not set}" && \
   : "${VITE_OUTCOMES_API_URL:?Build argument VITE_OUTCOMES_API_URL is not set}" && \
@@ -32,6 +36,10 @@ RUN \
 
 WORKDIR /src
 
+# Set npm configuration settings using environment variables
+RUN npm config set @intersect.mbo:registry "https://registry.npmjs.org/" --location=global
+RUN npm config set //registry.npmjs.org/:_authToken ${NPMRC_TOKEN} --location=global
+
 COPY package.json package-lock.json ./
 COPY patches ./patches
 

diff --git a/govtool/frontend/Dockerfile.qovery b/govtool/frontend/Dockerfile.qovery
@@ -3,8 +3,10 @@ FROM node:20.18.1-alpine as builder
 ARG VITE_APP_ENV='beta'
 ARG VITE_BASE_URL
 ARG VITE_METADATA_API_URL
+ARG VITE_GTM_ID
 ARG VITE_NETWORK_FLAG=0
 ARG VITE_SENTRY_DSN
+ARG NPMRC_TOKEN
 ARG VITE_USERSNAP_SPACE_API_KEY
 ARG VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED
 ARG VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED
@@ -17,6 +19,10 @@ WORKDIR /src
 
 ENV NODE_OPTIONS="--max-old-space-size=4096"
 
+# Set npm configuration settings using environment variables
+RUN npm config set @intersect.mbo:registry "https://registry.npmjs.org/" --location=global
+RUN npm config set //registry.npmjs.org/:_authToken ${NPMRC_TOKEN} --location=global
+
 COPY package.json package-lock.json ./
 COPY patches ./patches
 

diff --git a/govtool/frontend/default.nix b/govtool/frontend/default.nix
@@ -2,6 +2,7 @@
 , incl
 , VITE_BASE_URL ? "http://localhost"
 , VITE_IS_DEV ? "true"
+, VITE_GTM_ID ? ""
 , VITE_SENTRY_DSN ? ""
 , VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED ? ""
 , VITE_PDF_API_URL ? ""
@@ -31,7 +32,7 @@ let
     name = "govtool-website";
     src = frontendSrc;
     buildInputs = [(pkgs.yarn.override { nodejs = pkgs.nodejs_18;}) nodeModules];
-    inherit VITE_BASE_URL VITE_IS_DEV VITE_SENTRY_DSN VITE_NETWORK_FLAG VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED VITE_PDF_API_URL;
+    inherit VITE_BASE_URL VITE_IS_DEV VITE_GTM_ID VITE_SENTRY_DSN VITE_NETWORK_FLAG VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED VITE_PDF_API_URL;
     buildPhase = ''
       cp -R ${nodeModules}/libexec/@govtool/frontend/node_modules node_modules
 

diff --git a/govtool/frontend/package-lock.json b/govtool/frontend/package-lock.json
diff --git a/govtool/frontend/package.json b/govtool/frontend/package.json
@@ -50,6 +50,7 @@
     "react": "^18.2.0",
     "react-diff-view": "^3.2.1",
     "react-dom": "^18.2.0",
+    "react-gtm-module": "^2.0.11",
     "react-hook-form": "^7.47.0",
     "react-i18next": "^14.0.1",
     "react-markdown": "^9.0.1",

diff --git a/govtool/frontend/src/main.tsx b/govtool/frontend/src/main.tsx
@@ -3,6 +3,7 @@ import ReactDOM from "react-dom/client";
 import { BrowserRouter } from "react-router-dom";
 import { QueryClient, QueryClientProvider } from "react-query";
 import { ReactQueryDevtools } from "react-query/devtools";
+import TagManager from "react-gtm-module";
 import { ThemeProvider } from "@emotion/react";
 import * as Sentry from "@sentry/react";
 
@@ -24,6 +25,12 @@ const queryClient = new QueryClient({
   },
 });
 
+const tagManagerArgs = {
+  gtmId: import.meta.env.VITE_GTM_ID,
+};
+
+TagManager.initialize(tagManagerArgs);
+
 Sentry.init({
   dsn: import.meta.env.VITE_SENTRY_DSN,
   environment: import.meta.env.VITE_APP_ENV,

diff --git a/govtool/frontend/yarn.lock b/govtool/frontend/yarn.lock
@@ -1377,10 +1377,10 @@
   resolved "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-asmjs/-/cardano-serialization-lib-asmjs-14.1.1.tgz"
   integrity sha512-Q2HVpPRt417Quxv3qagGWbkJQU8SiQCl1K/344ZtQMwsLoqTfRlCNzmSWMBN7jyBxbtKoh+vdbSiLqwG1NAjYg==
 
-"@esbuild/linux-x64@0.25.0":
+"@esbuild/darwin-arm64@0.25.0":
   version "0.25.0"
-  resolved "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.0.tgz"
-  integrity sha512-9yl91rHw/cpwMCNytUDxwj2XjFpxML0y9HAOH9pNVQDpQrBxHy01Dx+vaMu0N1CKa/RzBD2hB4u//nfc+Sd3Cw==
+  resolved "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.0.tgz"
+  integrity sha512-mVwdUb5SRkPayVadIOI78K7aAnPamoeFR2bT5nszFUZ9P8UpK4ratOdYbZZXYSqPKMHfS1wdHCJk1P1EZpRdvw==
 
 "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
   version "4.4.1"
@@ -2173,15 +2173,10 @@
   resolved "https://registry.npmjs.org/@open-draft/until/-/until-2.1.0.tgz"
   integrity sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==
 
-"@parcel/watcher-linux-x64-glibc@2.5.0":
+"@parcel/watcher-darwin-arm64@2.5.0":
   version "2.5.0"
-  resolved "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.0.tgz"
-  integrity sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==
-
-"@parcel/watcher-linux-x64-musl@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.0.tgz"
-  integrity sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==
+  resolved "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.0.tgz"
+  integrity sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw==
 
 "@parcel/watcher@^2.4.1":
   version "2.5.0"
@@ -2294,15 +2289,10 @@
     estree-walker "^2.0.2"
     picomatch "^4.0.2"
 
-"@rollup/rollup-linux-x64-gnu@4.34.9":
-  version "4.34.9"
-  resolved "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.9.tgz"
-  integrity sha512-FwBHNSOjUTQLP4MG7y6rR6qbGw4MFeQnIBrMe161QGaQoBQLqSUEKlHIiVgF3g/mb3lxlxzJOpIBhaP+C+KP2A==
-
-"@rollup/rollup-linux-x64-musl@4.34.9":
+"@rollup/rollup-darwin-arm64@4.34.9":
   version "4.34.9"
-  resolved "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.9.tgz"
-  integrity sha512-cYRpV4650z2I3/s6+5/LONkjIz8MBeqrk+vPXV10ORBnshpn8S32bPqQ2Utv39jCiDcO2eJTuSlPXpnvmaIgRA==
+  resolved "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.9.tgz"
+  integrity sha512-0CY3/K54slrzLDjOA7TOjN1NuLKERBgk9nY5V34mhmuu673YNb+7ghaDUs6N0ujXR7fz5XaS5Aa6d2TNxZd0OQ==
 
 "@rtsao/scc@^1.1.0":
   version "1.1.0"
@@ -2905,15 +2895,10 @@
     "@svgr/plugin-svgo" "^5.5.0"
     loader-utils "^2.0.0"
 
-"@swc/core-linux-x64-gnu@1.9.3":
-  version "1.9.3"
-  resolved "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.9.3.tgz"
-  integrity sha512-ivXXBRDXDc9k4cdv10R21ccBmGebVOwKXT/UdH1PhxUn9m/h8erAWjz5pcELwjiMf27WokqPgaWVfaclDbgE+w==
-
-"@swc/core-linux-x64-musl@1.9.3":
+"@swc/core-darwin-arm64@1.9.3":
   version "1.9.3"
-  resolved "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.9.3.tgz"
-  integrity sha512-ILsGMgfnOz1HwdDz+ZgEuomIwkP1PHT6maigZxaCIuC6OPEhKE8uYna22uU63XvYcLQvZYDzpR3ms47WQPuNEg==
+  resolved "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.9.3.tgz"
+  integrity sha512-hGfl/KTic/QY4tB9DkTbNuxy5cV4IeejpPD4zo+Lzt4iLlDWIeANL4Fkg67FiVceNJboqg48CUX+APhDHO5G1w==
 
 "@swc/core@*", "@swc/core@^1.5.22", "@swc/core@^1.7.26":
   version "1.9.3"
@@ -7221,6 +7206,16 @@ fs@^0.0.1-security:
   resolved "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz"
   integrity sha512-3XY9e1pP0CVEUCdj5BmfIZxRBTSDycnbqhIOGec9QYtmVH2fbLpj86CFWkrNOkt/Fvty4KZG5lTglL9j/gJ87w==
 
+fsevents@^2.3.2, fsevents@~2.3.2, fsevents@~2.3.3:
+  version "2.3.3"
+  resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
+
+fsevents@2.3.2:
+  version "2.3.2"
+  resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+
 function-bind@^1.1.2:
   version "1.1.2"
   resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz"
@@ -12274,6 +12269,11 @@ react-error-overlay@^6.0.11:
   resolved "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz"
   integrity sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==
 
+react-gtm-module@^2.0.11:
+  version "2.0.11"
+  resolved "https://registry.npmjs.org/react-gtm-module/-/react-gtm-module-2.0.11.tgz"
+  integrity sha512-8gyj4TTxeP7eEyc2QKawEuQoAZdjKvMY4pgWfycGmqGByhs17fR+zEBs0JUDq4US/l+vbTl+6zvUIx27iDo/Vw==
+
 react-hook-form@^7.0.0, react-hook-form@^7.47.0:
   version "7.53.2"
   resolved "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.53.2.tgz"

@@ -41,10 +41,12 @@ services:
       args:
         VITE_BASE_URL: "/api"
         VITE_SENTRY_DSN: ${SENTRY_DSN_FRONTEND}
+        NPMRC_TOKEN: ${NPMRC_TOKEN}
         VITE_APP_ENV: ${APP_ENV:-test}
         VITE_USERSNAP_SPACE_API_KEY: ${USERSNAP_SPACE_API_KEY}
         VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED: "true"
         VITE_METADATA_API_URL: https://${BASE_DOMAIN}/metadata-validation
+        VITE_GTM_ID: ${GTM_ID}
         VITE_PDF_API_URL: ${PDF_API_URL}
         VITE_OUTCOMES_API_URL: ${OUTCOMES_API_URL}
         VITE_IPFS_GATEWAY: ${IPFS_GATEWAY}