Merge pull request #1040 from IntersectMBO/test

Enhance Analytics Dashboard, Metadata Service, and DRep Features; Multiple Fixes and Additions
IntersectMBO · May 16, 2024 · b36df05 · b36df05
2 parents 19129db + f307ebd
commit b36df05
Show file tree

Hide file tree

Showing 285 changed files with 30,435 additions and 1,445 deletions.
diff --git a/.github/workflows/build-and-deploy-beta.yml b/.github/workflows/build-and-deploy-beta.yml
@@ -19,19 +19,23 @@ jobs:
         working-directory: ./scripts/govtool
     env:
       DBSYNC_POSTGRES_DB: "cexplorer"
-      DBSYNC_POSTGRES_USER: "postgres"
       DBSYNC_POSTGRES_PASSWORD: "pSa8JCpQOACMUdGb"
+      DBSYNC_POSTGRES_USER: "postgres"
+      GA_CLIENT_EMAIL: ${{ secrets.GA_CLIENT_EMAIL }}
+      GA_PRIVATE_KEY: ${{ secrets.GA_PRIVATE_KEY }}
       GRAFANA_ADMIN_PASSWORD: ${{ secrets.GRAFANA_ADMIN_PASSWORD }}
-      GRAFANA_SLACK_RECIPIENT: ${{ secrets.GRAFANA_SLACK_RECIPIENT }}
       GRAFANA_SLACK_OAUTH_TOKEN: ${{ secrets.GRAFANA_SLACK_OAUTH_TOKEN }}
-      NGINX_BASIC_AUTH: ${{ secrets.NGINX_BASIC_AUTH }}
-      SENTRY_DSN_BACKEND: ${{ secrets.SENTRY_DSN_BACKEND }}
-      TRAEFIK_LE_EMAIL: "[email protected]"
+      GRAFANA_SLACK_RECIPIENT: ${{ secrets.GRAFANA_SLACK_RECIPIENT }}
       GTM_ID: ${{ secrets.GTM_ID }}
-      SENTRY_DSN: ${{ secrets.SENTRY_DSN_FRONTEND }}
-      PIPELINE_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
       IP_ADDRESS_BYPASSING_BASIC_AUTH1: ${{ secrets.IP_ADDRESS_BYPASSING_BASIC_AUTH1 }}
       IP_ADDRESS_BYPASSING_BASIC_AUTH2: ${{ secrets.IP_ADDRESS_BYPASSING_BASIC_AUTH2 }}
+      NEXT_PUBLIC_API_URL: "https://participation.sanchogov.tools"
+      NEXT_PUBLIC_GA4_PROPERTY_ID: ${{ secrets.NEXT_PUBLIC_GA4_PROPERTY_ID }}
+      PIPELINE_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
+      SENTRY_DSN: ${{ secrets.SENTRY_DSN_FRONTEND }}
+      SENTRY_DSN_BACKEND: ${{ secrets.SENTRY_DSN_BACKEND }}
+      SENTRY_IGNORE_API_RESOLUTION_ERROR: "1"
+      TRAEFIK_LE_EMAIL: "[email protected]"
       USERSNAP_SPACE_API_KEY: ${{ secrets.USERSNAP_SPACE_API_KEY }}
     steps:
       - name: Checkout code

diff --git a/.github/workflows/build-and-deploy-dev.yml b/.github/workflows/build-and-deploy-dev.yml
@@ -18,19 +18,24 @@ jobs:
         working-directory: ./scripts/govtool
     env:
       DBSYNC_POSTGRES_DB: "cexplorer"
-      DBSYNC_POSTGRES_USER: "postgres"
       DBSYNC_POSTGRES_PASSWORD: "pSa8JCpQOACMUdGb"
+      DBSYNC_POSTGRES_USER: "postgres"
+      GA_CLIENT_EMAIL: ${{ secrets.GA_CLIENT_EMAIL }}
+      GA_PRIVATE_KEY: ${{ secrets.GA_PRIVATE_KEY }}
       GRAFANA_ADMIN_PASSWORD: ${{ secrets.GRAFANA_ADMIN_PASSWORD }}
       GRAFANA_SLACK_RECIPIENT: ${{ secrets.GRAFANA_SLACK_RECIPIENT }}
       GRAFANA_SLACK_OAUTH_TOKEN: ${{ secrets.GRAFANA_SLACK_OAUTH_TOKEN }}
-      NGINX_BASIC_AUTH: ${{ secrets.NGINX_BASIC_AUTH }}
-      SENTRY_DSN_BACKEND: ${{ secrets.SENTRY_DSN_BACKEND }}
-      TRAEFIK_LE_EMAIL: "[email protected]"
       GTM_ID: ${{ secrets.GTM_ID }}
-      SENTRY_DSN: ${{ secrets.SENTRY_DSN_FRONTEND }}
-      PIPELINE_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
       IP_ADDRESS_BYPASSING_BASIC_AUTH1: ${{ secrets.IP_ADDRESS_BYPASSING_BASIC_AUTH1 }}
       IP_ADDRESS_BYPASSING_BASIC_AUTH2: ${{ secrets.IP_ADDRESS_BYPASSING_BASIC_AUTH2 }}
+      NEXT_PUBLIC_API_URL: "https://participation.sanchogov.tools"
+      NEXT_PUBLIC_GA4_PROPERTY_ID: ${{ secrets.NEXT_PUBLIC_GA4_PROPERTY_ID }}
+      DEV_NGINX_BASIC_AUTH: ${{ secrets.DEV_NGINX_BASIC_AUTH }}
+      PIPELINE_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
+      SENTRY_DSN: ${{ secrets.SENTRY_DSN_FRONTEND }}
+      SENTRY_DSN_BACKEND: ${{ secrets.SENTRY_DSN_BACKEND }}
+      SENTRY_IGNORE_API_RESOLUTION_ERROR: "1"
+      TRAEFIK_LE_EMAIL: "[email protected]"
       USERSNAP_SPACE_API_KEY: ${{ secrets.USERSNAP_SPACE_API_KEY }}
     steps:
       - name: Checkout code

diff --git a/.github/workflows/build-and-deploy-staging.yml b/.github/workflows/build-and-deploy-staging.yml
@@ -20,19 +20,24 @@ jobs:
         working-directory: ./scripts/govtool
     env:
       DBSYNC_POSTGRES_DB: "cexplorer"
-      DBSYNC_POSTGRES_USER: "postgres"
       DBSYNC_POSTGRES_PASSWORD: "pSa8JCpQOACMUdGb"
+      DBSYNC_POSTGRES_USER: "postgres"
+      GA_CLIENT_EMAIL: ${{ secrets.GA_CLIENT_EMAIL }}
+      GA_PRIVATE_KEY: ${{ secrets.GA_PRIVATE_KEY }}
       GRAFANA_ADMIN_PASSWORD: ${{ secrets.GRAFANA_ADMIN_PASSWORD }}
-      GRAFANA_SLACK_RECIPIENT: ${{ secrets.GRAFANA_SLACK_RECIPIENT }}
       GRAFANA_SLACK_OAUTH_TOKEN: ${{ secrets.GRAFANA_SLACK_OAUTH_TOKEN }}
-      NGINX_BASIC_AUTH: ${{ secrets.NGINX_BASIC_AUTH }}
-      SENTRY_DSN_BACKEND: ${{ secrets.SENTRY_DSN_BACKEND }}
-      TRAEFIK_LE_EMAIL: "[email protected]"
+      GRAFANA_SLACK_RECIPIENT: ${{ secrets.GRAFANA_SLACK_RECIPIENT }}
       GTM_ID: ${{ secrets.GTM_ID }}
-      SENTRY_DSN: ${{ secrets.SENTRY_DSN_FRONTEND }}
-      PIPELINE_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
       IP_ADDRESS_BYPASSING_BASIC_AUTH1: ${{ secrets.IP_ADDRESS_BYPASSING_BASIC_AUTH1 }}
       IP_ADDRESS_BYPASSING_BASIC_AUTH2: ${{ secrets.IP_ADDRESS_BYPASSING_BASIC_AUTH2 }}
+      NEXT_PUBLIC_API_URL: "https://participation.sanchogov.tools"
+      NEXT_PUBLIC_GA4_PROPERTY_ID: ${{ secrets.NEXT_PUBLIC_GA4_PROPERTY_ID }}
+      STAGING_NGINX_BASIC_AUTH: ${{ secrets.STAGING_NGINX_BASIC_AUTH }}
+      PIPELINE_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
+      SENTRY_DSN: ${{ secrets.SENTRY_DSN_FRONTEND }}
+      SENTRY_DSN_BACKEND: ${{ secrets.SENTRY_DSN_BACKEND }}
+      SENTRY_IGNORE_API_RESOLUTION_ERROR: "1"
+      TRAEFIK_LE_EMAIL: "[email protected]"
       USERSNAP_SPACE_API_KEY: ${{ secrets.USERSNAP_SPACE_API_KEY }}
     steps:
       - name: Checkout code

diff --git a/.github/workflows/build-and-deploy-test.yml b/.github/workflows/build-and-deploy-test.yml
@@ -9,59 +9,53 @@ on:
 env:
   ENVIRONMENT: "test"
   CARDANO_NETWORK: "sanchonet"
-  DOMAIN: "test-sanchonet.govtool.byron.network"
 
 jobs:
   deploy:
     name: Deploy app
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./scripts/govtool
     env:
       DBSYNC_POSTGRES_DB: "cexplorer"
-      DBSYNC_POSTGRES_USER: "postgres"
       DBSYNC_POSTGRES_PASSWORD: "pSa8JCpQOACMUdGb"
+      DBSYNC_POSTGRES_USER: "postgres"
+      GA_CLIENT_EMAIL: ${{ secrets.GA_CLIENT_EMAIL }}
+      GA_PRIVATE_KEY: ${{ secrets.GA_PRIVATE_KEY }}
       GRAFANA_ADMIN_PASSWORD: ${{ secrets.GRAFANA_ADMIN_PASSWORD }}
       GRAFANA_SLACK_RECIPIENT: ${{ secrets.GRAFANA_SLACK_RECIPIENT }}
       GRAFANA_SLACK_OAUTH_TOKEN: ${{ secrets.GRAFANA_SLACK_OAUTH_TOKEN }}
-      NGINX_BASIC_AUTH: ${{ secrets.NGINX_BASIC_AUTH }}
-      SENTRY_DSN_BACKEND: ${{ secrets.SENTRY_DSN_BACKEND }}
-      TRAEFIK_LE_EMAIL: "[email protected]"
       GTM_ID: ${{ secrets.GTM_ID }}
-      SENTRY_DSN: ${{ secrets.SENTRY_DSN_FRONTEND }}
-      PIPELINE_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
       IP_ADDRESS_BYPASSING_BASIC_AUTH1: ${{ secrets.IP_ADDRESS_BYPASSING_BASIC_AUTH1 }}
       IP_ADDRESS_BYPASSING_BASIC_AUTH2: ${{ secrets.IP_ADDRESS_BYPASSING_BASIC_AUTH2 }}
+      NEXT_PUBLIC_API_URL: "https://participation.sanchogov.tools"
+      NEXT_PUBLIC_GA4_PROPERTY_ID: ${{ secrets.NEXT_PUBLIC_GA4_PROPERTY_ID }}
+      TEST_NGINX_BASIC_AUTH: ${{ secrets.TEST_NGINX_BASIC_AUTH }}
+      PIPELINE_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
+      SENTRY_DSN: ${{ secrets.SENTRY_DSN_FRONTEND }}
+      SENTRY_DSN_BACKEND: ${{ secrets.SENTRY_DSN_BACKEND }}
+      SENTRY_IGNORE_API_RESOLUTION_ERROR: "1"
+      TRAEFIK_LE_EMAIL: "[email protected]"
       USERSNAP_SPACE_API_KEY: ${{ secrets.USERSNAP_SPACE_API_KEY }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v3
-        with:
-          aws-access-key-id: ${{ secrets.GHA_AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.GHA_AWS_SECRET_ACCESS_KEY }}
-          aws-region: eu-west-1
-
-      - name: Login to AWS ECR
-        uses: aws-actions/configure-aws-credentials@v2
-        with:
-          aws-region: eu-west-1
-
       - name: Setup SSH agent
         uses: webfactory/[email protected]
         with:
-          ssh-private-key: ${{ secrets.GHA_SSH_PRIVATE_KEY }}
+          ssh-private-key: ${{ secrets.TEST_STACK_SSH_KEY }}
 
-      - name: Deploy app
-        run: |
-          make --debug=b all
-
-      - name: Reprovision Grafana
-        run: |
-          sleep 30 # give grafana time to start up
-          make --debug=b reload-grafana
+      - name: Run Ansible playbook
+        uses: dawidd6/action-ansible-playbook@v2
+        with:
+          playbook: playbook.yml
+          directory: ./tests/test-infrastructure
+          key: ${{ secrets.TEST_STACK_SSH_KEY }}
+          inventory: |
+            [test_server]
+            ${{ secrets.TEST_STACK_SERVER_IP }} ansible_user=ec2-user
+          options: |
+            --verbose
+        env:
+          GOVTOOL_TAG: ${{ github.sha }}
diff --git a/.github/workflows/frontend_sonar_scan.yml b/.github/workflows/frontend_sonar_scan.yml
@@ -15,15 +15,40 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+
+    - name: Cache dependencies
+      uses: actions/cache@v2
+      with:
+        path: govtool/frontend/node_modules
+        key: ${{ runner.os }}-node-${{ hashFiles('govtool/frontend/package-lock.json') }}
+
+    - name: Set up Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version-file: "govtool/frontend/.nvmrc"
+
+    - name: 🧪 Test
+      working-directory: govtool/frontend
+      env:
+        NODE_OPTIONS: "--max_old_space_size=4096"
+      run: |
+        npm install
+        npm run test:coverage
+
+# Running with docker
+#
+#    - name: Run SonarQube Scanner
+#      run: |
+#        docker run --rm \
+#          -e SONAR_HOST_URL="https://sonarcloud.io" \
+#          -e SONAR_TOKEN="ec4183646e59dd70c8077acfabe52062ccbea7a9" \
+#          -v "$(pwd):/usr/src" \
+#          --workdir=/usr/src/govtool/frontend \
+#          sonarsource/sonar-scanner-cli:5.0.1
+
     - uses: sonarsource/sonarqube-scan-action@master
       with:
         projectBaseDir: govtool/frontend
       env:
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
-
-      # Fail the build if it doesn't meet quality gate
-      # - uses: sonarsource/sonarqube-quality-gate-action@master
-      #   timeout-minutes: 5
-      #   env:
-      #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        SONAR_HOST_URL: https://sonarcloud.io
diff --git a/.github/workflows/lighthouse.yml b/.github/workflows/lighthouse.yml
@@ -1,47 +1,31 @@
 name: Lighthouse
 
 on:
-  push:
-    paths:
-      - govtool/frontend/**
-      - .github/workflows/lighthouse.yml
+  workflow_run:
+    workflows:
+      - Build and deploy GovTool to TEST server
+    types:
+      - completed
 
 jobs:
   lighthouse:
     runs-on: ubuntu-latest
-    env:
-      NODE_OPTIONS: --max_old_space_size=4096
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
           node-version: 16
 
-      - name: Install dependencies
-        run: npm install
-        working-directory: ./govtool/frontend
-
-      - name: Cache npm dependencies
-        id: npm-cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.npm
-          key: ${{ runner.os }}-npm-${{ hashFiles('govtool/frontend/package-lock.json', 'tests/govtool-frontend/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-npm-
-
       - run: npm install -g @lhci/[email protected]
 
-      - name: Run build  and lighthouse task
+      - name: Run lighthouse task
         working-directory: ./govtool/frontend
         run: |
-          npm install
-          VITE_BASE_URL=https://staging.govtool.byron.network/ npm run build
           lhci collect
 
       - name: Evaluate reports
         if: github.repository_owner != 'IntersectMBO'
+        working-directory: ./govtool/frontend
         run: |
           lhci assert  --preset "lighthouse:recommended"
 
@@ -50,9 +34,4 @@ jobs:
         if: github.repository_owner == 'IntersectMBO'
         run: |
           lhci assert  --preset lighthouse:recommended || echo "LightHouse Assertion error ignored ..."
-          lhci upload --githubAppToken="${{ secrets.LHCI_GITHUB_APP_TOKEN }}" --token="${{ secrets.LHCI_SERVER_TOKEN }}" --serverBaseUrl=https://lighthouse.cardanoapi.io --ignoreDuplicateBuildFailure
-          curl -X POST https://ligththouse.cardanoapi.io/api/metrics/build-reports \
-            -d "@./lighthouseci/$(ls ./.lighthouseci |grep 'lhr.*\.json' | head -n 1)" \
-            -H "commit-hash: $(git rev-parse HEAD)" \
-            -H "secret-token: ${{ secrets.METRICS_SERVER_SECRET_TOKEN }}" \
-            -H 'Content-Type: application/json' || echo "Metric Upload error ignored ..."
+          lhci upload --githubAppToken="${{ secrets.LHCI_GITHUB_APP_TOKEN }}" --token="${{ secrets.LHCI_SERVER_TOKEN }}" --serverBaseUrl=https://lighthouse-govtool.cardanoapi.io --ignoreDuplicateBuildFailure
diff --git a/.github/workflows/test_integration_playwright.yml b/.github/workflows/test_integration_playwright.yml
@@ -50,14 +50,14 @@ jobs:
           path: tests/govtool-frontend/playwright/allure-results
 
     env:
-      FRONTEND_URL: ${{vars.FRONTEND_URL}}
-      API_URL: ${{vars.API_URL}}
+      FRONTEND_URL: ${{vars.HOST_URL}}
+      API_URL: ${{vars.HOST_URL}}/api
       DOCS_URL: ${{ vars.DOCS_URL }}
       FAUCET_API_URL: ${{ vars.FAUCET_API_URL }}
       FAUCET_API_KEY: ${{secrets.FAUCET_API_KEY}}
       KUBER_API_URL: ${{vars.KUBER_API_URL}}
       KUBER_API_KEY: ${{secrets.KUBER_API_KEY}}
-      WORKERS: ${{vars.WORKERS}}
+      WORKERS: ${{vars.TEST_WORKERS}}
 
   publish-report:
     runs-on: ubuntu-latest
@@ -78,7 +78,7 @@ jobs:
           ref: gh-pages
           path: gh-pages
           repository: ${{vars.GH_PAGES}}
-          token: ${{ secrets.PERSONAL_TOKEN }}
+          ssh-key: ${{ secrets.DEPLOY_KEY }}
 
       - name: Register report
         id: register-project
@@ -89,7 +89,7 @@ jobs:
       - if: steps.register-project.outputs.project_exists != 'true'
         uses: JamesIves/github-pages-deploy-action@v4
         with:
-          token: ${{ secrets.PERSONAL_TOKEN }}
+          ssh-key: ${{ secrets.DEPLOY_KEY }}
           repository-name: ${{vars.GH_PAGES}}
           branch: gh-pages
           folder: project
@@ -121,7 +121,7 @@ jobs:
       - name: Deploy report to Github Pages
         uses: JamesIves/github-pages-deploy-action@v4
         with:
-          token: ${{ secrets.PERSONAL_TOKEN }}
+          ssh-key: ${{ secrets.DEPLOY_KEY }}
           repository-name: ${{vars.GH_PAGES}}
           branch: gh-pages
           folder: build

diff --git a/.gitignore b/.gitignore
@@ -139,3 +139,6 @@ scripts/govtool/dev-postgres_password
 # nodejs/yarn
 
 node_modules
+
+# sonar scanner
+.scannerwork/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,8 @@ changes.
 
 ## [Unreleased]
 
+- Add wallet connector package [Issue 898](https://github.com/IntersectMBO/govtool/issues/898)
+- Change DRep without metadata name from "Sole Voter" to "Direct Voter" [Issue 880](https://github.com/IntersectMBO/govtool/issues/880)
 - Inicialize Usersnap into App [Issue 546](https://github.com/IntersectMBO/govtool/issues/546)
 - Integrate frontend with metadata validation service [Issue 617](https://github.com/IntersectMBO/govtool/issues/617)
 - Implement a loading modal for the validation of the metadata [Issue 646](https://github.com/IntersectMBO/govtool/issues/646)
@@ -22,6 +24,7 @@ changes.
 
 ### Added
 
+- added `metadata/validate` endpoint [Issue 876](https://github.com/IntersectMBO/govtool/issues/876)
 - added pagination to `drep/list` [Issue 756](https://github.com/IntersectMBO/govtool/issues/756)
 - added search query param to the `drep/getVotes` [Issue 640](https://github.com/IntersectMBO/govtool/issues/640)
 - added filtering and sorting capabilities to the `drep/list` [Issue 722](https://github.com/IntersectMBO/govtool/issues/722)
@@ -60,6 +63,7 @@ changes.
 
 ### Fixed
 
+- drep/list sql fix (now the drep type is correct) [Issue 957](https://github.com/IntersectMBO/govtool/issues/957)
 - drep/list sql fix (now the latest tx date is correct) [Issue 826](https://github.com/IntersectMBO/govtool/issues/826)
 - drep/info no longer returns null values [Issue 720](https://github.com/IntersectMBO/govtool/issues/720)
 - drep/getVotes no longer returns 500 [Issue 685](https://github.com/IntersectMBO/govtool/issues/685)
@@ -83,6 +87,7 @@ changes.
 - Fix all the existing eslint errors [Issue 514](https://github.com/IntersectMBO/govtool/issues/514)
 - Fix all the existing typescript errors [Issue 514](https://github.com/IntersectMBO/govtool/issues/514)
 - Fix endless spinner on a dashboard [Issue 539](https://github.com/IntersectMBO/govtool/issues/539)
+- Remove wrongly appended `Yourself` filter on DRep Directory [Issue 1028](https://github.com/IntersectMBO/govtool/issues/1028)
 
 ### Changed
 

diff --git a/flake.nix b/flake.nix
@@ -9,12 +9,12 @@
     flake-utils.lib.eachDefaultSystem (system:
       let
         defaultPkgs = import default_nixpkgs { inherit system; config.allowBroken = true; };
-        nodePkgs = import node_nixpkgs { inherit system; };
+        nodePkgs = import node_nixpkgs { inherit system; config.allowUnfree = true; };
         frontend = nodePkgs.callPackage ./govtool/frontend { pkgs = nodePkgs; };
       in
       {
-        packages.scripts = defaultPkgs.callPackage ./scripts/govtool { pkgs = defaultPkgs; };
-        packages.infra = defaultPkgs.callPackage ./infra/terraform { pkgs = defaultPkgs; };
+        packages.scripts = defaultPkgs.callPackage ./scripts/govtool { pkgs = nodePkgs; };
+        packages.infra = defaultPkgs.callPackage ./infra/terraform { pkgs = nodePkgs; };
         packages.backend = defaultPkgs.callPackage ./govtool/backend { pkgs = defaultPkgs; };
         packages.frontendModules = frontend.nodeModules;
         packages.frontend = frontend.staticSite;