From a6ae7294ecd336d7e88f915710b08e2658eaee00 Mon Sep 17 00:00:00 2001 From: vasraz Date: Sun, 21 Mar 2021 20:48:30 +0000 Subject: Enable selection of base type of service Signed-off-by: MichaelMorris Issue-ID: SDC-3506 Change-Id: Iaba39955fac9056cb0d0f1eccd223c05dfb9c5b4 Signed-off-by: Vasyl Razinkov --- catalog-ui/src/app/ng2/app.module.ts | 2 ++ catalog-ui/src/app/ng2/services/element.service.ts | 42 ++++++++++++++++++++++ .../responses/component-generic-response.ts | 8 +++++ 3 files changed, 52 insertions(+) create mode 100644 catalog-ui/src/app/ng2/services/element.service.ts (limited to 'catalog-ui/src/app/ng2') diff --git a/catalog-ui/src/app/ng2/app.module.ts b/catalog-ui/src/app/ng2/app.module.ts index e8dde94d68..55dd969a88 100644 --- a/catalog-ui/src/app/ng2/app.module.ts +++ b/catalog-ui/src/app/ng2/app.module.ts @@ -98,6 +98,7 @@ import {ToscaTypesServiceNg2} from "./services/tosca-types.service"; import {CapabilitiesFilterPropertiesEditorComponentModule} from "./pages/composition/capabilities-filter-properties-editor/capabilities-filter-properties-editor.module"; import {InterfaceOperationHandlerModule} from "./pages/composition/interface-operatons/operation-creator/interface-operation-handler.module"; import {AttributesOutputsModule} from "./pages/attributes-outputs/attributes-outputs.module"; +import { ElementService } from "./services/element.service"; declare const __ENV__: string; @@ -195,6 +196,7 @@ export function configServiceFactory(config: ConfigService, authService: Authent ModalService, ImportVSPService, OnboardingService, + ElementService, ServiceServiceNg2, AutomatedUpgradeService, WorkflowServiceNg2, diff --git a/catalog-ui/src/app/ng2/services/element.service.ts b/catalog-ui/src/app/ng2/services/element.service.ts new file mode 100644 index 0000000000..97efbccfef --- /dev/null +++ b/catalog-ui/src/app/ng2/services/element.service.ts @@ -0,0 +1,42 @@ +/* +* ============LICENSE_START======================================================= +* Copyright (C) 2021 Nordix Foundation. All rights reserved. +* ================================================================================ +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file 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. +* +* SPDX-License-Identifier: Apache-2.0 +* ============LICENSE_END========================================================= +*/ + +import { HttpClient } from '@angular/common/http'; +import { Inject, Injectable } from '@angular/core'; +import { Response } from '@angular/http'; +import { Observable } from 'rxjs/Observable'; +import { ISdcConfig, SdcConfigToken } from '../config/sdc-config.config'; +import {map} from "rxjs/operators"; + +@Injectable() +export class ElementService { + + protected baseUrl; + + constructor(protected http: HttpClient, @Inject(SdcConfigToken) sdcConfig: ISdcConfig) { + this.baseUrl = sdcConfig.api.root; + } + + getCategoryBasetypes(categoryName:string):Observable { + return this.http.get(this.baseUrl + "/v1/category/services/" + categoryName + "/baseTypes") + .pipe(map(response => response.baseTypes)); + } + +} + diff --git a/catalog-ui/src/app/ng2/services/responses/component-generic-response.ts b/catalog-ui/src/app/ng2/services/responses/component-generic-response.ts index 09ace56965..784a3d0ac9 100644 --- a/catalog-ui/src/app/ng2/services/responses/component-generic-response.ts +++ b/catalog-ui/src/app/ng2/services/responses/component-generic-response.ts @@ -59,6 +59,8 @@ export class ComponentGenericResponse implements Serializable; public nodeFilterforNode: Array; public substitutionFilterForTopologyTemplate: Array; + public derivedFromGenericType; + public derivedFromGenericVersion; deserialize (response): ComponentGenericResponse { @@ -130,6 +132,12 @@ export class ComponentGenericResponse implements Serializable