summaryrefslogtreecommitdiffstats
path: root/cds-ui
diff options
context:
space:
mode:
authorShaabanEltanany <shaaban.eltanany.ext@orange.com>2020-09-29 14:38:56 +0200
committerKAPIL SINGAL <ks220y@att.com>2020-09-29 13:24:18 +0000
commit4726dfef46e024941f25be2c9d4ee66a5b1798ba (patch)
treecc0c9eddb722e2bdd5a0d02b7ca2548e6fe12bba /cds-ui
parent08881d4054251a475cb70113b0d637ec2af7aeae (diff)
adding sonarqube to designer client
Issue-ID: CCSDK-2858 Signed-off-by: ShaabanEltanany <shaaban.eltanany.ext@orange.com> Change-Id: I10a81591ed15d86a0f81bc1f13a4c2ac75dc2310
Diffstat (limited to 'cds-ui')
-rw-r--r--cds-ui/designer-client/package.json4
-rw-r--r--cds-ui/designer-client/sonar-project.properties12
-rw-r--r--cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts6
-rw-r--r--cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation-extraction.service.ts2
4 files changed, 20 insertions, 4 deletions
diff --git a/cds-ui/designer-client/package.json b/cds-ui/designer-client/package.json
index df6b02b4a..096e96eb9 100644
--- a/cds-ui/designer-client/package.json
+++ b/cds-ui/designer-client/package.json
@@ -7,7 +7,8 @@
"build": "npm run lint && ng build --prod --aot ",
"test": "ng test",
"lint": "ng lint",
- "e2e": "ng e2e"
+ "e2e": "ng e2e",
+ "sonar": "sonar-scanner"
},
"private": true,
"dependencies": {
@@ -76,6 +77,7 @@
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.0",
"protractor": "~5.4.0",
+ "sonar-scanner": "^3.1.0",
"ts-node": "~7.0.0",
"tslint": "~5.15.0",
"typescript": "~3.5.3"
diff --git a/cds-ui/designer-client/sonar-project.properties b/cds-ui/designer-client/sonar-project.properties
new file mode 100644
index 000000000..6b246e759
--- /dev/null
+++ b/cds-ui/designer-client/sonar-project.properties
@@ -0,0 +1,12 @@
+sonar.host.url=http://localhost:9000
+sonar.login=admin
+sonar.password=admin
+sonar.projectKey=designer-client-app
+sonar.projectName=designer-client-app
+sonar.projectVersion=1.0
+sonar.sourceEncoding=UTF-8
+sonar.sources=src
+sonar.exclusions=**/node_modules/**
+sonar.tests=src
+sonar.test.inclusions=**/*.spec.ts
+sonar.typescript.lcov.reportPaths=coverage/lcov.info
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts
index e86a2c500..079e4edbc 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts
@@ -2,7 +2,7 @@ import {Component, ElementRef, OnInit, ViewChild} from '@angular/core';
import {ActivatedRoute, Router} from '@angular/router';
import {BluePrintDetailModel} from '../model/BluePrint.detail.model';
import {PackageCreationStore} from '../package-creation/package-creation.store';
-import {FilesContent, FolderNodeElement, MetaDataTabModel} from '../package-creation/mapping-models/metadata/MetaDataTab.model';
+import {FilesContent, FolderNodeElement} from '../package-creation/mapping-models/metadata/MetaDataTab.model';
import {MetadataTabComponent} from '../package-creation/metadata-tab/metadata-tab.component';
import * as JSZip from 'jszip';
import {ConfigurationDashboardService} from './configuration-dashboard.service';
@@ -65,8 +65,6 @@ export class ConfigurationDashboardComponent extends ComponentCanDeactivate impl
cbaPackage => {
this.cbaPackage = cbaPackage;
});
-
-
}
ngOnInit() {
@@ -262,7 +260,9 @@ export class ConfigurationDashboardComponent extends ComponentCanDeactivate impl
}
checkSkipTypesOfAction() {
+ console.log(this.cbaPackage);
if (this.cbaPackage.templateTopology.node_templates && this.cbaPackage.templateTopology.workflows) {
+ console.log('eeeeee');
this.goToDesignerMode(this.id);
} else {
this.dataTarget = '#exampleModalLong';
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation-extraction.service.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation-extraction.service.ts
index 2cc58e6a4..aa7964453 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation-extraction.service.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation-extraction.service.ts
@@ -103,6 +103,8 @@ export class PackageCreationExtractionService {
const nodeTemplates = 'node_templates';
content[nodeTemplates] = definition.topology_template ? definition.topology_template.node_templates : {};
this.designerStore.saveSourceContent(JSON.stringify(content));
+ this.packageCreationStore.addTopologyTemplate(definition.topology_template);
+
}
this.packageCreationStore.addDefinition(filename, fileData);