Merge pull request #364 from City-of-Helsinki/feat/HAUKI-483-matomo-t…

…racking feat: Matomo tracking HAUKI-483
City-of-Helsinki · Mar 5, 2024 · c22e679 · c22e679
2 parents d2d9231 + 24cc3a6
commit c22e679
Show file tree

Hide file tree

Showing 31 changed files with 791 additions and 243 deletions.
diff --git a/.env b/.env
@@ -1,6 +1,9 @@
-API_URL=""
+API_URL="http://localhost:8000"
 USE_AXE=""
 SENTRY_DSN=""
 SENTRY_ENV=""
-REACT_APP_VERSION=""
 FEEDBACK_EMAILS=""
+MATOMO_SRC_URL=""
+MATOMO_URL_BASE=""
+MATOMO_SITE_ID=""
+MATOMO_ENABLED=false
diff --git a/cypress/index.d.ts b/cypress/index.d.ts
@@ -41,5 +41,6 @@ declare namespace Cypress {
       hours: string;
       minutes: string;
     }) => Chainable;
+    acceptAllCookies(): void;
   }
 }
diff --git a/cypress/integration/App.spec.ts b/cypress/integration/App.spec.ts
@@ -5,6 +5,7 @@
 describe('Open aukiolot app', () => {
   beforeEach(() => {
     cy.visitResourcePageAsAuthenticatedUser(Cypress.env('resourceId'));
+    cy.acceptAllCookies();
   });
 
   it('Contains correct page title', () => {

diff --git a/cypress/integration/CopyResourcePeriods.spec.ts b/cypress/integration/CopyResourcePeriods.spec.ts
@@ -8,6 +8,8 @@ describe('User visits resource page with target resource', () => {
       Cypress.env('resourceId'),
       Cypress.env('targetResourceId')
     );
+
+    cy.acceptAllCookies();
   });
 
   it('Contains copy section title and copy button', () => {

diff --git a/cypress/integration/ExceptionOpeningHours.ts b/cypress/integration/ExceptionOpeningHours.ts
@@ -3,6 +3,7 @@
 describe('User adds a new exception date period', () => {
   beforeEach(() => {
     cy.visitResourcePageAsAuthenticatedUser(Cypress.env('resourceId'));
+    cy.acceptAllCookies();
   });
 
   it('Users successfully adds a new exception opening hours', () => {

diff --git a/cypress/integration/Holidays.ts b/cypress/integration/Holidays.ts
@@ -4,6 +4,7 @@ describe('User adds a new holiday opening period', () => {
   beforeEach(() => {
     cy.visitResourcePageAsAuthenticatedUser(Cypress.env('resourceId'));
     cy.intercept('POST', '/v1/date_period/').as('saveHoliday');
+    cy.acceptAllCookies();
   });
 
   it('Users successfully adds a new holiday opening hours', () => {

diff --git a/cypress/integration/NormalOpeningHours.ts b/cypress/integration/NormalOpeningHours.ts
@@ -3,6 +3,7 @@
 describe('User adds a new opening period', () => {
   beforeEach(() => {
     cy.visitResourcePageAsAuthenticatedUser(Cypress.env('resourceId'));
+    cy.acceptAllCookies();
   });
 
   it('Users successfully adds a new opening hours', () => {

diff --git a/cypress/integration/User.spec.ts b/cypress/integration/User.spec.ts
@@ -3,6 +3,7 @@
 describe('Unauthenticated user', () => {
   beforeEach(() => {
     cy.visitResourcePageAsUnauthenticatedUser(Cypress.env('resourceId'));
+    cy.acceptAllCookies();
   });
 
   it('Is redirected to unauthenticated page', () => {
@@ -13,6 +14,7 @@ describe('Unauthenticated user', () => {
 describe('Authenticated user', () => {
   beforeEach(() => {
     cy.visitResourcePageAsAuthenticatedUser(Cypress.env('resourceId'));
+    cy.acceptAllCookies();
   });
 
   it('should logout permanently on application close', () => {

diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
@@ -222,3 +222,12 @@ Cypress.Commands.add(
     cy.get(`#${id}-minutes`).type(minutes);
   }
 );
+
+Cypress.Commands.add('acceptAllCookies', () => {
+  const cookieConsentModal = cy.get('#cookie-consent-content');
+  const acceptAllButton = cookieConsentModal.get(
+    'button[data-testid="cookie-consent-approve-button"]'
+  );
+
+  acceptAllButton.click();
+});
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,8 +1,12 @@
-version: "3.7"
+version: '3.7'
 services:
   app:
+    platform: linux/amd64
     container_name: hauki-admin-ui
     build:
       context: .
+    env_file:
+      - .env
+      - .env.local
     ports:
       - '3000:8000'
diff --git a/package.json b/package.json
@@ -27,6 +27,7 @@
     "cypress-axe": "^0.12.1",
     "date-fns": "2.29.3",
     "date-holidays": "^3.16.1",
+    "dotenv-cli": "^7.3.0",
     "enzyme": "^3.11.0",
     "eslint-config-airbnb-typescript-prettier": "^5.0.0",
     "hds-core": "^3.5.0",
@@ -47,10 +48,10 @@
     "typescript": "4.4.3"
   },
   "scripts": {
-    "start": "REACT_APP_VERSION=$npm_package_version SENTRY_ENV=${SENTRY_ENV:=local} API_URL=${API_URL:=http://localhost:8000} USE_AXE=${USE_AXE:=true} ./scripts/env.sh && cp env-config.js ./public/ && BROWSER=none react-scripts start",
-    "start-with-test-api": "REACT_APP_VERSION=$npm_package_version SENTRY_ENV=local API_URL=https://hauki-api.test.hel.ninja USE_AXE=${USE_AXE:=true} ./scripts/env.sh && cp env-config.js ./public/ && react-scripts start",
-    "start-with-new-test-api": "REACT_APP_VERSION=$npm_package_version SENTRY_ENV=local API_URL=https://hauki-api.test.hel.ninja USE_AXE=${USE_AXE:=true} ./scripts/env.sh && cp env-config.js ./public/ && react-scripts start",
-    "build": "REACT_APP_VERSION=$npm_package_version react-scripts build",
+    "start": "dotenv -c -v REACT_APP_VERSION=$npm_package_version -- ./scripts/env.sh && cp env-config.js ./public/ && BROWSER=none react-scripts start",
+    "start-with-test-api": "dotenv -c -v REACT_APP_VERSION=$npm_package_version SENTRY_ENV=local API_URL=https://hauki-api.test.hel.ninja USE_AXE=${USE_AXE:=true} -- ./scripts/env.sh && cp env-config.js ./public/ && react-scripts start",
+    "start-with-new-test-api": "dotenv -c -v REACT_APP_VERSION=$npm_package_version SENTRY_ENV=local API_URL=https://hauki-api.test.hel.ninja USE_AXE=${USE_AXE:=true} -- ./scripts/env.sh && cp env-config.js ./public/ && react-scripts start",
+    "build": "dotenv -c -v REACT_APP_VERSION=$npm_package_version -- react-scripts build",
     "test": "react-scripts test --env=jest-environment-jsdom-sixteen",
     "test:cov": "react-scripts test --env=jest-environment-jsdom-sixteen --coverage",
     "test-cypress": "start-server-and-test start http://localhost:3000 cypress-run-chrome",