From ce373bab630b6147e4b96ed2e71ebb1f6f8d9cac Mon Sep 17 00:00:00 2001
From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com>
Date: Tue, 19 Jan 2021 14:25:56 +0100
Subject: [PATCH] TSK-1516: verify dependencies on CI to prevent issues
 regarding caching

---
 .github/workflows/continuous-integration.yml |  8 +++--
 web/package-lock.json                        | 33 +++++++++++++++-----
 web/package.json                             |  4 +--
 3 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index ced07ca0f..952fc0674 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -90,7 +90,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: web/node_modules
-          key: ${{ runner.OS }}-${{ env.CACHE_WEB_NAME }}-${{ hashFiles('**/package.json', '**/package-lock.json') }}
+          key: ${{ runner.OS }}-${{ env.CACHE_WEB_NAME }}-${{ hashFiles('**/package-lock.json') }}
           restore-keys: ${{ runner.OS }}-${{ env.CACHE_WEB_NAME }}
       - name: Cache maven dependencies (for web)
         uses: actions/cache@v2
@@ -102,6 +102,10 @@ jobs:
         if: steps.web-cache.outputs.cache-hit != 'true'
         working-directory: web
         run: npm ci
+      # currently this is not working because the angular-tree-component needs core-js ^2.4.1 and we have 3.X.X
+      #- name: Verify Dependencies
+      #working-directory: web
+      #run: npm ls
       - name: Compile & build
         working-directory: web
         run: |
@@ -456,4 +460,4 @@ jobs:
           SONAR_ORGANIZATION: ${{ secrets.SONAR_ORGANIZATION }}
       - name: Cancel workflow
         if: failure()
-        uses: andymckay/cancel-action@0.2
\ No newline at end of file
+        uses: andymckay/cancel-action@0.2
diff --git a/web/package-lock.json b/web/package-lock.json
index e093ea4f6..cfade016b 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -4008,6 +4008,16 @@
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
       "dev": true
     },
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
     "block-stream": {
       "version": "0.0.9",
       "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
@@ -5174,9 +5184,9 @@
       }
     },
     "core-js": {
-      "version": "3.8.2",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.2.tgz",
-      "integrity": "sha512-FfApuSRgrR6G5s58casCBd9M2k+4ikuu4wbW6pJyYU7bd9zvFc9qf7vr5xmrZOhT9nn+8uwlH1oRR9jTnFoA3A=="
+      "version": "3.8.3",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.3.tgz",
+      "integrity": "sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q=="
     },
     "core-js-compat": {
       "version": "3.8.3",
@@ -7424,6 +7434,13 @@
       "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-1.3.3.tgz",
       "integrity": "sha1-zdTETTqiZOrC9o7BZbx5HDSvEjI="
     },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
     "fill-range": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -18883,6 +18900,7 @@
           "dev": true,
           "optional": true,
           "requires": {
+            "bindings": "^1.5.0",
             "nan": "^2.12.1"
           }
         },
@@ -19448,6 +19466,7 @@
           "dev": true,
           "optional": true,
           "requires": {
+            "bindings": "^1.5.0",
             "nan": "^2.12.1"
           }
         },
@@ -19961,9 +19980,9 @@
       "dev": true
     },
     "zone.js": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.2.tgz",
-      "integrity": "sha512-UAYfiuvxLN4oyuqhJwd21Uxb4CNawrq6fPS/05Su5L4G+1TN+HVDJMUHNMobVQDFJRir2cLAODXwluaOKB7HFg=="
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz",
+      "integrity": "sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg=="
     }
   }
-}
+}
\ No newline at end of file
diff --git a/web/package.json b/web/package.json
index a7010a00a..cefda9bb2 100644
--- a/web/package.json
+++ b/web/package.json
@@ -33,7 +33,7 @@
     "angular-svg-icon": "7.2.1",
     "angular-tree-component": "8.5.6",
     "bootstrap": "4.4.1",
-    "core-js": "3.8.2",
+    "core-js": "3.8.3",
     "file-saver": "1.3.3",
     "jquery": "3.5.1",
     "ng2-charts": "1.6.0",
@@ -42,7 +42,7 @@
     "popper.js": "1.16.1",
     "rxjs": "6.5.4",
     "tslib": "1.14.1",
-    "zone.js": "0.10.2"
+    "zone.js": "0.10.3"
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "9.2.0",