From 6e12c8ad59f11426e49f81c4a7032480b126bfbc Mon Sep 17 00:00:00 2001 From: vasraz Date: Mon, 23 Jan 2023 20:10:43 +0000 Subject: Implement hiding mechanism Signed-off-by: Vasyl Razinkov Change-Id: I799af15e31b724ca394eebe435223c03186fb6d3 Issue-ID: SDC-4344 --- catalog-ui/src/app/models/category.ts | 41 +- catalog-ui/src/app/models/components/component.ts | 1 - catalog-ui/src/app/utils/constants.ts | 604 +++++----- .../workspace/tabs/general/general-view-model.ts | 9 +- .../workspace/tabs/general/general-view.html | 1242 ++++++++++---------- 5 files changed, 944 insertions(+), 953 deletions(-) (limited to 'catalog-ui/src/app') diff --git a/catalog-ui/src/app/models/category.ts b/catalog-ui/src/app/models/category.ts index a6445cafdd..dc7cf564c1 100644 --- a/catalog-ui/src/app/models/category.ts +++ b/catalog-ui/src/app/models/category.ts @@ -20,40 +20,39 @@ 'use strict'; - - export interface ICategoryBase { - //server properties - name:string; - displayName:string; - normalizedName:string; - uniqueId:string; - models:Array; - icons:Array; + // server properties + name: string; + displayName: string; + normalizedName: string; + uniqueId: string; + models: Array; + icons: Array; metadataKeys: IMetadataKey[]; - //custom properties - filterTerms:string; - isDisabled:boolean; - filteredGroup:Array; + // custom properties + filterTerms: string; + isDisabled: boolean; + filteredGroup: Array; } export interface IMainCategory extends ICategoryBase { - subcategories:Array; - useServiceSubstitutionForNestedServices:boolean; + subcategories: Array; + useServiceSubstitutionForNestedServices: boolean; + notApplicableMetadataKeys: Array; } export interface ISubCategory extends ICategoryBase { - groupings:Array; + groupings: Array; } export interface IGroup extends ICategoryBase { } export interface IMetadataKey { - name:string; - displayName:string; - mandatory:boolean; - validValues: string[]; - defaultValue: string; + name: string; + displayName: string; + mandatory: boolean; + validValues: string[]; + defaultValue: string; } diff --git a/catalog-ui/src/app/models/components/component.ts b/catalog-ui/src/app/models/components/component.ts index bcebf3b9fa..a2f5a5ed3f 100644 --- a/catalog-ui/src/app/models/components/component.ts +++ b/catalog-ui/src/app/models/components/component.ts @@ -573,7 +573,6 @@ export abstract class Component implements IComponent { this.derivedList = componentMetadata.derivedList; this.normalizedName = componentMetadata.normalizedName; this.systemName = componentMetadata.systemName; - this.categories = componentMetadata.categories; this.isArchived = componentMetadata.isArchived; this.vspArchived = componentMetadata.vspArchived; this.componentMetadata = componentMetadata; diff --git a/catalog-ui/src/app/utils/constants.ts b/catalog-ui/src/app/utils/constants.ts index a215a87c0e..087ecaf21c 100644 --- a/catalog-ui/src/app/utils/constants.ts +++ b/catalog-ui/src/app/utils/constants.ts @@ -27,432 +27,432 @@ export let DEFAULT_ICON = 'defaulticon'; export let CP_END_POINT = 'CpEndPoint'; export let CHANGE_COMPONENT_CSAR_VERSION_FLAG = 'changeComponentCsarVersion'; export let PREVIOUS_CSAR_COMPONENT = 'previousCsarComponent' -export let CATEGORY_SERVICE_METADATA_KEYS = ["Naming Policy","Service Type","Service Function","Service Role"]; +export let CATEGORY_SERVICE_METADATA_KEYS = ["Naming Policy", "Service Type", "Service Function", "Service Role"]; export let DEFAULT_MODEL_NAME = "SDC AID"; export class GeneralStatus { - static OK = 'OK'; - static GENERAL_ERROR = 'GENERAL_ERROR'; + static OK = 'OK'; + static GENERAL_ERROR = 'GENERAL_ERROR'; } export class ComponentType { - static SERVICE = 'SERVICE'; - static RESOURCE = 'RESOURCE'; - static RESOURCE_INSTANCE = 'RESOURCE_INSTANCE'; - static SERVICE_PROXY = 'ServiceProxy' - static SERVICE_SUBSTITUTION = 'ServiceSubstitution' + static SERVICE = 'SERVICE'; + static RESOURCE = 'RESOURCE'; + static RESOURCE_INSTANCE = 'RESOURCE_INSTANCE'; + static SERVICE_PROXY = 'ServiceProxy' + static SERVICE_SUBSTITUTION = 'ServiceSubstitution' } export class ToscaType { - static DATATYPE = 'DATATYPE'; + static DATATYPE = 'DATATYPE'; } export class Icon { - static DEFAULT_ICON = 'defaulticon'; - static DATATYPE_ICON = 'securityrules'; - static SERVICE_TYPE_60 = 'services_60'; - static COLOR_LIGHTBLUE = 'lightBlue' - static COLOR_WHITE = 'white'; - static COLOR_PURPLE = 'purple'; - static RESOURCE_TYPE_24 = 'resources_24'; - static RESOURCE_TYPE_60 = 'resources_60'; - static SHAPE_CIRCLE = 'circle'; - static SIZE_MEDIUM = 'medium'; - static SIZE_X_LARGE = 'x_large'; - static ERROR = 'error'; + static DEFAULT_ICON = 'defaulticon'; + static DATATYPE_ICON = 'securityrules'; + static SERVICE_TYPE_60 = 'services_60'; + static COLOR_LIGHTBLUE = 'lightBlue' + static COLOR_WHITE = 'white'; + static COLOR_PURPLE = 'purple'; + static RESOURCE_TYPE_24 = 'resources_24'; + static RESOURCE_TYPE_60 = 'resources_60'; + static SHAPE_CIRCLE = 'circle'; + static SIZE_MEDIUM = 'medium'; + static SIZE_X_LARGE = 'x_large'; + static ERROR = 'error'; } export class ServerTypeUrl { - static RESOURCES = 'resources/'; - static SERVICES = 'services/'; - - public static toServerTypeUrl(componentType: ComponentType): string { - if (componentType == ComponentType.SERVICE) { - return ServerTypeUrl.SERVICES.slice(0, -1); - } else if (componentType == ComponentType.RESOURCE) { - return ServerTypeUrl.RESOURCES.slice(0, -1); - } else { - return undefined; + static RESOURCES = 'resources/'; + static SERVICES = 'services/'; + + public static toServerTypeUrl(componentType: ComponentType): string { + if (componentType == ComponentType.SERVICE) { + return ServerTypeUrl.SERVICES.slice(0, -1); + } else if (componentType == ComponentType.RESOURCE) { + return ServerTypeUrl.RESOURCES.slice(0, -1); + } else { + return undefined; + } } - } } export class ResourceType { - static VF = 'VF'; - static VL = 'VL'; - static CP = 'CP'; - static VFC = 'VFC'; - static VFCMT = 'VFCMT'; - static PNF = 'PNF'; - static CVFC = 'CVFC'; - static CONFIGURATION = 'Configuration'; - static CR = 'CR'; + static VF = 'VF'; + static VL = 'VL'; + static CP = 'CP'; + static VFC = 'VFC'; + static VFCMT = 'VFCMT'; + static PNF = 'PNF'; + static CVFC = 'CVFC'; + static CONFIGURATION = 'Configuration'; + static CR = 'CR'; } export class SdcElementType { - static GROUP = 'GROUP'; - static POLICY = 'POLICY'; - static SERVICE_PROXY = 'ServiceProxy' + static GROUP = 'GROUP'; + static POLICY = 'POLICY'; + static SERVICE_PROXY = 'ServiceProxy' } export class ComponentState { - static CERTIFICATION_IN_PROGRESS = 'CERTIFICATION_IN_PROGRESS'; - static CERTIFIED = 'CERTIFIED'; - static NOT_CERTIFIED_CHECKOUT = 'NOT_CERTIFIED_CHECKOUT'; - static NOT_CERTIFIED_CHECKIN = 'NOT_CERTIFIED_CHECKIN'; - static READY_FOR_CERTIFICATION = 'READY_FOR_CERTIFICATION'; + static CERTIFICATION_IN_PROGRESS = 'CERTIFICATION_IN_PROGRESS'; + static CERTIFIED = 'CERTIFIED'; + static NOT_CERTIFIED_CHECKOUT = 'NOT_CERTIFIED_CHECKOUT'; + static NOT_CERTIFIED_CHECKIN = 'NOT_CERTIFIED_CHECKIN'; + static READY_FOR_CERTIFICATION = 'READY_FOR_CERTIFICATION'; } export class DistributionStatus { - DISTRIBUTION_NOT_APPROVED = 'DISTRIBUTION_NOT_APPROVED'; - DISTRIBUTION_APPROVED = 'DISTRIBUTION_APPROVED'; - DISTRIBUTED = 'DISTRIBUTED'; - DISTRIBUTION_REJECTED = 'DISTRIBUTION_REJECTED'; + DISTRIBUTION_NOT_APPROVED = 'DISTRIBUTION_NOT_APPROVED'; + DISTRIBUTION_APPROVED = 'DISTRIBUTION_APPROVED'; + DISTRIBUTED = 'DISTRIBUTED'; + DISTRIBUTION_REJECTED = 'DISTRIBUTION_REJECTED'; } export class ArtifactGroupType { - static DEPLOYMENT = "DEPLOYMENT"; - static INFORMATION = "INFORMATIONAL"; - static SERVICE_API = "SERVICE_API"; - static TOSCA = "TOSCA"; + static DEPLOYMENT = "DEPLOYMENT"; + static INFORMATION = "INFORMATIONAL"; + static SERVICE_API = "SERVICE_API"; + static TOSCA = "TOSCA"; } export class ArtifactType { - static DEPLOYMENT = "DEPLOYMENT"; - static INFORMATION = "INFORMATIONAL"; - static SERVICE_API = "SERVICE_API"; - static HEAT_ENV = "HEAT_ENV"; - static HEAT = "HEAT"; - static HEAT_VOL = "HEAT_VOL"; - static HEAT_NET = "HEAT_NET"; - static VF_LICENSE = "VF_LICENSE"; - static PM_DICTIONARY = "PM_DICTIONARY"; - static VENDOR_LICENSE = "VENDOR_LICENSE"; - static THIRD_PARTY_RESERVED_TYPES = { - WORKFLOW: "WORKFLOW", - NETWORK_CALL_FLOW: "NETWORK_CALL_FLOW", - AAI_SERVICE_MODEL: "AAI_SERVICE_MODEL", - AAI_VF_MODEL: "AAI_VF_MODEL", - AAI_VF_MODULE_MODEL: "AAI_VF_MODULE_MODEL", - AAI_VF_INSTANCE_MODEL: "AAI_VF_INSTANCE_MODEL" - }; - static TOSCA = {TOSCA_TEMPLATE: "TOSCA_TEMPLATE", TOSCA_CSAR: "TOSCA_CSAR"}; - static VES_EVENTS = "VES_EVENTS"; + static DEPLOYMENT = "DEPLOYMENT"; + static INFORMATION = "INFORMATIONAL"; + static SERVICE_API = "SERVICE_API"; + static HEAT_ENV = "HEAT_ENV"; + static HEAT = "HEAT"; + static HEAT_VOL = "HEAT_VOL"; + static HEAT_NET = "HEAT_NET"; + static VF_LICENSE = "VF_LICENSE"; + static PM_DICTIONARY = "PM_DICTIONARY"; + static VENDOR_LICENSE = "VENDOR_LICENSE"; + static THIRD_PARTY_RESERVED_TYPES = { + WORKFLOW: "WORKFLOW", + NETWORK_CALL_FLOW: "NETWORK_CALL_FLOW", + AAI_SERVICE_MODEL: "AAI_SERVICE_MODEL", + AAI_VF_MODEL: "AAI_VF_MODEL", + AAI_VF_MODULE_MODEL: "AAI_VF_MODULE_MODEL", + AAI_VF_INSTANCE_MODEL: "AAI_VF_INSTANCE_MODEL" + }; + static TOSCA = {TOSCA_TEMPLATE: "TOSCA_TEMPLATE", TOSCA_CSAR: "TOSCA_CSAR"}; + static VES_EVENTS = "VES_EVENTS"; } export class SEVERITY { - public static DEBUG = 'DEBUG'; - public static INFO = 'INFO'; - public static WARNING = 'WARNING'; - public static ERROR = 'ERROR'; + public static DEBUG = 'DEBUG'; + public static INFO = 'INFO'; + public static WARNING = 'WARNING'; + public static ERROR = 'ERROR'; } export class PROPERTY_TYPES { - public static STRING = 'string'; - public static INTEGER = 'integer'; - public static TIMESTAMP = 'timestamp'; - public static FLOAT = 'float'; - public static BOOLEAN = 'boolean'; - public static JSON = 'json'; - public static RANGE = 'range'; - public static MAP = 'map'; - public static LIST = 'list'; - public static SCALAR_BITRATE = 'scalar-unit.bitrate'; - public static SCALAR_FREQUENCY = 'scalar-unit.frequency'; - public static SCALAR_SIZE = 'scalar-unit.size'; - public static SCALAR_TIME = 'scalar-unit.time'; + public static STRING = 'string'; + public static INTEGER = 'integer'; + public static TIMESTAMP = 'timestamp'; + public static FLOAT = 'float'; + public static BOOLEAN = 'boolean'; + public static JSON = 'json'; + public static RANGE = 'range'; + public static MAP = 'map'; + public static LIST = 'list'; + public static SCALAR_BITRATE = 'scalar-unit.bitrate'; + public static SCALAR_FREQUENCY = 'scalar-unit.frequency'; + public static SCALAR_SIZE = 'scalar-unit.size'; + public static SCALAR_TIME = 'scalar-unit.time'; } export class SOURCES { - public static A_AND_AI = 'A&AI'; - public static ORDER = 'Order'; - public static RUNTIME = 'Runtime'; + public static A_AND_AI = 'A&AI'; + public static ORDER = 'Order'; + public static RUNTIME = 'Runtime'; } export class PROPERTY_DATA { - public static TYPES = [PROPERTY_TYPES.STRING, PROPERTY_TYPES.INTEGER, PROPERTY_TYPES.TIMESTAMP, PROPERTY_TYPES.FLOAT, PROPERTY_TYPES.BOOLEAN, PROPERTY_TYPES.JSON, PROPERTY_TYPES.SCALAR_BITRATE, PROPERTY_TYPES.SCALAR_FREQUENCY, PROPERTY_TYPES.SCALAR_SIZE, PROPERTY_TYPES.SCALAR_TIME, PROPERTY_TYPES.LIST, PROPERTY_TYPES.MAP, PROPERTY_TYPES.RANGE]; - public static SIMPLE_TYPES = [PROPERTY_TYPES.STRING, PROPERTY_TYPES.INTEGER, PROPERTY_TYPES.TIMESTAMP, PROPERTY_TYPES.FLOAT, PROPERTY_TYPES.BOOLEAN, PROPERTY_TYPES.JSON, PROPERTY_TYPES.SCALAR_BITRATE, PROPERTY_TYPES.SCALAR_FREQUENCY, PROPERTY_TYPES.SCALAR_SIZE, PROPERTY_TYPES.SCALAR_TIME]; - public static SIMPLE_TYPES_COMPARABLE = [PROPERTY_TYPES.STRING, PROPERTY_TYPES.INTEGER, PROPERTY_TYPES.FLOAT]; - public static SCHEMA_TYPES = [PROPERTY_TYPES.LIST, PROPERTY_TYPES.MAP]; - public static SCALAR_TYPES = [PROPERTY_TYPES.SCALAR_BITRATE, PROPERTY_TYPES.SCALAR_FREQUENCY, PROPERTY_TYPES.SCALAR_SIZE, PROPERTY_TYPES.SCALAR_TIME]; - public static ROOT_DATA_TYPE = "tosca.datatypes.Root"; - public static OPENECOMP_ROOT = "org.openecomp.datatypes.Root"; - public static SUPPLEMENTAL_DATA = "supplemental_data"; - public static SOURCES = [SOURCES.A_AND_AI, SOURCES.ORDER, SOURCES.RUNTIME]; - public static COMPARABLE_TYPES = [PROPERTY_TYPES.STRING, PROPERTY_TYPES.INTEGER, PROPERTY_TYPES.FLOAT, PROPERTY_TYPES.TIMESTAMP, PROPERTY_TYPES.SCALAR_BITRATE, PROPERTY_TYPES.SCALAR_FREQUENCY, PROPERTY_TYPES.SCALAR_SIZE, PROPERTY_TYPES.SCALAR_TIME]; + public static TYPES = [PROPERTY_TYPES.STRING, PROPERTY_TYPES.INTEGER, PROPERTY_TYPES.TIMESTAMP, PROPERTY_TYPES.FLOAT, PROPERTY_TYPES.BOOLEAN, PROPERTY_TYPES.JSON, PROPERTY_TYPES.SCALAR_BITRATE, PROPERTY_TYPES.SCALAR_FREQUENCY, PROPERTY_TYPES.SCALAR_SIZE, PROPERTY_TYPES.SCALAR_TIME, PROPERTY_TYPES.LIST, PROPERTY_TYPES.MAP, PROPERTY_TYPES.RANGE]; + public static SIMPLE_TYPES = [PROPERTY_TYPES.STRING, PROPERTY_TYPES.INTEGER, PROPERTY_TYPES.TIMESTAMP, PROPERTY_TYPES.FLOAT, PROPERTY_TYPES.BOOLEAN, PROPERTY_TYPES.JSON, PROPERTY_TYPES.SCALAR_BITRATE, PROPERTY_TYPES.SCALAR_FREQUENCY, PROPERTY_TYPES.SCALAR_SIZE, PROPERTY_TYPES.SCALAR_TIME]; + public static SIMPLE_TYPES_COMPARABLE = [PROPERTY_TYPES.STRING, PROPERTY_TYPES.INTEGER, PROPERTY_TYPES.FLOAT]; + public static SCHEMA_TYPES = [PROPERTY_TYPES.LIST, PROPERTY_TYPES.MAP]; + public static SCALAR_TYPES = [PROPERTY_TYPES.SCALAR_BITRATE, PROPERTY_TYPES.SCALAR_FREQUENCY, PROPERTY_TYPES.SCALAR_SIZE, PROPERTY_TYPES.SCALAR_TIME]; + public static ROOT_DATA_TYPE = "tosca.datatypes.Root"; + public static OPENECOMP_ROOT = "org.openecomp.datatypes.Root"; + public static SUPPLEMENTAL_DATA = "supplemental_data"; + public static SOURCES = [SOURCES.A_AND_AI, SOURCES.ORDER, SOURCES.RUNTIME]; + public static COMPARABLE_TYPES = [PROPERTY_TYPES.STRING, PROPERTY_TYPES.INTEGER, PROPERTY_TYPES.FLOAT, PROPERTY_TYPES.TIMESTAMP, PROPERTY_TYPES.SCALAR_BITRATE, PROPERTY_TYPES.SCALAR_FREQUENCY, PROPERTY_TYPES.SCALAR_SIZE, PROPERTY_TYPES.SCALAR_TIME]; } export class PROPERTY_VALUE_CONSTRAINTS { - public static MAX_LENGTH = 2500; - public static JSON_MAX_LENGTH = 4096; - public static NAME_MAX_LENGTH = 100; + public static MAX_LENGTH = 2500; + public static JSON_MAX_LENGTH = 4096; + public static NAME_MAX_LENGTH = 100; } export class Role { - public static ADMIN = 'ADMIN'; - public static DESIGNER = 'DESIGNER'; - public static TESTER = 'TESTER'; - public static OPS = 'OPS'; - public static GOVERNOR = 'GOVERNOR'; + public static ADMIN = 'ADMIN'; + public static DESIGNER = 'DESIGNER'; + public static TESTER = 'TESTER'; + public static OPS = 'OPS'; + public static GOVERNOR = 'GOVERNOR'; } export enum FormState { - CREATE, - UPDATE, - IMPORT, - VIEW + CREATE, + UPDATE, + IMPORT, + VIEW } export class instantiationType { - public static MACRO = 'Macro'; - public static A_LA_CARTE = 'A-la-carte'; + public static MACRO = 'Macro'; + public static A_LA_CARTE = 'A-la-carte'; } export class WorkspaceMode { - public static CREATE = 'create'; - public static EDIT = 'edit'; - public static IMPORT = 'import'; - public static VIEW = 'view'; + public static CREATE = 'create'; + public static EDIT = 'edit'; + public static IMPORT = 'import'; + public static VIEW = 'view'; } export class ImagesUrl { - public static RESOURCE_ICONS = '/assets/styles/images/resource-icons/'; - public static SERVICE_ICONS = '/assets/styles/images/service-icons/'; - public static SERVICE_PROXY_ICONS = '/assets/styles/images/service-proxy-icons/'; - public static SELECTED_UCPE_INSTANCE = '/assets/styles/images/resource-icons/selectedUcpeInstance.png'; - public static SELECTED_CP_INSTANCE = '/assets/styles/images/resource-icons/selectedCPInstance.png'; - public static SELECTED_VL_INSTANCE = '/assets/styles/images/resource-icons/selectedVLInstance.png'; - public static CANVAS_PLUS_ICON = '/assets/styles/images/resource-icons/canvasPlusIcon.png'; - public static CANVAS_TAG_ICON = '/assets/styles/images/canvas-tagging-icons/indication.svg'; - public static CANVAS_POLICY_TAGGED_ICON = '/assets/styles/images/canvas-tagging-icons/policy_added.svg'; - public static CANVAS_GROUP_TAGGED_ICON = '/assets/styles/images/canvas-tagging-icons/group_added.svg'; - public static MODULE_ICON = '/assets/styles/images/resource-icons/module.png'; - public static OPEN_MODULE_ICON = '/assets/styles/images/resource-icons/openModule.png'; - public static OPEN_MODULE_HOVER_ICON = '/assets/styles/images/resource-icons/openModuleHover.png'; - public static CLOSE_MODULE_ICON = '/assets/styles/images/resource-icons/closeModule.png'; - public static CLOSE_MODULE_HOVER_ICON = '/assets/styles/images/resource-icons/closeModuleHover.png'; + public static RESOURCE_ICONS = '/assets/styles/images/resource-icons/'; + public static SERVICE_ICONS = '/assets/styles/images/service-icons/'; + public static SERVICE_PROXY_ICONS = '/assets/styles/images/service-proxy-icons/'; + public static SELECTED_UCPE_INSTANCE = '/assets/styles/images/resource-icons/selectedUcpeInstance.png'; + public static SELECTED_CP_INSTANCE = '/assets/styles/images/resource-icons/selectedCPInstance.png'; + public static SELECTED_VL_INSTANCE = '/assets/styles/images/resource-icons/selectedVLInstance.png'; + public static CANVAS_PLUS_ICON = '/assets/styles/images/resource-icons/canvasPlusIcon.png'; + public static CANVAS_TAG_ICON = '/assets/styles/images/canvas-tagging-icons/indication.svg'; + public static CANVAS_POLICY_TAGGED_ICON = '/assets/styles/images/canvas-tagging-icons/policy_added.svg'; + public static CANVAS_GROUP_TAGGED_ICON = '/assets/styles/images/canvas-tagging-icons/group_added.svg'; + public static MODULE_ICON = '/assets/styles/images/resource-icons/module.png'; + public static OPEN_MODULE_ICON = '/assets/styles/images/resource-icons/openModule.png'; + public static OPEN_MODULE_HOVER_ICON = '/assets/styles/images/resource-icons/openModuleHover.png'; + public static CLOSE_MODULE_ICON = '/assets/styles/images/resource-icons/closeModule.png'; + public static CLOSE_MODULE_HOVER_ICON = '/assets/styles/images/resource-icons/closeModuleHover.png'; } export class CanvasHandleTypes { - public static ADD_EDGE = 'add-edge'; - public static TAG_AVAILABLE = 'tag-available'; - public static TAGGED_POLICY = 'tagged-policy'; - public static TAGGED_GROUP = 'tagged-group'; + public static ADD_EDGE = 'add-edge'; + public static TAG_AVAILABLE = 'tag-available'; + public static TAGGED_POLICY = 'tagged-policy'; + public static TAGGED_GROUP = 'tagged-group'; } export class ModalType { - static STANDARD = 'standard'; - static ERROR = 'error'; - static ALERT = 'alert'; + static STANDARD = 'standard'; + static ERROR = 'error'; + static ALERT = 'alert'; } export class ServerErrors { - static ERROR_TITLE = 'Error'; - static DEFAULT_ERROR = 'Error getting response from server'; - static MESSAGE_ERROR = 'Wrong error format from server'; - static DOWNLOAD_ERROR = 'Download error'; + static ERROR_TITLE = 'Error'; + static DEFAULT_ERROR = 'Error getting response from server'; + static MESSAGE_ERROR = 'Wrong error format from server'; + static DOWNLOAD_ERROR = 'Download error'; } export class GraphColors { - public static NOT_CERTIFIED_LINK = 'rgb(218,31,61)'; - public static VL_LINK = 'rgb(216,216,216)'; - public static ACTIVE_LINK = '#30bdf2'; - public static BASE_LINK = 'rgb(55,55,55)'; - public static NODE_BACKGROUND_COLOR = 'rgba(46, 162, 157, 0.24)'; - public static NODE_SHADOW_COLOR = 'rgba(198, 230, 228, 0.7)'; - public static NODE_OVERLAPPING_BACKGROUND_COLOR = 'rgba(179, 10, 60, 0.24)'; - public static NODE_OVERLAPPING_SHADOW_COLOR = 'rgba(236, 194, 206, 0.7)'; - public static NODE_UCPE_CP = '#9063cd'; - public static NODE_UCPE = '#fbfbfb'; - public static NODE_SELECTED_BORDER_COLOR = '#30bdf2'; - public static SERVICE_PATH_LINK = '#70208a'; + public static NOT_CERTIFIED_LINK = 'rgb(218,31,61)'; + public static VL_LINK = 'rgb(216,216,216)'; + public static ACTIVE_LINK = '#30bdf2'; + public static BASE_LINK = 'rgb(55,55,55)'; + public static NODE_BACKGROUND_COLOR = 'rgba(46, 162, 157, 0.24)'; + public static NODE_SHADOW_COLOR = 'rgba(198, 230, 228, 0.7)'; + public static NODE_OVERLAPPING_BACKGROUND_COLOR = 'rgba(179, 10, 60, 0.24)'; + public static NODE_OVERLAPPING_SHADOW_COLOR = 'rgba(236, 194, 206, 0.7)'; + public static NODE_UCPE_CP = '#9063cd'; + public static NODE_UCPE = '#fbfbfb'; + public static NODE_SELECTED_BORDER_COLOR = '#30bdf2'; + public static SERVICE_PATH_LINK = '#70208a'; } export class GraphTransactionLogText { - public static REMOVE_TEMP_LINK = "remove tempLink"; - public static DELETE_LINK = "delete link"; - public static ADD_LINK = "delete link"; - public static ADD_NODE = "adding node"; + public static REMOVE_TEMP_LINK = "remove tempLink"; + public static DELETE_LINK = "delete link"; + public static ADD_LINK = "delete link"; + public static ADD_NODE = "adding node"; } export class GraphUIObjects { - public static HANDLE_SIZE = 18; - public static NODE_OVERLAP_MIN_SIZE = 30; - public static DEFAULT_RESOURCE_WIDTH = 65; - public static SMALL_RESOURCE_WIDTH = 21; - public static LINK_MENU_HEIGHT = 420; - public static TOP_HEADER_HEIGHT = 200; - public static TOOLTIP_OFFSET_X = 50; - public static TOOLTIP_OFFSET_Y = 145; - public static TOOLTIP_LINK_OFFSET_X = 35; - public static TOOLTIP_LINK_OFFSET_Y = 75; - public static MENU_LINK_VL_HEIGHT_OFFSET = 250; - public static MENU_LINK_VL_WIDTH_OFFSET = 200; - public static MENU_LINK_SIMPLE_HEIGHT_OFFSET = 180; - public static MENU_LINK_SIMPLE_WIDTH_OFFSET = 130; - public static DIAGRAM_RIGHT_WIDTH_OFFSET = 248; - public static DIAGRAM_HEADER_OFFSET = 103; - public static DIAGRAM_PALETTE_WIDTH_OFFSET = 247; - // public static COMPOSITION_HEADER_OFFSET = 50; - // public static COMPOSITION_NODE_MENU_WIDTH = 230; - // public static COMPOSITION_NODE_MENU_HEIGHT = 200; - // public static COMPOSITION_RIGHT_PANEL_OFFSET = 300; + public static HANDLE_SIZE = 18; + public static NODE_OVERLAP_MIN_SIZE = 30; + public static DEFAULT_RESOURCE_WIDTH = 65; + public static SMALL_RESOURCE_WIDTH = 21; + public static LINK_MENU_HEIGHT = 420; + public static TOP_HEADER_HEIGHT = 200; + public static TOOLTIP_OFFSET_X = 50; + public static TOOLTIP_OFFSET_Y = 145; + public static TOOLTIP_LINK_OFFSET_X = 35; + public static TOOLTIP_LINK_OFFSET_Y = 75; + public static MENU_LINK_VL_HEIGHT_OFFSET = 250; + public static MENU_LINK_VL_WIDTH_OFFSET = 200; + public static MENU_LINK_SIMPLE_HEIGHT_OFFSET = 180; + public static MENU_LINK_SIMPLE_WIDTH_OFFSET = 130; + public static DIAGRAM_RIGHT_WIDTH_OFFSET = 248; + public static DIAGRAM_HEADER_OFFSET = 103; + public static DIAGRAM_PALETTE_WIDTH_OFFSET = 247; + // public static COMPOSITION_HEADER_OFFSET = 50; + // public static COMPOSITION_NODE_MENU_WIDTH = 230; + // public static COMPOSITION_NODE_MENU_HEIGHT = 200; + // public static COMPOSITION_RIGHT_PANEL_OFFSET = 300; } export class States { - public static WORKSPACE = 'workspace'; - public static WORKSPACE_GENERAL = 'workspace.general'; - public static WORKSPACE_ACTIVITY_LOG = 'workspace.activity_log'; - public static WORKSPACE_DEPLOYMENT_ARTIFACTS = 'workspace.deployment_artifacts'; - public static WORKSPACE_PROPERTIES = 'workspace.properties'; - public static WORKSPACE_SERVICE_INPUTS = 'workspace.service_inputs'; - public static WORKSPACE_RESOURCE_INPUTS = 'workspace.resource_inputs'; - public static WORKSPACE_ATTRIBUTES = 'workspace.attributes'; - public static WORKSPACE_ATTRIBUTES_OUTPUTS = 'workspace.attributes_outputs'; - public static WORKSPACE_INFORMATION_ARTIFACTS = 'workspace.information_artifacts'; - public static WORKSPACE_TOSCA_ARTIFACTS = 'workspace.tosca_artifacts'; - public static WORKSPACE_COMPOSITION = 'workspace.composition'; - public static WORKSPACE_INTERFACE_OPERATION = 'workspace.interface_operation'; - public static WORKSPACE_INTERFACE_DEFINITION = 'workspace.interface-definition'; - public static WORKSPACE_NETWORK_CALL_FLOW = 'workspace.network_call_flow'; - public static WORKSPACE_MANAGEMENT_WORKFLOW = 'workspace.management_workflow'; - public static WORKSPACE_DEPLOYMENT = 'workspace.deployment'; - public static WORKSPACE_DISTRIBUTION = 'workspace.distribution'; - public static WORKSPACE_PROPERTIES_ASSIGNMENT = 'workspace.properties_assignment'; - public static WORKSPACE_REQUIREMENTS_AND_CAPABILITIES = 'workspace.reqAndCap'; - public static WORKSPACE_REQUIREMENTS_AND_CAPABILITIES_EDITABLE = 'workspace.reqAndCapEditable'; - public static WORKSPACE_PLUGINS = 'workspace.plugins'; - public static WORKSPACE_NG2 = 'workspace.ng2'; - public static TYPE_WORKSPACE = 'type-workspace'; + public static WORKSPACE = 'workspace'; + public static WORKSPACE_GENERAL = 'workspace.general'; + public static WORKSPACE_ACTIVITY_LOG = 'workspace.activity_log'; + public static WORKSPACE_DEPLOYMENT_ARTIFACTS = 'workspace.deployment_artifacts'; + public static WORKSPACE_PROPERTIES = 'workspace.properties'; + public static WORKSPACE_SERVICE_INPUTS = 'workspace.service_inputs'; + public static WORKSPACE_RESOURCE_INPUTS = 'workspace.resource_inputs'; + public static WORKSPACE_ATTRIBUTES = 'workspace.attributes'; + public static WORKSPACE_ATTRIBUTES_OUTPUTS = 'workspace.attributes_outputs'; + public static WORKSPACE_INFORMATION_ARTIFACTS = 'workspace.information_artifacts'; + public static WORKSPACE_TOSCA_ARTIFACTS = 'workspace.tosca_artifacts'; + public static WORKSPACE_COMPOSITION = 'workspace.composition'; + public static WORKSPACE_INTERFACE_OPERATION = 'workspace.interface_operation'; + public static WORKSPACE_INTERFACE_DEFINITION = 'workspace.interface-definition'; + public static WORKSPACE_NETWORK_CALL_FLOW = 'workspace.network_call_flow'; + public static WORKSPACE_MANAGEMENT_WORKFLOW = 'workspace.management_workflow'; + public static WORKSPACE_DEPLOYMENT = 'workspace.deployment'; + public static WORKSPACE_DISTRIBUTION = 'workspace.distribution'; + public static WORKSPACE_PROPERTIES_ASSIGNMENT = 'workspace.properties_assignment'; + public static WORKSPACE_REQUIREMENTS_AND_CAPABILITIES = 'workspace.reqAndCap'; + public static WORKSPACE_REQUIREMENTS_AND_CAPABILITIES_EDITABLE = 'workspace.reqAndCapEditable'; + public static WORKSPACE_PLUGINS = 'workspace.plugins'; + public static WORKSPACE_NG2 = 'workspace.ng2'; + public static TYPE_WORKSPACE = 'type-workspace'; } export class EVENTS { - static LEFT_PALETTE_UPDATE_EVENT = "leftPanelUpdateEvent"; - static ON_CSAR_LOADING = "onCsarLoading"; - static DOWNLOAD_ARTIFACT_FINISH_EVENT = "downloadArtifactFinishEvent"; - static ON_WORKSPACE_SAVE_BUTTON_CLICK = "onWorkspaceSaveButtonClick"; - static ON_WORKSPACE_SAVE_BUTTON_SUCCESS = "onWorkspaceSaveButtonSuccess"; - static ON_WORKSPACE_SAVE_BUTTON_ERROR = "onWorkspaceSaveButtonError"; - static ON_WORKSPACE_UNSAVED_CHANGES = "onWorkspaceUnsavedChanges"; - static ON_CHECKOUT = "onCheckout"; - static ON_LIFECYCLE_CHANGE_WITH_SAVE = "onLifecycleChangeWithSave"; - static ON_LIFECYCLE_CHANGE = "onCheckout"; + static LEFT_PALETTE_UPDATE_EVENT = "leftPanelUpdateEvent"; + static ON_CSAR_LOADING = "onCsarLoading"; + static DOWNLOAD_ARTIFACT_FINISH_EVENT = "downloadArtifactFinishEvent"; + static ON_WORKSPACE_SAVE_BUTTON_CLICK = "onWorkspaceSaveButtonClick"; + static ON_WORKSPACE_SAVE_BUTTON_SUCCESS = "onWorkspaceSaveButtonSuccess"; + static ON_WORKSPACE_SAVE_BUTTON_ERROR = "onWorkspaceSaveButtonError"; + static ON_WORKSPACE_UNSAVED_CHANGES = "onWorkspaceUnsavedChanges"; + static ON_CHECKOUT = "onCheckout"; + static ON_LIFECYCLE_CHANGE_WITH_SAVE = "onLifecycleChangeWithSave"; + static ON_LIFECYCLE_CHANGE = "onCheckout"; - //Loader events - static SHOW_LOADER_EVENT = "showLoaderEvent"; - static HIDE_LOADER_EVENT = "hideLoaderEvent"; - static UPDATE_PANEL = 'updatePanel'; - static ON_DISTRIBUTION_SUCCESS = 'onDistributionSuccess'; + //Loader events + static SHOW_LOADER_EVENT = "showLoaderEvent"; + static HIDE_LOADER_EVENT = "hideLoaderEvent"; + static UPDATE_PANEL = 'updatePanel'; + static ON_DISTRIBUTION_SUCCESS = 'onDistributionSuccess'; } export class UNIQUE_GROUP_PROPERTIES_NAME { - public static MIN_VF_MODULE_INSTANCES = 'min_vf_module_instances'; - public static MAX_VF_MODULE_INSTANCES = 'max_vf_module_instances'; - public static INITIAL_COUNT = 'initial_count'; - public static IS_BASE = 'isBase'; - public static VF_MODULE_TYPE = 'vf_module_type'; - public static VF_MODULE_LABEL = 'vf_module_label'; - public static VF_MODULE_DESCRIPTION = 'vf_module_description'; - public static VOLUME_GROUP = 'volume_group'; + public static MIN_VF_MODULE_INSTANCES = 'min_vf_module_instances'; + public static MAX_VF_MODULE_INSTANCES = 'max_vf_module_instances'; + public static INITIAL_COUNT = 'initial_count'; + public static IS_BASE = 'isBase'; + public static VF_MODULE_TYPE = 'vf_module_type'; + public static VF_MODULE_LABEL = 'vf_module_label'; + public static VF_MODULE_DESCRIPTION = 'vf_module_description'; + public static VOLUME_GROUP = 'volume_group'; } export class GRAPH_EVENTS { - static ON_COMPOSITION_GRAPH_DATA_LOADED = 'onCompositionGraphDataLoaded'; - static ON_DEPLOYMENT_GRAPH_DATA_LOADED = 'onDeploymentGraphDataLoaded'; - static ON_NODE_SELECTED = "onNodeSelected"; - static ON_ZONE_INSTANCE_SELECTED = "onZoneInstanceSelected"; - static ON_GRAPH_BACKGROUND_CLICKED = "onGraphBackgroundClicked"; - static ON_PALETTE_COMPONENT_DRAG_START = 'onPaletteComponentDragStart'; - static ON_PALETTE_COMPONENT_DRAG_ACTION = 'onPaletteComponentDragAction'; - static ON_PALETTE_COMPONENT_DROP = 'onPaletteComponentDrop'; - static ON_COMPONENT_INSTANCE_NAME_CHANGED = 'onComponentInstanceNameChanged'; - static ON_COMPONENT_INSTANCE_REQUIREMENT_EXTERNAL_CHANGED = 'onComponentInstanceRequirementExternalChanged' - static ON_COMPONENT_INSTANCE_CAPABILITY_EXTERNAL_CHANGED = 'onComponentInstanceCapabilityExternalChanged' - static ON_ZONE_INSTANCE_NAME_CHANGED = 'onZoneInstanceNameChanged'; - static ON_DELETE_COMPONENT_INSTANCE = 'onDeleteComponentInstance'; - static ON_DELETE_ZONE_INSTANCE = 'onDeleteZoneInstance'; - static ON_DELETE_COMPONENT_INSTANCE_SUCCESS = 'onDeleteComponentInstanceSuccess'; - static ON_DELETE_EDGE = 'onDeleteEdge'; - static ON_INSERT_NODE_TO_UCPE = 'onInsertNodeToUCPE'; - static ON_REMOVE_NODE_FROM_UCPE = 'onRemoveNodeFromUCPE'; - static ON_VERSION_CHANGED = 'onVersionChanged'; - static ON_CREATE_COMPONENT_INSTANCE = 'onCreateComponentInstance'; - static ON_ADD_ZONE_INSTANCE_FROM_PALETTE = 'onAddZoneInstanceFromPalette'; - static ON_CANVAS_TAG_START = 'onCanvasTagStart'; - static ON_CANVAS_TAG_END = 'onCanvasTagEnd'; - static ON_POLICY_INSTANCE_UPDATE = 'onPolicyInstanceUpdate'; - static ON_GROUP_INSTANCE_UPDATE = 'onGroupInstanceUpdate'; - static ON_SERVICE_PATH_CREATED = 'onServicePathCreated'; + static ON_COMPOSITION_GRAPH_DATA_LOADED = 'onCompositionGraphDataLoaded'; + static ON_DEPLOYMENT_GRAPH_DATA_LOADED = 'onDeploymentGraphDataLoaded'; + static ON_NODE_SELECTED = "onNodeSelected"; + static ON_ZONE_INSTANCE_SELECTED = "onZoneInstanceSelected"; + static ON_GRAPH_BACKGROUND_CLICKED = "onGraphBackgroundClicked"; + static ON_PALETTE_COMPONENT_DRAG_START = 'onPaletteComponentDragStart'; + static ON_PALETTE_COMPONENT_DRAG_ACTION = 'onPaletteComponentDragAction'; + static ON_PALETTE_COMPONENT_DROP = 'onPaletteComponentDrop'; + static ON_COMPONENT_INSTANCE_NAME_CHANGED = 'onComponentInstanceNameChanged'; + static ON_COMPONENT_INSTANCE_REQUIREMENT_EXTERNAL_CHANGED = 'onComponentInstanceRequirementExternalChanged' + static ON_COMPONENT_INSTANCE_CAPABILITY_EXTERNAL_CHANGED = 'onComponentInstanceCapabilityExternalChanged' + static ON_ZONE_INSTANCE_NAME_CHANGED = 'onZoneInstanceNameChanged'; + static ON_DELETE_COMPONENT_INSTANCE = 'onDeleteComponentInstance'; + static ON_DELETE_ZONE_INSTANCE = 'onDeleteZoneInstance'; + static ON_DELETE_COMPONENT_INSTANCE_SUCCESS = 'onDeleteComponentInstanceSuccess'; + static ON_DELETE_EDGE = 'onDeleteEdge'; + static ON_INSERT_NODE_TO_UCPE = 'onInsertNodeToUCPE'; + static ON_REMOVE_NODE_FROM_UCPE = 'onRemoveNodeFromUCPE'; + static ON_VERSION_CHANGED = 'onVersionChanged'; + static ON_CREATE_COMPONENT_INSTANCE = 'onCreateComponentInstance'; + static ON_ADD_ZONE_INSTANCE_FROM_PALETTE = 'onAddZoneInstanceFromPalette'; + static ON_CANVAS_TAG_START = 'onCanvasTagStart'; + static ON_CANVAS_TAG_END = 'onCanvasTagEnd'; + static ON_POLICY_INSTANCE_UPDATE = 'onPolicyInstanceUpdate'; + static ON_GROUP_INSTANCE_UPDATE = 'onGroupInstanceUpdate'; + static ON_SERVICE_PATH_CREATED = 'onServicePathCreated'; } export class DEPENDENCY_EVENTS { - static ON_DEPENDENCY_CHANGE = 'onDependencyStatusChange'; + static ON_DEPENDENCY_CHANGE = 'onDependencyStatusChange'; } export class SUBSTITUTION_FILTER_EVENTS { - static ON_SUBSTITUTION_FILTER_CHANGE = 'onSubstitutionFilterChange'; + static ON_SUBSTITUTION_FILTER_CHANGE = 'onSubstitutionFilterChange'; } export class COMPONENT_FIELDS { - static COMPONENT_INSTANCES_PROPERTIES = "componentInstancesProperties"; - static COMPONENT_INSTANCES_INPUTS = "componentInstancesInputs"; - static COMPONENT_INSTANCES_ATTRIBUTES = "componentInstancesAttributes"; - static COMPONENT_INSTANCES_OUTPUTS = "componentInstancesOutputs"; - static COMPONENT_ATTRIBUTES = "attributes"; - static COMPONENT_INSTANCES = "componentInstances"; - static COMPONENT_INSTANCES_RELATION = "componentInstancesRelations"; - static COMPONENT_INPUTS = "inputs"; - static COMPONENT_OUTPUTS = "outputs"; - static COMPONENT_METADATA = "metadata"; - static COMPONENT_DEPLOYMENT_ARTIFACTS = "deploymentArtifacts"; - static COMPONENT_INFORMATIONAL_ARTIFACTS = "artifacts"; - static COMPONENT_PROPERTIES = "properties"; - static COMPONENT_CAPABILITIES = "capabilities"; - static COMPONENT_CAPABILITIES_PROPERTIES = "instanceCapabiltyProperties"; - static COMPONENT_REQUIREMENTS = "requirements"; - static COMPONENT_TOSCA_ARTIFACTS = "toscaArtifacts"; - static COMPONENT_POLICIES = "policies"; - static COMPONENT_GROUPS = "groups"; - static COMPONENT_INTERFACE_OPERATIONS = "interfaces"; - static COMPONENT_INSTANCES_INTERFACES = "componentInstancesInterfaces"; - static COMPONENT_NON_EXCLUDED_GROUPS = "nonExcludedGroups"; - static COMPONENT_NON_EXCLUDED_POLICIES = "nonExcludedPolicies"; - static FORWARDING_PATHS = "forwardingPaths"; - static SERVICE_API_ARTIFACT = "serviceApiArtifacts"; + static COMPONENT_INSTANCES_PROPERTIES = "componentInstancesProperties"; + static COMPONENT_INSTANCES_INPUTS = "componentInstancesInputs"; + static COMPONENT_INSTANCES_ATTRIBUTES = "componentInstancesAttributes"; + static COMPONENT_INSTANCES_OUTPUTS = "componentInstancesOutputs"; + static COMPONENT_ATTRIBUTES = "attributes"; + static COMPONENT_INSTANCES = "componentInstances"; + static COMPONENT_INSTANCES_RELATION = "componentInstancesRelations"; + static COMPONENT_INPUTS = "inputs"; + static COMPONENT_OUTPUTS = "outputs"; + static COMPONENT_METADATA = "metadata"; + static COMPONENT_DEPLOYMENT_ARTIFACTS = "deploymentArtifacts"; + static COMPONENT_INFORMATIONAL_ARTIFACTS = "artifacts"; + static COMPONENT_PROPERTIES = "properties"; + static COMPONENT_CAPABILITIES = "capabilities"; + static COMPONENT_CAPABILITIES_PROPERTIES = "instanceCapabiltyProperties"; + static COMPONENT_REQUIREMENTS = "requirements"; + static COMPONENT_TOSCA_ARTIFACTS = "toscaArtifacts"; + static COMPONENT_POLICIES = "policies"; + static COMPONENT_GROUPS = "groups"; + static COMPONENT_INTERFACE_OPERATIONS = "interfaces"; + static COMPONENT_INSTANCES_INTERFACES = "componentInstancesInterfaces"; + static COMPONENT_NON_EXCLUDED_GROUPS = "nonExcludedGroups"; + static COMPONENT_NON_EXCLUDED_POLICIES = "nonExcludedPolicies"; + static FORWARDING_PATHS = "forwardingPaths"; + static SERVICE_API_ARTIFACT = "serviceApiArtifacts"; } export class SERVICE_FIELDS { - static FORWARDING_PATHS = "forwardingPaths"; - static NODE_FILTER = "nodeFilter"; - static SUBSTITUTION_FILTER = "substitutionFilter"; + static FORWARDING_PATHS = "forwardingPaths"; + static NODE_FILTER = "nodeFilter"; + static SUBSTITUTION_FILTER = "substitutionFilter"; } export class API_QUERY_PARAMS { - static INCLUDE = "include"; + static INCLUDE = "include"; } export enum TargetOrMemberType { - COMPONENT_INSTANCES, - GROUPS + COMPONENT_INSTANCES, + GROUPS } export class CANVAS_TAG_MODE { - static POLICY_TAGGING = "policy-tagging"; - static POLICY_TAGGING_HOVER = "policy-tagging-hover"; - static GROUP_TAGGING = "group-tagging"; - static GROUP_TAGGING_HOVER = "group-tagging-hover"; + static POLICY_TAGGING = "policy-tagging"; + static POLICY_TAGGING_HOVER = "policy-tagging-hover"; + static GROUP_TAGGING = "group-tagging"; + static GROUP_TAGGING_HOVER = "group-tagging-hover"; } export class DROPDOWN_OPTION_TYPE { - static SIMPLE = "Simple"; - static HEADER = "Header"; - static DISABLE = "Disable"; - static HORIZONTAL_LINE = "HorizontalLine"; + static SIMPLE = "Simple"; + static HEADER = "Header"; + static DISABLE = "Disable"; + static HORIZONTAL_LINE = "HorizontalLine"; } diff --git a/catalog-ui/src/app/view-models/workspace/tabs/general/general-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/general/general-view-model.ts index a1acfc73fa..8023ceecec 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/general/general-view-model.ts +++ b/catalog-ui/src/app/view-models/workspace/tabs/general/general-view-model.ts @@ -176,9 +176,6 @@ export class GeneralViewModel { this.initScope(); } - - - private initScopeValidation = ():void => { this.$scope.validation = new Validation(); this.$scope.validation.componentNameValidationPattern = this.ComponentNameValidationPattern; @@ -689,7 +686,6 @@ export class GeneralViewModel { } }; - this.EventListenerService.registerObserverCallback(EVENTS.ON_LIFECYCLE_CHANGE_WITH_SAVE, (nextState) => { if (this.$state.current.data.unsavedChanges && this.$scope.isValidForm) { this.$scope.save().then(() => { @@ -888,6 +884,10 @@ export class GeneralViewModel { } return metadatakey != null; } + + this.$scope.isNotApplicableMetadataKeys = (key: string): boolean => { + return this.$scope.component.categories && this.$scope.component.categories[0].notApplicableMetadataKeys && this.$scope.component.categories[0].notApplicableMetadataKeys.some(item => item === key); + } } private filterCategoriesByModel(modelName:string) { @@ -897,7 +897,6 @@ export class GeneralViewModel { !modelName ? !category.models || category.models.indexOf(DEFAULT_MODEL_NAME) !== -1 : category.models !== null && category.models.indexOf(modelName) !== -1); } - private filterBaseTypesByModelAndCategory(modelName:string) { let categories = this.$scope.component.categories; if (categories) { diff --git a/catalog-ui/src/app/view-models/workspace/tabs/general/general-view.html b/catalog-ui/src/app/view-models/workspace/tabs/general/general-view.html index 1fb8d5f10f..4704feb71e 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/general/general-view.html +++ b/catalog-ui/src/app/view-models/workspace/tabs/general/general-view.html @@ -14,644 +14,638 @@ ~ limitations under the License. -->
-
-
- Click save to update to the new VSP -
- - + -
-
+
+ -
+
-
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
- -
- - - -
- - - - - -
-
- - - -
- - -
- - - -
- - - - -
- - -
-
- -
-
- - - -
- -
- - -
- -
-
-
- - -
-
- - -
- -
-
-
- - -
-
-
- -
- - - - -
- - -
+ ng-model="component.icon" + tooltips tooltip-content='{{component.icon | translate}}' + >
- - - -
- - - - -
- - - -
+
+
+
+ +
+ + + +
+ + + + +
- - -
- -
- -
- - - - - -
- - -
- -
- {{(fileModel && fileModel.filename) || importedToscaBrowseFileText }} -
- -
Browse
-
-
- -
- - - - - -
- - - -
- - - -
- - - -
-
- - - -
- - - -
- - - -
- +
+ + + +
+ + +
+ + + +
+ + + + +
+ +
- - - - -
- - - -
- - - -
+
+ +
+
+ + +
+ +
+ + +
+
- - - -
- - - -
- - -
+
+
+ + +
+
+ + +
+
- - - - -
- - -
- -
-
- - - -
-
-
- -
-
- -
- -
-
- - -
-
- - -
-
- - - -
-
-
- -
-
- -
- -
-
- - -
-
- - -
-
- - - -
-
-
- -
-
- -
- -
-
- - -
-
- - -
-
- - -
-
-
- -
-
- -
- -
-
- - -
-
- - -
-
- - - - -
- - - - -
- - - -
- - -
- - - - -
-
-
- - -
-
-
-
- - -
-
-
- - - - -
+
+
+ + +
+
+
+ + + +
+ + + + +
+ + +
+
+ + + +
+ + + +
+ + + +
+
+ + +
+ +
+ +
+ + + +
+ + +
+ +
+ {{(fileModel && fileModel.filename) || importedToscaBrowseFileText }} +
+ +
Browse
+
+
+ +
+ + + + + +
+ + + +
+ + + +
+ + + +
+
+ + + +
+ + + +
+ + + +
+ +
+ + + +
+ + + +
+ + + +
+
+ + + +
+ + + +
+ + +
+
+ + + +
+ + +
+ +
+
+ + + +
+
+
+ +
+
+ +
+ +
+
+ + +
+
+ + +
+
+ + + +
+
+
+ +
+
+ +
+ +
+
+ + +
+
+ + +
+
+ + + +
+
+
+ +
+
+ +
+ +
+
+ + +
+
+ + +
+
+ + + +
+
+
+ +
+
+ +
+ +
+
+ + +
+
+ + +
+
+ + + +
+ + + + +
+ + + +
+ + +
+ + + +
+
+
+ + +
+
+
+
+ + +
+
+
+ + + +
+
-
+
- +
-- cgit 1.2.3-korg