Merge branch 'master' into ruben-fix-disavle-dev

* master: (37 commits) chore(release): v0.13.1 fix: typo in docker config chore(release): v0.13.0 test: analytics fallback feat: analytics page view events feat: add analytics module AB#5986 AB#5935 chore(release): v0.12.2 fix: better way of doing the last commit fix: use prod env file instead of dev env chore(release): v0.12.1 fix: replace ApiImplicitFile chore(release): v0.12.0 build: change log directory AB#6092 build: improve deploy logging AB#6092 build(deps): bump typescript in /services/API-service build(deps): bump @nestjs/swagger in /services/API-service chore: migrate to swagger v4 refactor: position of new variable in env file and fix lint warning chore(release): v0.11.0 refactor: remove eslint warning AB#6079 ...
boukepieter · Feb 11, 2021 · 0be3ab8 · 0be3ab8
2 parents 14597fe + 36ef6fb
commit 0be3ab8
Show file tree

Hide file tree

Showing 82 changed files with 1,291 additions and 807 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,19 +1,25 @@
 # Changelog
 
-All notable changes to the environment set-up will be documented in this file. (Added/changed ENV-variables, etc.) 
-Use this file to prepare production-server(s) before a release.
+All notable changes to the environment set-up will be documented in this file.
+(Added/changed ENV-variables, etc.) Use this file to prepare
+production-server(s) before a release.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+and this project adheres to
+[Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ---
 
 ## [Unreleased](https://github.com/rodekruis/IBF-system/compare/0.1.0...master)
-- 2021-01-27: Add ADMIN_PASSWORD to .env file
+
+-   2021-01-27: Add ADMIN_PASSWORD to .env file
+-   2021-01-27: Add COUNTRIES to .env file
+-   2021-01-27: Move COUNTRY_CODES from settings.py to secrets.py
 
 ### Added
-- 2021-02-05: Covid data needs to be uploaded to '/uga-data-level-2/upload'
-- 2021-01-27: Add WATERPOINTDATA_TOKEN to .env file
+
+-   2021-02-05: Covid data needs to be uploaded to '/uga-data-level-2/upload'
+-   2021-01-27: Add WATERPOINTDATA_TOKEN to .env file
 
 ### Removed
 
@@ -23,4 +29,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ---
 
-## [0.1.0](https://github.com/rodekruis/IBF-system/releases/tag/0.1.0) - 2020-11-12
+## [0.1.0](https://github.com/rodekruis/IBF-system/releases/tag/0.1.0) - 2020-11-12
diff --git a/COMMITLOG.md b/COMMITLOG.md
@@ -1,117 +1,118 @@
-# [0.10.0](https://github.com/rodekruis/IBF-system/compare/v0.9.0...v0.10.0) (2021-02-08)
+## [0.13.1](https://github.com/rodekruis/IBF-system/compare/v0.13.0...v0.13.1) (2021-02-10)
 
 
 ### Bug Fixes
 
-* add district name to covid data AB[#5841](https://github.com/rodekruis/IBF-system/issues/5841) ([888264f](https://github.com/rodekruis/IBF-system/commit/888264fdb7807bb93cbb7412ff221c8c077b1907))
-* clean up old glofas images AB[#5853](https://github.com/rodekruis/IBF-system/issues/5853) ([91733b7](https://github.com/rodekruis/IBF-system/commit/91733b799098fd7fb3bfffa17b4b1e2cb45d582d))
+* typo in docker config ([9e8813f](https://github.com/rodekruis/IBF-system/commit/9e8813f834cd3b6eafaf5ade085c48641af473f2))
 
 
-### Features
 
-* add covid risk popup info + fix order AB[#6025](https://github.com/rodekruis/IBF-system/issues/6025) ([fcd8738](https://github.com/rodekruis/IBF-system/commit/fcd8738ad1bd941a25287aef15ba8a973840e56d))
+# [0.13.0](https://github.com/rodekruis/IBF-system/compare/v0.12.2...v0.13.0) (2021-02-10)
 
 
+### Features
 
-# [0.9.0](https://github.com/rodekruis/IBF-system/compare/v0.8.0...v0.9.0) (2021-02-05)
+* add analytics module AB[#5986](https://github.com/rodekruis/IBF-system/issues/5986) AB[#5935](https://github.com/rodekruis/IBF-system/issues/5935) ([2a46ad5](https://github.com/rodekruis/IBF-system/commit/2a46ad5b65186b447d51b7741f5685c9b17d0947))
+* analytics page view events ([128b482](https://github.com/rodekruis/IBF-system/commit/128b482f8b4fae42b57ceacecb2d47ba9ed6232b))
 
 
-### Bug Fixes
 
-* improve station popup AB[#5852](https://github.com/rodekruis/IBF-system/issues/5852) ([0e455e9](https://github.com/rodekruis/IBF-system/commit/0e455e96f0602d0a8dc267c063b87b1e6fdf6788))
+## [0.12.2](https://github.com/rodekruis/IBF-system/compare/v0.12.1...v0.12.2) (2021-02-09)
 
 
-### Features
+### Bug Fixes
 
-* add aggregate column popovers separately AB[#5665](https://github.com/rodekruis/IBF-system/issues/5665) ([54bc85a](https://github.com/rodekruis/IBF-system/commit/54bc85aa5605231850c3cea16b5cd9b3ca270e33))
-* add eapAlertClasses per country AB[#5853](https://github.com/rodekruis/IBF-system/issues/5853) ([d1cd04a](https://github.com/rodekruis/IBF-system/commit/d1cd04a762b9f7187bb493e12b0a9c7e993e23cf))
-* start of upgrade station popup ([9eeba45](https://github.com/rodekruis/IBF-system/commit/9eeba45db78604a3b1c3b0d1861224e16d66ce47))
+* better way of doing the last commit ([b87d82f](https://github.com/rodekruis/IBF-system/commit/b87d82f24a18e1c12e4b206537a3b8057d38fa1d))
+* use prod env file instead of dev env ([777bea7](https://github.com/rodekruis/IBF-system/commit/777bea750a5aa1ae9f094ecbd3e0ddec0bf02b18))
 
 
 
-# [0.8.0](https://github.com/rodekruis/IBF-system/compare/v0.7.0...v0.8.0) (2021-02-05)
+## [0.12.1](https://github.com/rodekruis/IBF-system/compare/v0.12.0...v0.12.1) (2021-02-09)
 
 
 ### Bug Fixes
 
-* improve aggregate header order + length AB[#5869](https://github.com/rodekruis/IBF-system/issues/5869) ([bb29039](https://github.com/rodekruis/IBF-system/commit/bb2903989156b8bc2a8053ff580d62e46e06e2d5))
+* replace ApiImplicitFile ([2648038](https://github.com/rodekruis/IBF-system/commit/26480381792eaf35397e1e82e09f866bfbe16f1d))
 
 
-### Features
 
-* explain exposed subgroups better AB[#5870](https://github.com/rodekruis/IBF-system/issues/5870) ([24a3572](https://github.com/rodekruis/IBF-system/commit/24a35729a2c9a7673b78478f48643989076609ca))
+# [0.12.0](https://github.com/rodekruis/IBF-system/compare/v0.11.0...v0.12.0) (2021-02-09)
 
 
+### Bug Fixes
 
-# [0.7.0](https://github.com/rodekruis/IBF-system/compare/v0.6.0...v0.7.0) (2021-02-04)
+* Resolved pip install issues in pipeline AB[#6022](https://github.com/rodekruis/IBF-system/issues/6022) ([2be49e9](https://github.com/rodekruis/IBF-system/commit/2be49e954b0cdb05afec0a2f1e3e7d8e99ecd1ad))
 
 
 ### Features
 
-* add popover texts ([8ffbef0](https://github.com/rodekruis/IBF-system/commit/8ffbef021427664f631d4c4950349d6ec84bf357))
-* ngx translate ([c167f2a](https://github.com/rodekruis/IBF-system/commit/c167f2a5cecf017145216508f3d109d5d6051dd2))
-* translate aggregate component ([50c174b](https://github.com/rodekruis/IBF-system/commit/50c174bcd28bf26dfeee4cc045bb91562f0439bb))
-* translate aggregates component ([0b7589e](https://github.com/rodekruis/IBF-system/commit/0b7589ea2e5c5dad98e660405b9c2349ea3d339c))
-* translate areas of focus summary component ([024e060](https://github.com/rodekruis/IBF-system/commit/024e060d793c55f021530b4f23c209bdc1bf79ce))
-* translate chat component ([f229e7d](https://github.com/rodekruis/IBF-system/commit/f229e7ddb30bdfbf25de3832f838851d57bfc941))
-* translate chat component and upgrade typescript ([079a708](https://github.com/rodekruis/IBF-system/commit/079a7080493622941fda0db6a95a36415e617a6d))
-* translate dashboard page ([a0441b2](https://github.com/rodekruis/IBF-system/commit/a0441b25b9b4e50f5caf95843e7350bd168c5c3b))
+* added countries to secrets template AB[#6023](https://github.com/rodekruis/IBF-system/issues/6023) ([24bc3fa](https://github.com/rodekruis/IBF-system/commit/24bc3fa740d7f93e5efd41d5a9a60d55a731cbc4))
+* only run glofas for country AB[#6023](https://github.com/rodekruis/IBF-system/issues/6023) ([c6ceda1](https://github.com/rodekruis/IBF-system/commit/c6ceda1c50ca3f5b5e0576b8f53aa503505af219))
+* only run glofas for country AB[#6023](https://github.com/rodekruis/IBF-system/issues/6023) ([457db9c](https://github.com/rodekruis/IBF-system/commit/457db9cbb8ba613e0e9b4c04ef9269be474c1815))
+* Only seed countries in .env ([663ddc0](https://github.com/rodekruis/IBF-system/commit/663ddc0834bed33d6dcba0f71604dce8c977010c))
 
 
 
-# [0.6.0](https://github.com/rodekruis/IBF-system/compare/v0.5.0...v0.6.0) (2021-02-03)
+# [0.11.0](https://github.com/rodekruis/IBF-system/compare/v0.10.1...v0.11.0) (2021-02-09)
 
 
 ### Features
 
-* show count of exposed areas in aggregates AB[#5869](https://github.com/rodekruis/IBF-system/issues/5869) ([a1b7665](https://github.com/rodekruis/IBF-system/commit/a1b766539bd86c2b834463008601b9fca1632c13))
+* configuration env var for interface and favicon for each environment ([9037f18](https://github.com/rodekruis/IBF-system/commit/9037f18fba748a8fe4807f7d891fd8b4c6ec008c))
 
 
 
-# [0.5.0](https://github.com/rodekruis/IBF-system/compare/v0.4.5...v0.5.0) (2021-02-03)
+## [0.10.1](https://github.com/rodekruis/IBF-system/compare/v0.10.0...v0.10.1) (2021-02-08)
 
 
-### Features
+### Bug Fixes
 
-* video guide url in chat component AB[#5923](https://github.com/rodekruis/IBF-system/issues/5923) ([907ca39](https://github.com/rodekruis/IBF-system/commit/907ca3921f0c850c3da45d0f11a18b2107b5dae3))
-* video on login page and reduce font size AB[#5925](https://github.com/rodekruis/IBF-system/issues/5925) AB[#5926](https://github.com/rodekruis/IBF-system/issues/5926) AB[#5927](https://github.com/rodekruis/IBF-system/issues/5927) ([2079553](https://github.com/rodekruis/IBF-system/commit/207955352614da439dba82f83bb38bfb919c4aae))
+* finetune station popup visually AB[#6028](https://github.com/rodekruis/IBF-system/issues/6028) ([b683e87](https://github.com/rodekruis/IBF-system/commit/b683e87528b8b85e518e09ad1118ce754c09ec15))
 
 
 
-## [0.4.5](https://github.com/rodekruis/IBF-system/compare/v0.4.4...v0.4.5) (2021-02-01)
+# [0.10.0](https://github.com/rodekruis/IBF-system/compare/v0.9.0...v0.10.0) (2021-02-08)
 
 
 ### Bug Fixes
 
-* resolve mock scenarios cyclic dependency AB[#5872](https://github.com/rodekruis/IBF-system/issues/5872) ([e093096](https://github.com/rodekruis/IBF-system/commit/e093096f19ad1beebd2406ac43f03daa30d31d37))
+* add district name to covid data AB[#5841](https://github.com/rodekruis/IBF-system/issues/5841) ([888264f](https://github.com/rodekruis/IBF-system/commit/888264fdb7807bb93cbb7412ff221c8c077b1907))
+* clean up old glofas images AB[#5853](https://github.com/rodekruis/IBF-system/issues/5853) ([91733b7](https://github.com/rodekruis/IBF-system/commit/91733b799098fd7fb3bfffa17b4b1e2cb45d582d))
 
 
+### Features
 
-## [0.4.4](https://github.com/rodekruis/IBF-system/compare/v0.4.3...v0.4.4) (2021-02-01)
+* add covid risk popup info + fix order AB[#6025](https://github.com/rodekruis/IBF-system/issues/6025) ([fcd8738](https://github.com/rodekruis/IBF-system/commit/fcd8738ad1bd941a25287aef15ba8a973840e56d))
 
 
-### Bug Fixes
 
-* bug in migration-part deploy-script ([8f27104](https://github.com/rodekruis/IBF-system/commit/8f27104a8e1389d8b37014bd8a585c70c7cc2ae0))
-* load aggregates within metadata-call AB[#5655](https://github.com/rodekruis/IBF-system/issues/5655) ([2510e86](https://github.com/rodekruis/IBF-system/commit/2510e868c09b6ebdd256ffb4d4dc98488f5b7d8b))
+# [0.9.0](https://github.com/rodekruis/IBF-system/compare/v0.8.0...v0.9.0) (2021-02-05)
 
 
+### Bug Fixes
 
-## [0.4.3](https://github.com/rodekruis/IBF-system/compare/v0.4.2...v0.4.3) (2021-02-01)
+* improve station popup AB[#5852](https://github.com/rodekruis/IBF-system/issues/5852) ([0e455e9](https://github.com/rodekruis/IBF-system/commit/0e455e96f0602d0a8dc267c063b87b1e6fdf6788))
 
 
-### Bug Fixes
+### Features
 
-* user country should be selected ([2244676](https://github.com/rodekruis/IBF-system/commit/2244676577de8ce14dbaa4fcfcd8d8ac9af4ae60))
+* add aggregate column popovers separately AB[#5665](https://github.com/rodekruis/IBF-system/issues/5665) ([54bc85a](https://github.com/rodekruis/IBF-system/commit/54bc85aa5605231850c3cea16b5cd9b3ca270e33))
+* add eapAlertClasses per country AB[#5853](https://github.com/rodekruis/IBF-system/issues/5853) ([d1cd04a](https://github.com/rodekruis/IBF-system/commit/d1cd04a762b9f7187bb493e12b0a9c7e993e23cf))
+* start of upgrade station popup ([9eeba45](https://github.com/rodekruis/IBF-system/commit/9eeba45db78604a3b1c3b0d1861224e16d66ce47))
 
 
 
-## [0.4.2](https://github.com/rodekruis/IBF-system/compare/v0.4.1...v0.4.2) (2021-02-01)
+# [0.8.0](https://github.com/rodekruis/IBF-system/compare/v0.7.0...v0.8.0) (2021-02-05)
 
 
 ### Bug Fixes
 
-* waterpoints api should use polygon filter ([ec4541a](https://github.com/rodekruis/IBF-system/commit/ec4541ae75de84da72d551b4444faad76af7b0fa))
+* improve aggregate header order + length AB[#5869](https://github.com/rodekruis/IBF-system/issues/5869) ([bb29039](https://github.com/rodekruis/IBF-system/commit/bb2903989156b8bc2a8053ff580d62e46e06e2d5))
+
+
+### Features
+
+* explain exposed subgroups better AB[#5870](https://github.com/rodekruis/IBF-system/issues/5870) ([24a3572](https://github.com/rodekruis/IBF-system/commit/24a35729a2c9a7673b78478f48643989076609ca))
 
 
 
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
@@ -14,13 +14,15 @@ services:
     ibf-dashboard:
         command: ["npm", "run", "start"]
         environment:
-            - NG_PRODUCTION=false
+            - NG_CONFIGURATION=development
         ports:
             - 4200:4200
         volumes:
             - ./interfaces/IBF-dashboard:/home/node/app
 
     ibf-pipeline:
+        ports:
+            - 5432:5432
         volumes:
             - ./services/IBF-pipeline:/home/ibf
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -36,6 +36,7 @@ services:
             - SECRET=${SECRET}
             - RESET_SECRET=${RESET_SECRET}
             - WATERPOINTDATA_TOKEN=${WATERPOINTDATA_TOKEN}
+            - COUNTRIES=${COUNTRIES}
         networks:
             - web-server-network
         depends_on:
@@ -45,20 +46,24 @@ services:
         build:
             context: ./interfaces/IBF-dashboard
             args:
-                - NG_PRODUCTION=true
+                - NG_CONFIGURATION=${NG_CONFIGURATION}
                 - NG_API_URL=${NG_API_URL}
                 - NG_USE_SERVICE_WORKER=${NG_USE_SERVICE_WORKER}
                 - NG_GEOSERVER_URL=${NG_GEOSERVER_URL}
                 - NG_IBF_SYSTEM_VERSION=${NG_IBF_SYSTEM_VERSION}
                 - NG_IBF_VIDEO_GUIDE_URL=${NG_IBF_VIDEO_GUIDE_URL}
+                - NG_APPLICATION_INSIGHTS_INSTRUMENTATION_KEY=${NG_APPLICATION_INSIGHTS_INSTRUMENTATION_KEY}
+                - NG_APPLICATION_INSIGHTS_URL=${NG_APPLICATION_INSIGHTS_URL}
         image: rodekruis/ibf-dashboard
         environment:
-            - NG_PRODUCTION=true
+            - NG_CONFIGURATION=${NG_CONFIGURATION}
             - NG_API_URL=${NG_API_URL}
             - NG_USE_SERVICE_WORKER=${NG_USE_SERVICE_WORKER}
             - NG_GEOSERVER_URL=${NG_GEOSERVER_URL}
             - NG_IBF_SYSTEM_VERSION=${NG_IBF_SYSTEM_VERSION}
             - NG_IBF_VIDEO_GUIDE_URL=${NG_IBF_VIDEO_GUIDE_URL}
+            - NG_APPLICATION_INSIGHTS_INSTRUMENTATION_KEY=${NG_APPLICATION_INSIGHTS_INSTRUMENTATION_KEY}
+            - NG_APPLICATION_INSIGHTS_URL=${NG_APPLICATION_INSIGHTS_URL}
         volumes:
             - ibf-dashboard-root:/home/node/app/www
         networks:

diff --git a/example.env b/example.env
@@ -16,14 +16,17 @@ NODE_ENV=
 WATERPOINTDATA_TOKEN=
 # This password is only needed for production
 ADMIN_PASSWORD=
+COUNTRIES=UGA,ZMB,ETH,EGY,KEN
 
 # interfaces/IBF-dashboard
-NG_PRODUCTION=
+NG_CONFIGURATION=
 NG_API_URL=
 NG_USE_SERVICE_WORKER=
 NG_GEOSERVER_URL=
 NG_IBF_SYSTEM_VERSION=
 NG_IBF_VIDEO_GUIDE_URL=
+NG_APPLICATION_INSIGHTS_INSTRUMENTATION_KEY=
+NG_APPLICATION_INSIGHTS_URL=
 
 # tools/deploy
 SQL_FILE_PATH=/home/ibf-user/IBF-system/services/API-service/src/sql/IBF-database-scripts.sql
diff --git a/interfaces/IBF-dashboard/Dockerfile b/interfaces/IBF-dashboard/Dockerfile
@@ -16,8 +16,8 @@ COPY --chown=node:node . .
 
 EXPOSE 4200
 
-ARG NG_PRODUCTION
-ENV NG_PRODUCTION=$NG_PRODUCTION
+ARG NG_CONFIGURATION
+ENV NG_CONFIGURATION=$NG_CONFIGURATION
 
 ARG NG_API_URL
 ENV NG_API_URL=$NG_API_URL
@@ -34,4 +34,10 @@ ENV NG_IBF_SYSTEM_VERSION=$NG_IBF_SYSTEM_VERSION
 ARG NG_IBF_VIDEO_GUIDE_URL
 ENV NG_IBF_VIDEO_GUIDE_URL=$NG_IBF_VIDEO_GUIDE_URL
 
-RUN npm run build -- --prod
+ARG NG_APPLICATION_INSIGHTS_INSTRUMENTATION_KEY
+ENV NG_APPLICATION_INSIGHTS_INSTRUMENTATION_KEY=$NG_APPLICATION_INSIGHTS_INSTRUMENTATION_KEY
+
+ARG NG_APPLICATION_INSIGHTS_URL
+ENV NG_APPLICATION_INSIGHTS_URL=$NG_APPLICATION_INSIGHTS_URL
+
+RUN npm run build -- --prod --configuration $NG_CONFIGURATION
diff --git a/interfaces/IBF-dashboard/angular.json b/interfaces/IBF-dashboard/angular.json
@@ -23,7 +23,8 @@
               {
                 "glob": "**/*",
                 "input": "src/assets",
-                "output": "assets"
+                "output": "assets",
+                "ignore": ["icons/stage/*", "icons/test/*"]
               },
               {
                 "glob": "**/*.svg",
@@ -66,7 +67,6 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
               "aot": true,
               "extractLicenses": true,
@@ -82,6 +82,58 @@
               "serviceWorker": true,
               "ngswConfigPath": "ngsw-config.json"
             },
+            "stage": {
+              "assets": [
+                {
+                  "glob": "**/*",
+                  "input": "src/assets",
+                  "output": "assets",
+                  "ignore": ["icons/stage/*", "icons/test/*"]
+                },
+                {
+                  "glob": "**/*.svg",
+                  "input": "node_modules/ionicons/dist/ionicons/svg",
+                  "output": "./svg"
+                },
+                {
+                  "glob": "**/*",
+                  "input": "./node_modules/leaflet/dist/images",
+                  "output": "assets/leaflet"
+                },
+                "src/manifest.webmanifest",
+                {
+                  "glob": "favicon.png",
+                  "input": "src/assets/icons/stage",
+                  "output": "assets/icons"
+                }
+              ]
+            },
+            "test": {
+              "assets": [
+                {
+                  "glob": "**/*",
+                  "input": "src/assets",
+                  "output": "assets",
+                  "ignore": ["icons/stage/*", "icons/test/*"]
+                },
+                {
+                  "glob": "**/*.svg",
+                  "input": "node_modules/ionicons/dist/ionicons/svg",
+                  "output": "./svg"
+                },
+                {
+                  "glob": "**/*",
+                  "input": "./node_modules/leaflet/dist/images",
+                  "output": "assets/leaflet"
+                },
+                "src/manifest.webmanifest",
+                {
+                  "glob": "favicon.png",
+                  "input": "src/assets/icons/test",
+                  "output": "assets/icons"
+                }
+              ]
+            },
             "ci": {
               "progress": false
             }
@@ -117,15 +169,11 @@
             "styles": [],
             "scripts": [],
             "assets": [
-              {
-                "glob": "favicon.ico",
-                "input": "src/",
-                "output": "/"
-              },
               {
                 "glob": "**/*",
                 "input": "src/assets",
-                "output": "/assets"
+                "output": "/assets",
+                "ignore": ["icons/stage/*", "icons/test/*"]
               },
               "src/manifest.webmanifest"
             ]