summaryrefslogtreecommitdiffstats
path: root/catalog-ui
diff options
context:
space:
mode:
authorKrupaNagabhushan <krupa.nagabhushan@est.tech>2021-07-15 15:29:02 +0100
committerMichael Morris <michael.morris@est.tech>2021-07-28 13:04:26 +0000
commitdd2e1700187449a017b75589aeb0c2dfb989dec7 (patch)
tree278eea3690a5cf47e6c50188412727d226840b7f /catalog-ui
parent938548c5c6c1935f426b6f9e671d969e15371389 (diff)
Consider component model when retrieving capability types
Issue-ID: SDC-3642 Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech> Change-Id: Ie09b5f8d64b95fc2db14f19d3857a9935075b2fe
Diffstat (limited to 'catalog-ui')
-rw-r--r--catalog-ui/src/app/ng2/pages/workspace/req-and-capabilities/req-and-capabilities.service.ts2
-rw-r--r--catalog-ui/src/app/ng2/services/tosca-types.service.ts12
2 files changed, 10 insertions, 4 deletions
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 f9b98c6b96..f999c2e627 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
@@ -44,7 +44,7 @@ export class ReqAndCapabilitiesService {
if (!this.capabilitiesListUpdated){
// -- COMMON for both --
this.capabilityTypesList = [];
- let capabilityTypesResult = await this.toscaTypesServiceNg2.fetchCapabilityTypes();
+ let capabilityTypesResult = await this.toscaTypesServiceNg2.fetchCapabilityTypes(this.workspaceService.metadata.model);
Object.keys(capabilityTypesResult).forEach(key => {this.capabilityTypesList.push(capabilityTypesResult[key])})
this.capabilitiesListUpdated = true;
}
diff --git a/catalog-ui/src/app/ng2/services/tosca-types.service.ts b/catalog-ui/src/app/ng2/services/tosca-types.service.ts
index 2fc2e7a089..fc728111bd 100644
--- a/catalog-ui/src/app/ng2/services/tosca-types.service.ts
+++ b/catalog-ui/src/app/ng2/services/tosca-types.service.ts
@@ -40,15 +40,21 @@ export class ToscaTypesServiceNg2 {
}
async fetchRelationshipTypes(modelName: string): Promise<RelationshipTypesMap> {
- return this.http.get<RelationshipTypesMap>(this.baseUrl + 'relationshipTypes', {params: {model: modelName}}).toPromise();
+ if(modelName) {
+ return this.http.get<RelationshipTypesMap>(this.baseUrl + 'relationshipTypes', {params: {model: modelName}}).toPromise();
+ }
+ return this.http.get<RelationshipTypesMap>(this.baseUrl + 'relationshipTypes').toPromise();
}
async fetchNodeTypes(): Promise<NodeTypesMap> {
return this.http.get<NodeTypesMap>(this.baseUrl + 'nodeTypes').toPromise();
}
- async fetchCapabilityTypes(): Promise<CapabilityTypesMap> {
+ async fetchCapabilityTypes(modelName: string): Promise<CapabilityTypesMap> {
+ if(modelName) {
+ return this.http.get<CapabilityTypesMap>(this.baseUrl + 'capabilityTypes', {params: {model: modelName}}).toPromise();
+ }
return this.http.get<CapabilityTypesMap>(this.baseUrl + 'capabilityTypes').toPromise();
- }
+ }
}