diff options
Diffstat (limited to 'cds-ui/client/src/app/feature-modules')
4 files changed, 26 insertions, 22 deletions
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 fdb261d52..dd17a30d2 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 @@ -1,3 +1,24 @@ +/* +============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 { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs'; diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.html b/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.html index 97c65b220..46e1ea7da 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.html +++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.html @@ -34,9 +34,6 @@ limitations under the License. <ng-template matStepLabel>Browse CBA Template file</ng-template> <div class="matStepContent"> <app-search-template [optionSelected]="templateOption" (cbaFile)="fileChange($event)"></app-search-template> - <!-- <div> - <button mat-button matStepperNext class="matStepNextBtn">Upload</button> - </div>--> </div> </mat-step> <mat-step [stepControl]="step3FormGroup"> diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.ts b/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.ts index 561f15a5d..9188b43b8 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.ts +++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.ts @@ -19,8 +19,6 @@ limitations under the License. ============LICENSE_END============================================ */ import { Component, OnInit } from '@angular/core'; -import { Observable } from 'rxjs'; -import { Store } from '@ngrx/store'; import { IBlueprint } from 'src/app/common/core/store/models/blueprint.model'; import { IBlueprintState } from 'src/app/common/core/store/models/blueprintState.model'; import { IMetaData } from 'src/app/common/core/store/models/metadata.model'; @@ -40,8 +38,7 @@ export class SelectTemplateComponent implements OnInit { importModel: IImportModel; templateOption: any; - constructor(private store: Store<IBlueprintState>) { - // this.importModel.file = ''; + constructor() { } ngOnInit() { @@ -51,23 +48,14 @@ export class SelectTemplateComponent implements OnInit { this.templateOption = option; console.log(this.templateOption); } - + fileChange(topologyTemp: ITopologyTemplate) { this.topologyTemplate = topologyTemp; console.log(topologyTemp); } metaDataDetail(data: IMetaData) { - + this.metaData = data; console.log("parent" + this.metaData.author_email); } - upload() { - - } - - // saveBlueprintModel(){ - // this.blueprint.toplogyTemplates=this.topologyTemplate; - // this.blueprint.metadata= this.metaData; - // // this.store.dispatch(new CreateBlueprint(this.blueprint)); - // } } diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.service.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.service.ts index 417f6edb3..ed1ef6f37 100644 --- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.service.ts +++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.service.ts @@ -38,12 +38,10 @@ export class ResourceEditService { } getSources() { - // to do - return this.api.get('ResourceDictionaryURLs.getSources'); + return this.api.get(ResourceDictionaryURLs.getSources); } getModelType(name) { - // to do - return this.api.get("ResourceDictionaryURLs.getModelType + '/' + name"); + return this.api.get(ResourceDictionaryURLs.getModelType + '/' + name); } }
\ No newline at end of file |