summaryrefslogtreecommitdiffstats
path: root/cds-ui
diff options
context:
space:
mode:
Diffstat (limited to 'cds-ui')
-rw-r--r--cds-ui/application/pom.xml4
-rw-r--r--cds-ui/client/pom.xml4
-rw-r--r--cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.ts17
-rw-r--r--cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.service.ts4
-rw-r--r--cds-ui/client/src/app/feature-modules/blueprint/select-template/template-options/template-options.component.html6
-rw-r--r--cds-ui/client/src/app/feature-modules/blueprint/select-template/template-options/template-options.component.ts10
-rw-r--r--cds-ui/pom.xml4
-rw-r--r--cds-ui/server/pom.xml4
8 files changed, 29 insertions, 24 deletions
diff --git a/cds-ui/application/pom.xml b/cds-ui/application/pom.xml
index d196822da..3ca156704 100644
--- a/cds-ui/application/pom.xml
+++ b/cds-ui/application/pom.xml
@@ -24,12 +24,12 @@ limitations under the License.
<parent>
<groupId>org.onap.ccsdk.cds</groupId>
<artifactId>ui</artifactId>
- <version>0.5.1-SNAPSHOT</version>
+ <version>0.5.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>application</artifactId>
- <version>0.5.1-SNAPSHOT</version>
+ <version>0.5.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>cds-ui-application</name>
diff --git a/cds-ui/client/pom.xml b/cds-ui/client/pom.xml
index ee4170e46..52ade489e 100644
--- a/cds-ui/client/pom.xml
+++ b/cds-ui/client/pom.xml
@@ -24,12 +24,12 @@ limitations under the License.
<parent>
<groupId>org.onap.ccsdk.cds</groupId>
<artifactId>ui</artifactId>
- <version>0.5.1-SNAPSHOT</version>
+ <version>0.5.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>ui-client</artifactId>
- <version>0.5.1-SNAPSHOT</version>
+ <version>0.5.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>cds-ui-client</name>
diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.ts b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.ts
index 1c3630649..df3aafb73 100644
--- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.ts
+++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.ts
@@ -23,7 +23,9 @@ import { Component, OnInit, ViewChild, EventEmitter, Output } from '@angular/cor
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { SearchTemplateService } from '../search-template.service';
import { MatAutocompleteTrigger } from '@angular/material';
+import { NotificationHandlerService } from 'src/app/common/core/services/notification-handler.service';
import { SearchPipe } from 'src/app/common/shared/pipes/search.pipe';
+
@Component({
selector: 'app-search-from-database',
templateUrl: './search-from-database.component.html',
@@ -38,7 +40,7 @@ export class SearchFromDatabaseComponent implements OnInit {
searchText: string = '';
constructor(private _formBuilder: FormBuilder,
- private searchService: SearchTemplateService) { }
+ private searchService: SearchTemplateService, private alertService: NotificationHandlerService, ) { }
ngOnInit() {
this.myControl = this._formBuilder.group({
@@ -50,18 +52,21 @@ export class SearchFromDatabaseComponent implements OnInit {
}
fetchResourceByName() {
+ this.options = [];
this.searchService.searchByTags(this.searchText)
.subscribe(data => {
- // console.log(data);
data.forEach(element => {
this.options.push(element)
});
- // this.resourceSelect.openPanel();
}, error => {
- window.alert('error' + error);
+ this.alertService.error('Blueprint not matching the search tag' + error);
})
- console.log(this.options)
- // this.options=['test','vns','capability','hello','hi','hoi','dfagfagshdgfashdf','adsfhksd'];
}
+ editCBA(artifactname: string,option : string) {
+
+ }
+
+
+
}
diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.service.ts b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.service.ts
index 31a839cc3..d9e518b60 100644
--- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.service.ts
+++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.service.ts
@@ -35,4 +35,8 @@ export class SearchTemplateService {
searchByTags(searchText: String): Observable<any>{
return this.api.get(BlueprintURLs.searchByTag+'/'+searchText);
}
+
+ getBlueprintZip(artifactDetails: string): Observable<any> {
+ return this.api.get(BlueprintURLs.download+artifactDetails, { responseType: 'blob' });
+ }
}
diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/template-options/template-options.component.html b/cds-ui/client/src/app/feature-modules/blueprint/select-template/template-options/template-options.component.html
index 1e8f469b6..101bf06d9 100644
--- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/template-options/template-options.component.html
+++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/template-options/template-options.component.html
@@ -19,7 +19,7 @@ limitations under the License.
============LICENSE_END============================================
-->
<mat-radio-group>
- <mat-radio-button value="1" (click)="selected(1)">Upload From local</mat-radio-button><br> <br>
- <mat-radio-button value="2" (click)="selected(2)">Existing Template File</mat-radio-button><br> <br>
- <mat-radio-button value="3" (click)="selected(3)">Create New</mat-radio-button>
+ <mat-radio-button value="1" (click)="selected(1)">Upload from local</mat-radio-button><br> <br>
+ <mat-radio-button value="2" (click)="selected(2)">Search from Existing Template </mat-radio-button><br> <br>
+ <mat-radio-button value="3" (click)="selected(3)">Create new</mat-radio-button>
</mat-radio-group> \ No newline at end of file
diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/template-options/template-options.component.ts b/cds-ui/client/src/app/feature-modules/blueprint/select-template/template-options/template-options.component.ts
index 3b598b24e..58fd57b8f 100644
--- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/template-options/template-options.component.ts
+++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/template-options/template-options.component.ts
@@ -19,8 +19,8 @@ limitations under the License.
============LICENSE_END============================================
*/
-import { Component, OnInit, Output, EventEmitter} from '@angular/core';
-import { HttpClient } from '@angular/common/http';
+import { Component, OnInit, Output, EventEmitter } from '@angular/core';
+
@Component({
selector: 'app-template-options',
templateUrl: './template-options.component.html',
@@ -35,11 +35,7 @@ export class TemplateOptionsComponent implements OnInit {
ngOnInit() {
}
- selected(value){
- console.log(value);
+ selected(value) {
this.option.emit(value);
}
- // loadTemplateData() {
- // // to do
- // }
}
diff --git a/cds-ui/pom.xml b/cds-ui/pom.xml
index 76967c01d..e93f0fade 100644
--- a/cds-ui/pom.xml
+++ b/cds-ui/pom.xml
@@ -24,13 +24,13 @@ limitations under the License.
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>1.3.2</version>
+ <version>1.3.3-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.cds</groupId>
<artifactId>ui</artifactId>
- <version>0.5.1-SNAPSHOT</version>
+ <version>0.5.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>cds-ui-parent</name>
diff --git a/cds-ui/server/pom.xml b/cds-ui/server/pom.xml
index c7a76f605..c4f1ca0a7 100644
--- a/cds-ui/server/pom.xml
+++ b/cds-ui/server/pom.xml
@@ -24,12 +24,12 @@ limitations under the License.
<parent>
<groupId>org.onap.ccsdk.cds</groupId>
<artifactId>ui</artifactId>
- <version>0.5.1-SNAPSHOT</version>
+ <version>0.5.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>ui-server</artifactId>
- <version>0.5.1-SNAPSHOT</version>
+ <version>0.5.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>cds-ui-server</name>