From a555c46e2065c2de1de87f26f5a829be5ef0d403 Mon Sep 17 00:00:00 2001 From: Idan Amit Date: Mon, 16 Jul 2018 19:22:02 +0300 Subject: [PATCH] Fixed not needed derived from properties Removed derived from property that we're added before Fixed the properties assignments page to work with the new state Change-Id: Id8d8e9437a9927660cfd373b24efae63f4d13347 Issue-ID: SDC-1514 Signed-off-by: Idan Amit --- .../resources/import/tosca/data-types/dataTypes.yml | 8 -------- .../resources/import/tosca/data-types/dataTypes.zip | Bin 7397 -> 7388 bytes catalog-ui/src/app/ng2/services/data-type.service.ts | 8 ++++---- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml index 697b333db5..c5555a5838 100644 --- a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml +++ b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml @@ -1422,7 +1422,6 @@ tosca.datatypes.nfv.L3AddressData: type: string required: false tosca.datatypes.nfv.AddressData: - derived_from: tosca.datatypes.Root properties: address_type: constraints: @@ -1453,7 +1452,6 @@ tosca.datatypes.nfv.VlFlavour: flavourId: type: string tosca.datatypes.nfv.ext.AddressPairs: - derived_from: tosca.datatypes.Root properties: ip: type: string @@ -1462,7 +1460,6 @@ tosca.datatypes.nfv.ext.AddressPairs: type: string required: false tosca.datatypes.nfv.ext.FloatingIP: - derived_from: tosca.datatypes.Root properties: external_network: type: string @@ -1471,7 +1468,6 @@ tosca.datatypes.nfv.ext.FloatingIP: type: string required: false tosca.datatypes.nfv.ext.LocationInfo: - derived_from: tosca.datatypes.Root properties: availability_zone: type: string @@ -1483,7 +1479,6 @@ tosca.datatypes.nfv.ext.LocationInfo: type: string required: false tosca.datatypes.nfv.ext.HostRouteInfo: - derived_from: tosca.datatypes.Root properties: destination: type: string @@ -1492,7 +1487,6 @@ tosca.datatypes.nfv.ext.HostRouteInfo: type: string required: false tosca.datatypes.nfv.ext.InjectData: - derived_from: tosca.datatypes.Root properties: file_name: type: string @@ -1501,7 +1495,6 @@ tosca.datatypes.nfv.ext.InjectData: type: string required: false tosca.datatypes.nfv.ext.zte.WatchDog: - derived_from: tosca.datatypes.Root properties: enable_delay: type: integer @@ -1510,7 +1503,6 @@ tosca.datatypes.nfv.ext.zte.WatchDog: type: string required: false tosca.datatypes.nfv.ext.LocalAffinityOrAntiAffinityRule: - derived_from: tosca.datatypes.Root properties: scope: type: string diff --git a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip index 1e1fa1e5611095cd42bba8392723e4b6bf4b167a..84bc0c928d2cb20bbb658b10153985b4314efb17 100644 GIT binary patch literal 7388 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 O0ABzA0B0Nk0002HDJ^9H literal 7397 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 diff --git a/catalog-ui/src/app/ng2/services/data-type.service.ts b/catalog-ui/src/app/ng2/services/data-type.service.ts index 6b5908903e..e2489c6ec2 100644 --- a/catalog-ui/src/app/ng2/services/data-type.service.ts +++ b/catalog-ui/src/app/ng2/services/data-type.service.ts @@ -7,9 +7,9 @@ * 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. @@ -57,7 +57,7 @@ export class DataTypeService { }); } //recurse parent (derivedFrom), in case one of parents contains properties - if (PROPERTY_DATA.ROOT_DATA_TYPE !== dataTypeObj.derivedFrom.name) { + if (dataTypeObj.derivedFrom && PROPERTY_DATA.ROOT_DATA_TYPE == dataTypeObj.derivedFrom.name) { this.getDerivedDataTypeProperties(dataTypeObj.derivedFrom, propertiesArray, parentName); } } @@ -65,7 +65,7 @@ export class DataTypeService { /** * Checks for custom behavior for a given data type by checking if a function exists within data-type.service with that name * Additional custom behavior can be added by adding a function with the given dataType name - */ + */ public checkForCustomBehavior = (property:PropertyFEModel) => { let shortTypeName:string = property.type.split('.').pop(); if (this[shortTypeName]) { -- 2.16.6