diff --git a/.gitignore b/.gitignore index 70387d7c..bf595b18 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ Thumbs.db /yaml-generation/vendor/ # Generated YAML /src/assets/YAML/generated/generated.yaml +DevSecOps-MaturityModel-data/ diff --git a/angular.json b/angular.json index 68396c91..ba5e92ef 100644 --- a/angular.json +++ b/angular.json @@ -116,6 +116,7 @@ }, "defaultProject": "DSOMM", "cli": { - "defaultCollection": "@angular-eslint/schematics" + "defaultCollection": "@angular-eslint/schematics", + "analytics": false } } diff --git a/package-lock.json b/package-lock.json index d2244a0e..0814f938 100644 --- a/package-lock.json +++ b/package-lock.json @@ -62,7 +62,7 @@ "prettier": "^2.7.1", "prettier-eslint": "^15.0.1", "qs": "^6.11.0", - "typescript": "^4.6.4" + "typescript": "4.8" } }, "node_modules/@ampproject/remapping": { @@ -217,6 +217,23 @@ } } }, + "node_modules/@angular-devkit/build-angular/node_modules/@ngtools/webpack": { + "version": "13.3.10", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-13.3.10.tgz", + "integrity": "sha512-QQ8ELLqW5PtvrEAMt99D0s982NW303k8UpZrQoQ9ODgnSVDMdbbzFPNTXq/20dg+nbp8nlOakUrkjB47TBwTNA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.20.0 || ^14.15.0 || >=16.10.0", + "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", + "yarn": ">= 1.13.0" + }, + "peerDependencies": { + "@angular/compiler-cli": "^13.0.0", + "typescript": ">=4.4.3 <4.7", + "webpack": "^5.30.0" + } + }, "node_modules/@angular-devkit/build-angular/node_modules/rxjs": { "version": "6.6.7", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", @@ -2948,22 +2965,6 @@ "rxjs": "^6.4.0 || ^7.0.0" } }, - "node_modules/@ngtools/webpack": { - "version": "13.3.10", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-13.3.10.tgz", - "integrity": "sha512-QQ8ELLqW5PtvrEAMt99D0s982NW303k8UpZrQoQ9ODgnSVDMdbbzFPNTXq/20dg+nbp8nlOakUrkjB47TBwTNA==", - "dev": true, - "engines": { - "node": "^12.20.0 || ^14.15.0 || >=16.10.0", - "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", - "yarn": ">= 1.13.0" - }, - "peerDependencies": { - "@angular/compiler-cli": "^13.0.0", - "typescript": ">=4.4.3 <4.7", - "webpack": "^5.30.0" - } - }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -15365,9 +15366,10 @@ "dev": true }, "node_modules/typescript": { - "version": "4.6.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz", - "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==", + "version": "4.8.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz", + "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==", + "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -16350,6 +16352,13 @@ "webpack-subresource-integrity": "5.1.0" }, "dependencies": { + "@ngtools/webpack": { + "version": "13.3.10", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-13.3.10.tgz", + "integrity": "sha512-QQ8ELLqW5PtvrEAMt99D0s982NW303k8UpZrQoQ9ODgnSVDMdbbzFPNTXq/20dg+nbp8nlOakUrkjB47TBwTNA==", + "dev": true, + "requires": {} + }, "rxjs": { "version": "6.6.7", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", @@ -18300,13 +18309,6 @@ "tslib": "^2.3.0" } }, - "@ngtools/webpack": { - "version": "13.3.10", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-13.3.10.tgz", - "integrity": "sha512-QQ8ELLqW5PtvrEAMt99D0s982NW303k8UpZrQoQ9ODgnSVDMdbbzFPNTXq/20dg+nbp8nlOakUrkjB47TBwTNA==", - "dev": true, - "requires": {} - }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -27467,9 +27469,9 @@ "dev": true }, "typescript": { - "version": "4.6.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz", - "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==" + "version": "4.8.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz", + "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==" }, "ua-parser-js": { "version": "0.7.33", diff --git a/package.json b/package.json index 233c8b4b..1fc31e54 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "prettier": "^2.7.1", "prettier-eslint": "^15.0.1", "qs": "^6.11.0", - "typescript": "^4.6.4" + "typescript": "4.8" }, "browser": { "fs": false, diff --git a/src/app/.app.component.html.swp b/src/app/.app.component.html.swp new file mode 100644 index 00000000..0c27c3f4 Binary files /dev/null and b/src/app/.app.component.html.swp differ diff --git a/src/app/app.component.html b/src/app/app.component.html index 1cc32689..15fc8edb 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,13 +1,13 @@ - + - + + + + + @@ -15,14 +15,17 @@ + Fork me on GitHub + Fork me on GitHub + + diff --git a/src/app/component/matrix/matrix.component.ts b/src/app/component/matrix/matrix.component.ts index c91e59ee..b16511b4 100644 --- a/src/app/component/matrix/matrix.component.ts +++ b/src/app/component/matrix/matrix.component.ts @@ -6,7 +6,7 @@ import { map, startWith } from 'rxjs/operators'; import { MatTableDataSource } from '@angular/material/table'; import { ymlService } from '../../service/yaml-parser/yaml-parser.service'; import { Router, NavigationExtras } from '@angular/router'; -import { stringify } from 'qs'; +import { stringify } from 'querystring'; import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; @@ -82,7 +82,8 @@ export class MatrixComponent implements OnInit { this.yaml.getJson().subscribe(data => { this.YamlObject = data; - this.allDimensionNames = Object.keys(this.YamlObject); + this.allDimensionNames = this.YamlObject ? Object.keys(this.YamlObject) : []; + for (let i = 0; i < this.allDimensionNames.length; i++) { var subdimensionsInCurrentDimension = Object.keys( this.YamlObject[this.allDimensionNames[i]] @@ -311,12 +312,13 @@ export class MatrixComponent implements OnInit { // activity description routing + providing parameters navigate( - uuid: String, + uuid: string, dim: string, subdim: string, - lvl: Number, + lvl: number, activityName: string ) { + let navigationExtras: NavigationExtras = { queryParams: { uuid: uuid, @@ -326,6 +328,12 @@ export class MatrixComponent implements OnInit { activityName: activityName, }, }; + return `${this.Routing}?${stringify(navigationExtras.queryParams)}`; + + this.router.navigate([this.Routing], navigationExtras); + + + } }