diff options
Diffstat (limited to 'cds-ui')
12 files changed, 49 insertions, 164 deletions
diff --git a/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.component.ts b/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.component.ts index 7b2eaeb17..cfd83f7c5 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.component.ts +++ b/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.component.ts @@ -331,18 +331,7 @@ export class EditorComponent implements OnInit { download() { console.log(this.artifactName); // status = this.editorService.downloadCBA("/download-blueprint/" + this.artifactName + "/" + this.artifactVersion); - status = this.editorService.downloadCBA("/"+this.artifactName + "/" + this.artifactVersion); - window.alert(status); - // .subscribe(response => { - // console.log(response); - // var blob = new Blob([response], { type: 'application/zip' }); - // const fileName = 'CBA'; - // saveAs(blob, fileName); - // }, - // error => { - // console.log(error); - // } - // ); + this.editorService.downloadCBA("/"+this.artifactName + "/" + this.artifactVersion); } setEditorMode() { diff --git a/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.service.ts b/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.service.ts index 025fc95d4..f1d1d148c 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.service.ts +++ b/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.service.ts @@ -1,7 +1,7 @@ /* ============LICENSE_START========================================== =================================================================== -Copyright (C) 2018 IBM Intellectual Property. All rights reserved. +Copyright (C) 2018-19 IBM Intellectual Property. All rights reserved. =================================================================== Unless otherwise specified, all software contained herein is licensed @@ -26,10 +26,12 @@ import { Observable, observable } from 'rxjs'; import { ApiService } from '../../../../common/core/services/api.service'; import { saveAs } from 'file-saver'; import { BlueprintURLs } from '../../../../common/constants/app-constants'; +import { NotificationHandlerService } from 'src/app/common/core/services/notification-handler.service'; @Injectable() export class EditorService { - constructor(private _http: HttpClient, private api: ApiService) { + constructor(private _http: HttpClient, private api: ApiService, + private alertService: NotificationHandlerService,) { } enrich(body: FormData): Observable<any> { @@ -40,7 +42,7 @@ export class EditorService { .subscribe(response => { let blob = new Blob([response], { 'type': "application/octet-stream" }); saveAs(blob, "CBA.zip"); - window.alert('Blueprint download successfull' ); + this.alertService.success('Blueprint downloaded successfully' ); }); return "Download Success"; diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/metadata/metadata.component.ts b/cds-ui/client/src/app/feature-modules/blueprint/select-template/metadata/metadata.component.ts index 174bdf183..f49517017 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/metadata/metadata.component.ts +++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/metadata/metadata.component.ts @@ -48,7 +48,7 @@ export class MetadataComponent implements OnInit { blueprintName: string; uploadedFileName: string; entryDefinition: string; - + constructor(private formBuilder: FormBuilder, private store: Store<IAppState>, private loader: LoaderService, private dataService: SelectTemplateService) { this.bpState = this.store.select('blueprint'); @@ -60,12 +60,17 @@ export class MetadataComponent implements OnInit { template_version: ['', Validators.required], template_tags: ['', Validators.required] }); + } ngOnInit() { - this.dataService.getCbaOption().subscribe( - res => {console.log("data from service " + res);} + this.dataService.currentMessage.subscribe( + res => { + let options = res; + console.log(options + " data from service ngoninit" + res); + } ); + this.bpState.subscribe( blueprintdata => { var blueprintState: IBlueprintState = { blueprint: blueprintdata.blueprint, isLoadSuccess: blueprintdata.isLoadSuccess, isSaveSuccess: blueprintdata.isSaveSuccess, isUpdateSuccess: blueprintdata.isUpdateSuccess }; @@ -76,8 +81,6 @@ export class MetadataComponent implements OnInit { this.uploadedFileName = blueprintdata.uploadedFileName; this.entryDefinition = blueprintdata.entryDefinition; - - var blueprintState: IBlueprintState = { blueprint: blueprintdata.blueprint, isLoadSuccess: blueprintdata.isLoadSuccess, isSaveSuccess: blueprintdata.isSaveSuccess, isUpdateSuccess: blueprintdata.isUpdateSuccess }; this.metadata = blueprintState.blueprint.metadata; this.blueprint = blueprintState.blueprint; @@ -99,11 +102,7 @@ export class MetadataComponent implements OnInit { }); }) } -ngAfterInit(){ - this.dataService.getCbaOption().subscribe( - res => {console.log("data from service after init" + res);} - ); -} + UploadMetadata() { this.loader.showLoader(); this.metadata = Object.assign({}, this.CBAMetadataForm.value); diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.html b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.html index 648271028..9cab6c44d 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.html +++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.html @@ -41,9 +41,9 @@ limitations under the License. <br>{{option.blueprintModel.updatedBy}} </mat-card-content> <mat-card-actions class="flexBox"> - <button matStepperNext mat-menu-item (click)="editCBA(option.blueprintModel.artifactName,option.blueprintModel.artifactVersion,edit)">Edit</button> - <button matStepperNext mat-menu-item (click)="editCBA(option.blueprintModel.artifactName,option.blueprintModel.artifactVersion,clone)">Clone</button> - <button matStepperNext mat-menu-item (click)="editCBA(option.blueprintModel.artifactName,option.blueprintModel.artifactVersion,info)">Info</button> + <button matStepperNext mat-menu-item (click)="editCBA(option.blueprintModel.artifactName,option.blueprintModel.artifactVersion,1)">Edit</button> + <button matStepperNext mat-menu-item (click)="editCBA(option.blueprintModel.artifactName,option.blueprintModel.artifactVersion,2)">Clone</button> + <button matStepperNext mat-menu-item (click)="editCBA(option.blueprintModel.artifactName,option.blueprintModel.artifactVersion,3)">Info</button> </mat-card-actions> </mat-card> </div> 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 588854f6b..47771a7aa 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 @@ -33,7 +33,7 @@ import { IBlueprint } from '../../../../../common/core/store/models/blueprint.mo import { IBlueprintState } from '../../../../../common/core/store/models/blueprintState.model'; import { IAppState } from '../../../../../common/core/store/state/app.state'; import { SetBlueprintState } from '../../../../../common/core/store/actions/blueprint.action'; - +import { SelectTemplateService } from '../../select-template.service'; @Component({ selector: 'app-search-from-database', templateUrl: './search-from-database.component.html', @@ -61,8 +61,8 @@ export class SearchFromDatabaseComponent implements OnInit { searchText: string = ''; constructor(private _formBuilder: FormBuilder, - private searchService: SearchTemplateService, private alertService: NotificationHandlerService, - private loader: LoaderService, private store: Store<IAppState>) { } + private searchService: SearchTemplateService, private alertService: NotificationHandlerService, + private loader: LoaderService, private store: Store<IAppState>, private cbEditOption: SelectTemplateService) { } ngOnInit() { this.myControl = this._formBuilder.group({ @@ -85,7 +85,8 @@ export class SearchFromDatabaseComponent implements OnInit { }) } - editCBA(artifactName: string,artifactVersion:string, option: string) { + editCBA(artifactName: string, artifactVersion: string, option: string) { + this.cbEditOption.setCbaOption(option); this.zipFile.generateAsync({ type: "blob" }) .then(blob => { const formData = new FormData(); diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.module.ts b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.module.ts index 9bafaebdc..a4e30a494 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.module.ts +++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.module.ts @@ -26,7 +26,7 @@ import { SearchTemplateComponent } from './search-template.component'; import { ReactiveFormsModule } from '@angular/forms'; import { AppMaterialModule } from 'src/app/common/modules/app-material.module'; import { SharedModule} from 'src/app/common/shared/shared.module'; -import { SelectTemplateService } from 'src/app/feature-modules/blueprint/select-template/select-template.service'; +// import { SelectTemplateService } from 'src/app/feature-modules/blueprint/select-template/select-template.service'; @NgModule({ declarations: [ @@ -42,6 +42,6 @@ import { SelectTemplateService } from 'src/app/feature-modules/blueprint/select- SearchTemplateComponent, SearchFromDatabaseComponent ], - providers:[ SelectTemplateService] + // providers:[ SelectTemplateService] }) export class SearchTemplateModule { } diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.module.ts b/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.module.ts index f66b78c08..085da7247 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.module.ts +++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.module.ts @@ -27,15 +27,15 @@ import { MetadataComponent } from './metadata/metadata.component'; import { SelectTemplateComponent } from './select-template.component'; import { SelectTemplateRoutingModule } from './select-template-routing.module'; import { AppMaterialModule } from 'src/app/common/modules/app-material.module'; -import { SearchTemplateModule} from './search-template/search-template.module'; - +import { SearchTemplateModule } from './search-template/search-template.module'; +import { SelectTemplateService } from './select-template.service'; @NgModule({ declarations: [ TemplateOptionsComponent, - MetadataComponent, - SelectTemplateComponent + MetadataComponent, + SelectTemplateComponent ], - exports: [ + exports: [ TemplateOptionsComponent, SearchTemplateComponent, MetadataComponent, @@ -47,6 +47,9 @@ import { SearchTemplateModule} from './search-template/search-template.module'; ReactiveFormsModule, AppMaterialModule, SearchTemplateModule + ], + providers: [ + SelectTemplateService ] }) export class SelectTemplateModule { } diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.service.ts b/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.service.ts index fa18cbd25..d6bcfb33b 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.service.ts +++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.service.ts @@ -20,21 +20,29 @@ limitations under the License. */ import { Injectable } from '@angular/core'; -import { Observable, of } from 'rxjs'; +import { BehaviorSubject } from 'rxjs'; @Injectable({ providedIn: 'root' }) export class SelectTemplateService { cbaOption: string; + private messageSource = new BehaviorSubject('default message'); + currentMessage = this.messageSource.asObservable(); constructor() { } setCbaOption(option: string) { - this.cbaOption = option; - } - - getCbaOption(): Observable<string> { - return of(this.cbaOption); + this.messageSource.next(option); } + // setCbaOption(option: string) { + // this.cbaOption = option; + // console.log("CBA option set to"+this.cbaOption+":"+option); + // } + + // getCbaOption(): Observable<any> { + // console.log("CBA option is "+this.cbaOption); + // // return of(this.cbaOption); + // return this.cbaOption.asObservable(); + // } } diff --git a/cds-ui/client/src/assets/sample-licenses.json b/cds-ui/client/src/assets/sample-licenses.json index c0f78ac55..86a8e5d0b 100644 --- a/cds-ui/client/src/assets/sample-licenses.json +++ b/cds-ui/client/src/assets/sample-licenses.json @@ -11,7 +11,7 @@ },
"updated-by": "brindasanth@onap.com",
"sources": {
- "primary-config-data": {
+ "config-data": {
"type": "source-rest",
"properties": {
"type": "JSON",
@@ -26,4 +26,4 @@ }
}
}
-}
\ No newline at end of file +}
diff --git a/cds-ui/server/src/datasources/rest.datasource.json b/cds-ui/server/src/datasources/rest.datasource.json deleted file mode 100644 index 86f33fbd4..000000000 --- a/cds-ui/server/src/datasources/rest.datasource.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "name": "restConfig", - "connector": "rest", - "options": { - "headers": { - "accept": "application/json", - "content-type": "application/json" - } - }, - "operations": [ - { - "template": { - "method": "GET", - "url": "" - }, - "functions": { - "getEnricheddata": [""] - } - }, - { - "template": { - "method": "POST", - "url": "" - }, - "functions": { - "saveBlueprint": [""] - } - }, - { - "template": { - "method": "POST", - "url": "" - }, - "functions": { - "test": [""] - } - } -] -}
\ No newline at end of file diff --git a/cds-ui/server/src/datasources/rest.datasource.ts b/cds-ui/server/src/datasources/rest.datasource.ts deleted file mode 100644 index 1b5a44d79..000000000 --- a/cds-ui/server/src/datasources/rest.datasource.ts +++ /dev/null @@ -1,32 +0,0 @@ -/* -============LICENSE_START========================================== -=================================================================== -Copyright (C) 2018-19 IBM Intellectual Property. All rights reserved. -=================================================================== - -Unless otherwise specified, all software contained herein is licensed -under the Apache License, Version 2.0 (the License); -you may not use this software except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -============LICENSE_END============================================ -*/ - - -import { juggler } from '@loopback/service-proxy'; -import * as config from './rest.datasource.json'; - - -export class RestDataSource extends juggler.DataSource { - static dataSourceName = 'rest'; - constructor(dsConfig: object = config) { - super(dsConfig); - } -} diff --git a/cds-ui/server/src/services/rest.service.ts b/cds-ui/server/src/services/rest.service.ts deleted file mode 100644 index b94ea4dd3..000000000 --- a/cds-ui/server/src/services/rest.service.ts +++ /dev/null @@ -1,46 +0,0 @@ -/* -============LICENSE_START========================================== -=================================================================== -Copyright (C) 2018-19 IBM Intellectual Property. All rights reserved. -=================================================================== - -Unless otherwise specified, all software contained herein is licensed -under the Apache License, Version 2.0 (the License); -you may not use this software except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -============LICENSE_END============================================ -*/ - -import {getService, juggler} from '@loopback/service-proxy'; -import {inject, Provider} from '@loopback/core'; -import {RestDataSource} from '../datasources/rest.datasource'; - - -export interface RestResponseData { - userId: number; - id: number; - title: string; - completed: boolean; -} - -export interface RestService { - getrestdata(id?: number): Promise<RestResponseData>; -} -export class RestProvider implements Provider<RestService> { - constructor( - @inject('datasources.rest') - protected dataSource: juggler.DataSource = new RestDataSource(), - ) {} - - value(): Promise<RestService> { - return getService(this.dataSource); - } -}
\ No newline at end of file |