re base code

Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5
Issue-ID: SDC-1566
Signed-off-by: Michael Lando <ml636r@att.com>

2 files changed, 5 insertions, 5 deletions

diff --git a/catalog-ui/src/app/directives/graphs-v2/deployment-graph/deployment-graph.directive.ts b/catalog-ui/src/app/directives/graphs-v2/deployment-graph/deployment-graph.directive.ts
index c542e9fc95..f335ea02d9 100644
--- a/catalog-ui/src/app/directives/graphs-v2/deployment-graph/deployment-graph.directive.ts
+++ b/catalog-ui/src/app/directives/graphs-v2/deployment-graph/deployment-graph.directive.ts
@@ -54,7 +54,7 @@ export class DeploymentGraph implements ng.IDirective {
     link = (scope: IDeploymentGraphScope, el: JQuery) => {
 
         if (scope.component.isResource()) {
-            if (scope.component.componentInstances && scope.component.componentInstancesRelations && scope.component.groups) {
+            if (scope.component.componentInstances && scope.component.componentInstancesRelations && scope.component.modules) {
                 this.loadGraph(scope, el);
             } else {
                 this.eventListenerService.registerObserverCallback(GRAPH_EVENTS.ON_DEPLOYMENT_GRAPH_DATA_LOADED, () => {
@@ -65,8 +65,8 @@ export class DeploymentGraph implements ng.IDirective {
     };
 
     public initGraphNodes = (cy: Cy.Instance, component: Component): void => {
-        if (component.groups) { // Init module nodes
-            _.each(component.groups, (groupModule: Module) => {
+        if (component.modules) { // Init module nodes
+            _.each(component.modules, (groupModule: Module) => {
                 let moduleNode = this.NodesFactory.createModuleNode(groupModule);
                 this.commonGraphUtils.addNodeToGraph(cy, moduleNode);
 
@@ -74,7 +74,7 @@ export class DeploymentGraph implements ng.IDirective {
         }
         _.each(component.componentInstances, (instance: ComponentInstance) => { // Init component instance nodes
             let componentInstanceNode = this.NodesFactory.createNode(instance);
-            componentInstanceNode.parent = this.deploymentGraphGeneralUtils.findInstanceModule(component.groups, instance.uniqueId);
+            componentInstanceNode.parent = this.deploymentGraphGeneralUtils.findInstanceModule(component.modules, instance.uniqueId);
             if (componentInstanceNode.parent) { // we are not drawing instances that are not a part of a module
                 this.commonGraphUtils.addComponentInstanceNodeToGraph(cy, componentInstanceNode);
             }
diff --git a/catalog-ui/src/app/directives/graphs-v2/deployment-graph/deployment-utils/deployment-graph-general-utils.ts b/catalog-ui/src/app/directives/graphs-v2/deployment-graph/deployment-utils/deployment-graph-general-utils.ts
index 3a90115179..ebd1f5b205 100644
--- a/catalog-ui/src/app/directives/graphs-v2/deployment-graph/deployment-utils/deployment-graph-general-utils.ts
+++ b/catalog-ui/src/app/directives/graphs-v2/deployment-graph/deployment-utils/deployment-graph-general-utils.ts
@@ -32,7 +32,7 @@ export class DeploymentGraphGeneralUtils {
 
     public findInstanceModule = (groupsArray:Array<Module>, componentInstanceId:string):string => {
         let parentGroup:Module = _.find(groupsArray, (group:Module) => {
-            return _.find(group.members, (member) => {
+            return _.find((<any>Object).values(group.members), (member: string) => {
                 return member === componentInstanceId;
             });
         });