Final commit to master merge from

Change-Id: Ib464f9a8828437c86fe6def8af238aaf83473507
Issue-ID: SDC-714
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/catalog-ui/src/app/directives/capabilities-and-requirements/requirement/requirements-list-directive.ts b/catalog-ui/src/app/directives/capabilities-and-requirements/requirement/requirements-list-directive.ts
index 1c5c333d27..14cafa98c4 100644
--- a/catalog-ui/src/app/directives/capabilities-and-requirements/requirement/requirements-list-directive.ts
+++ b/catalog-ui/src/app/directives/capabilities-and-requirements/requirement/requirements-list-directive.ts
@@ -28,7 +28,7 @@
  * Created by obarda on 1/8/2017.
  */
 'use strict';
-import {RequirementsGroup, Component} from "app/models";
+import {RequirementsGroup, Component, Relationship, RelationshipModel} from "app/models";
 
 export interface IRequirementsListScope extends ng.IScope {
 
@@ -62,12 +62,11 @@ export class RequirementsListDirective implements ng.IDirective {
 
         scope.getRelation = (requirement:any):any => {
             if (scope.isInstanceSelected() && scope.component.componentInstancesRelations) {
-                let relationItem = _.filter(scope.component.componentInstancesRelations, (relation:any) => {
+                let relationItem:Array<RelationshipModel> = _.filter((<Component>scope.component).componentInstancesRelations, (relation:RelationshipModel) => {
                     return relation.fromNode === scope.component.selectedInstance.uniqueId &&
-                        _.some(relation.relationships, {
-                            'requirement': requirement.name,
-                            'requirementOwnerId': requirement.ownerId
-                        });
+                        _.filter(relation.relationships, (relationship:Relationship) => {
+                            return relationship.relation.requirement == requirement.name && relationship.relation.requirementOwnerId == requirement.ownerId;
+                        }).length;
                 });
 
                 if (relationItem && relationItem.length) {