Merge remote-tracking branch 'origin/main' into fix-quotas-code-issues

.ci/runAdminUiChecks.sh

@@ -7,5 +7,5 @@ npm ci
 npx eslint --ext ts ./src
 npx prettier --check .
 npx license-check --ignorePackages [email protected]
-npx better-npm-audit audit --exclude 1094889
+npx better-npm-audit audit --exclude 1094889,1095466
 cd $INITIAL_DIR

.github/dependabot.yml

@@ -51,8 +51,6 @@ updates:
       update-npm-dependencies:
         patterns:
           - "*"
-        exclude-patterns:
-          - "typescript" # There is currently an inconsistency between the latest typescript version and angularjs
     reviewers:
       - "tnotheis"
       - "daniel-almeida-konkconsulting"

AdminUi/src/AdminUi/ClientApp/package.json

@@ -13,48 +13,48 @@
     },
     "private": true,
     "dependencies": {
-        "@angular/animations": "^17.0.9",
-        "@angular/cdk": "^17.0.5",
-        "@angular/common": "^17.0.9",
-        "@angular/compiler": "^17.0.9",
-        "@angular/core": "^17.0.9",
-        "@angular/forms": "^17.0.9",
-        "@angular/material": "^17.0.5",
-        "@angular/platform-browser": "^17.0.9",
-        "@angular/platform-browser-dynamic": "^17.0.9",
-        "@angular/platform-server": "^17.0.9",
-        "@angular/router": "^17.0.9",
-        "@ngx-env/builder": "^17.0.8",
-        "bootstrap": "^5.2.3",
-        "jquery": "^3.6.3",
+        "@angular/animations": "^17.1.0",
+        "@angular/cdk": "^17.1.0",
+        "@angular/common": "^17.1.0",
+        "@angular/compiler": "^17.1.0",
+        "@angular/core": "^17.1.0",
+        "@angular/forms": "^17.1.0",
+        "@angular/material": "^17.1.0",
+        "@angular/platform-browser": "^17.1.0",
+        "@angular/platform-browser-dynamic": "^17.1.0",
+        "@angular/platform-server": "^17.1.0",
+        "@angular/router": "^17.1.0",
+        "@ngx-env/builder": "^17.1.1",
+        "bootstrap": "^5.3.2",
+        "jquery": "^3.7.1",
         "ngx-cookie-service": "^17.0.1",
         "ngx-logger": "^5.0.12",
         "odata-filter-builder": "^1.0.0",
         "oidc-client": "^1.11.5",
         "popper.js": "^1.16.0",
         "run-script-os": "^1.1.6",
-        "rxjs": "~7.8.0",
-        "tslib": "^2.5.0",
+        "rxjs": "~7.8.1",
+        "tslib": "^2.6.2",
         "zone.js": "~0.14.3"
     },
     "devDependencies": {
-        "@angular-devkit/build-angular": "^17.0.10",
-        "@angular/cli": "^17.0.10",
-        "@angular/compiler-cli": "^17.0.9",
+        "@angular-devkit/build-angular": "^17.1.0",
+        "@angular/cli": "^17.1.0",
+        "@angular/compiler-cli": "^17.1.0",
         "@js-soft/eslint-config-ts": "^1.6.6",
         "@js-soft/license-check": "^1.0.9",
         "@types/jasmine": "~5.1.4",
         "@types/jasminewd2": "~2.0.13",
-        "@types/node": "^20.11.0",
+        "@types/node": "^20.11.5",
         "eslint": "^8.56.0",
         "jasmine-core": "~5.1.1",
-        "karma": "~6.4.1",
+        "karma": "~6.4.2",
         "karma-chrome-launcher": "~3.2.0",
-        "karma-coverage": "~2.2.0",
+        "karma-coverage": "~2.2.1",
         "karma-jasmine": "~5.1.0",
-        "karma-jasmine-html-reporter": "^2.0.0",
-        "prettier": "^3.2.2",
-        "typescript": "~5.2.2"
+        "karma-jasmine-html-reporter": "^2.1.0",
+        "prettier": "^3.2.4",
+        "typescript": "~5.3.3"
     },
     "overrides": {
         "autoprefixer": "10.4.5"

helm/charts/admincli/Chart.yaml

@@ -6,4 +6,4 @@ type: application
 
 version: "1.0.0"
 
-appVersion: "v2.0.1"
+appVersion: "v2.2.1"

helm/charts/adminui/Chart.yaml

@@ -6,4 +6,4 @@ type: application
 
 version: "1.0.0"
 
-appVersion: "v2.4.1"
+appVersion: "v2.4.3"

helm/charts/consumerapi/Chart.yaml

@@ -6,4 +6,4 @@ type: application
 
 version: "1.0.0"
 
-appVersion: "v4.2.5"
+appVersion: "v4.3.0"