aboutsummaryrefslogtreecommitdiffstats
path: root/cds-ui
diff options
context:
space:
mode:
authorBrinda Santh Muthuramalingam <brindasanth@in.ibm.com>2019-08-22 15:17:57 +0000
committerGerrit Code Review <gerrit@onap.org>2019-08-22 15:17:57 +0000
commitb496e93839fba89a8ea2ab026954a6f6359bc4c2 (patch)
tree7b956a7698944e6afca2523a8a39723c74c54907 /cds-ui
parentdd48bf20a0b0b63979a85528090e6ff26ced847d (diff)
parent35d8560b19e46dccae3458db5105af842826abe9 (diff)
Merge "Edit option service"
Diffstat (limited to 'cds-ui')
-rw-r--r--cds-ui/client/src/app/feature-modules/blueprint/select-template/metadata/metadata.component.ts30
-rw-r--r--cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.module.ts5
-rw-r--r--cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.service.spec.ts12
-rw-r--r--cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.service.ts40
4 files changed, 75 insertions, 12 deletions
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 cefe0fd93..174bdf183 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
@@ -30,7 +30,7 @@ import { IBlueprint } from 'src/app/common/core/store/models/blueprint.model';
import { IMetaData } from '../../../../common/core/store/models/metadata.model';
import { SetBlueprintState } from 'src/app/common/core/store/actions/blueprint.action';
import { LoaderService } from '../../../../common/core/services/loader.service';
-
+import { SelectTemplateService } from 'src/app/feature-modules/blueprint/select-template/select-template.service';
@Component({
selector: 'app-metadata',
templateUrl: './metadata.component.html',
@@ -48,8 +48,9 @@ export class MetadataComponent implements OnInit {
blueprintName: string;
uploadedFileName: string;
entryDefinition: string;
-
- constructor(private formBuilder: FormBuilder, private store: Store<IAppState>, private loader: LoaderService) {
+
+ constructor(private formBuilder: FormBuilder, private store: Store<IAppState>,
+ private loader: LoaderService, private dataService: SelectTemplateService) {
this.bpState = this.store.select('blueprint');
this.CBAMetadataForm = this.formBuilder.group({
template_author: ['', Validators.required],
@@ -62,6 +63,9 @@ export class MetadataComponent implements OnInit {
}
ngOnInit() {
+ this.dataService.getCbaOption().subscribe(
+ res => {console.log("data from service " + res);}
+ );
this.bpState.subscribe(
blueprintdata => {
var blueprintState: IBlueprintState = { blueprint: blueprintdata.blueprint, isLoadSuccess: blueprintdata.isLoadSuccess, isSaveSuccess: blueprintdata.isSaveSuccess, isUpdateSuccess: blueprintdata.isUpdateSuccess };
@@ -95,18 +99,22 @@ 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);
this.blueprint.metadata = this.metadata;
- if( this.blueprint &&
- this.blueprint['topology_template'] &&
- this.blueprint['topology_template'].workflows &&
- this.blueprint['topology_template'].workflows['resource-assignment'] &&
- this.blueprint['topology_template'].workflows['resource-assignment'].name) {
- delete this.blueprint['topology_template'].workflows['resource-assignment'].name;
- }
+ /*if (this.blueprint &&
+ this.blueprint['topology_template'] &&
+ this.blueprint['topology_template'].workflows &&
+ this.blueprint['topology_template'].workflows['resource-assignment'] &&
+ this.blueprint['topology_template'].workflows['resource-assignment'].name) {
+ delete this.blueprint['topology_template'].workflows['resource-assignment'].name;
+ }*/
this.filesData.forEach((fileNode) => {
if (fileNode.name.includes(this.blueprintName) && fileNode.name == this.entryDefinition) {
fileNode.data = JSON.stringify(this.blueprint, null, "\t");
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 11029663b..9bafaebdc 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,6 +26,8 @@ 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';
+
@NgModule({
declarations: [
SearchTemplateComponent,
@@ -39,6 +41,7 @@ import { SharedModule} from 'src/app/common/shared/shared.module';
exports:[
SearchTemplateComponent,
SearchFromDatabaseComponent
- ]
+ ],
+ providers:[ SelectTemplateService]
})
export class SearchTemplateModule { }
diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.service.spec.ts b/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.service.spec.ts
new file mode 100644
index 000000000..e5e2d0256
--- /dev/null
+++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.service.spec.ts
@@ -0,0 +1,12 @@
+import { TestBed } from '@angular/core/testing';
+
+import { SelectTemplateService } from './select-template.service';
+
+describe('SelectTemplateService', () => {
+ beforeEach(() => TestBed.configureTestingModule({}));
+
+ it('should be created', () => {
+ const service: SelectTemplateService = TestBed.get(SelectTemplateService);
+ expect(service).toBeTruthy();
+ });
+});
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
new file mode 100644
index 000000000..fa18cbd25
--- /dev/null
+++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.service.ts
@@ -0,0 +1,40 @@
+/*
+============LICENSE_START==========================================
+===================================================================
+Copyright (C) 2019 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 { Injectable } from '@angular/core';
+import { Observable, of } from 'rxjs';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class SelectTemplateService {
+ cbaOption: string;
+
+ constructor() { }
+
+ setCbaOption(option: string) {
+ this.cbaOption = option;
+ }
+
+ getCbaOption(): Observable<string> {
+ return of(this.cbaOption);
+ }
+}