From 70c17bb345b6ed957290eec776c026d3a25f48a1 Mon Sep 17 00:00:00 2001 From: franciscovila Date: Thu, 15 Sep 2022 14:20:35 +0100 Subject: Fix types not refreshing after model change Loads the capability, requirement and node types based on the current VFC model. Removes the frontend cache that was being hold by the ReqAndCapabilitiesService. Issue-ID: SDC-4175 Signed-off-by: franciscovila Change-Id: I6ab9d1781c6d65e0d78ff69baf468fb9d24f9afd --- .../req-and-capabilities.service.ts | 32 +++++++--------------- 1 file changed, 10 insertions(+), 22 deletions(-) (limited to 'catalog-ui/src/app/ng2/pages') diff --git a/catalog-ui/src/app/ng2/pages/workspace/req-and-capabilities/req-and-capabilities.service.ts b/catalog-ui/src/app/ng2/pages/workspace/req-and-capabilities/req-and-capabilities.service.ts index f999c2e627..e7b39c0a84 100644 --- a/catalog-ui/src/app/ng2/pages/workspace/req-and-capabilities/req-and-capabilities.service.ts +++ b/catalog-ui/src/app/ng2/pages/workspace/req-and-capabilities/req-and-capabilities.service.ts @@ -16,9 +16,6 @@ export class ReqAndCapabilitiesService { private capabilityTypesList: CapabilityTypeModel[]; private relationshipTypesList: RelationshipTypeModel[]; private nodeTypesList: NodeTypeModel[]; - private capabilitiesListUpdated: boolean = false; - private requirementsListUpdated: boolean = false; - private nodeTypeListUpdated: boolean = false; readonly INPUTS_FOR_REQUIREMENTS: string = 'INPUTS_FOR_REQUIREMENTS'; readonly INPUTS_FOR_CAPABILITIES: string = 'INPUTS_FOR_CAPABILITIES'; @@ -41,28 +38,19 @@ export class ReqAndCapabilitiesService { public async initInputs(initInputsFor: string) { - if (!this.capabilitiesListUpdated){ - // -- COMMON for both -- - this.capabilityTypesList = []; - let capabilityTypesResult = await this.toscaTypesServiceNg2.fetchCapabilityTypes(this.workspaceService.metadata.model); - Object.keys(capabilityTypesResult).forEach(key => {this.capabilityTypesList.push(capabilityTypesResult[key])}) - this.capabilitiesListUpdated = true; - } + // -- COMMON for both -- + this.capabilityTypesList = []; + let capabilityTypesResult = await this.toscaTypesServiceNg2.fetchCapabilityTypes(this.workspaceService.metadata.model); + Object.keys(capabilityTypesResult).forEach(key => {this.capabilityTypesList.push(capabilityTypesResult[key])}) if (initInputsFor === 'INPUTS_FOR_REQUIREMENTS') { - if (!this.requirementsListUpdated){ - this.relationshipTypesList = []; - let relationshipTypesResult = await this.toscaTypesServiceNg2.fetchRelationshipTypes(this.workspaceService.metadata.model); - Object.keys(relationshipTypesResult).forEach(key => {this.relationshipTypesList.push(relationshipTypesResult[key])}); - this.requirementsListUpdated = true; - } + this.relationshipTypesList = []; + let relationshipTypesResult = await this.toscaTypesServiceNg2.fetchRelationshipTypes(this.workspaceService.metadata.model); + Object.keys(relationshipTypesResult).forEach(key => {this.relationshipTypesList.push(relationshipTypesResult[key])}); - if (!this.nodeTypeListUpdated){ - this.nodeTypesList = []; - let nodeTypesResult = await this.toscaTypesServiceNg2.fetchNodeTypes(); - Object.keys(nodeTypesResult).forEach(key => {this.nodeTypesList.push(nodeTypesResult[key])}) - this.nodeTypeListUpdated = true; - } + this.nodeTypesList = []; + let nodeTypesResult = await this.toscaTypesServiceNg2.fetchNodeTypes(this.workspaceService.metadata.model); + Object.keys(nodeTypesResult).forEach(key => {this.nodeTypesList.push(nodeTypesResult[key])}) } } -- cgit 1.2.3-korg