From 1008bd16e2e338daf40cdbb3fc5824a2299eeac7 Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Wed, 21 Aug 2019 17:35:16 +0200
Subject: [PATCH] 64424: Angular impact of changes to relationship type changes

---
 .../simple/item-types/shared/item-relationships-utils.ts  | 8 ++++----
 .../models/items/normalized-relationship-type.model.ts    | 4 ++--
 .../shared/item-relationships/relationship-type.model.ts  | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/app/+item-page/simple/item-types/shared/item-relationships-utils.ts b/src/app/+item-page/simple/item-types/shared/item-relationships-utils.ts
index 65ad743245..091bd4f406 100644
--- a/src/app/+item-page/simple/item-types/shared/item-relationships-utils.ts
+++ b/src/app/+item-page/simple/item-types/shared/item-relationships-utils.ts
@@ -58,10 +58,10 @@ export const filterRelationsByTypeLabel = (label: string, thisId?: string) =>
         return relatedItems$.pipe(
           map((arr) => relsCurrentPage.filter((rel: Relationship, idx: number) =>
             hasValue(relTypesCurrentPage[idx]) && (
-              (hasNoValue(thisId) && (relTypesCurrentPage[idx].leftLabel === label ||
-                relTypesCurrentPage[idx].rightLabel === label)) ||
-              (thisId === arr[idx][0].id && relTypesCurrentPage[idx].leftLabel === label) ||
-              (thisId === arr[idx][1].id && relTypesCurrentPage[idx].rightLabel === label)
+              (hasNoValue(thisId) && (relTypesCurrentPage[idx].leftwardType === label ||
+                relTypesCurrentPage[idx].rightwardType === label)) ||
+              (thisId === arr[idx][0].id && relTypesCurrentPage[idx].leftwardType === label) ||
+              (thisId === arr[idx][1].id && relTypesCurrentPage[idx].rightwardType === label)
             )
           ))
         );
diff --git a/src/app/core/cache/models/items/normalized-relationship-type.model.ts b/src/app/core/cache/models/items/normalized-relationship-type.model.ts
index 800b27cd7e..23c3333a9b 100644
--- a/src/app/core/cache/models/items/normalized-relationship-type.model.ts
+++ b/src/app/core/cache/models/items/normalized-relationship-type.model.ts
@@ -23,7 +23,7 @@ export class NormalizedRelationshipType extends NormalizedObject<RelationshipTyp
    * The label that describes the Relation to the left of this RelationshipType
    */
   @autoserialize
-  leftLabel: string;
+  leftwardType: string;
 
   /**
    * The maximum amount of Relationships allowed to the left of this RelationshipType
@@ -41,7 +41,7 @@ export class NormalizedRelationshipType extends NormalizedObject<RelationshipTyp
    * The label that describes the Relation to the right of this RelationshipType
    */
   @autoserialize
-  rightLabel: string;
+  rightwardType: string;
 
   /**
    * The maximum amount of Relationships allowed to the right of this RelationshipType
diff --git a/src/app/core/shared/item-relationships/relationship-type.model.ts b/src/app/core/shared/item-relationships/relationship-type.model.ts
index 98454bc000..06ac94b041 100644
--- a/src/app/core/shared/item-relationships/relationship-type.model.ts
+++ b/src/app/core/shared/item-relationships/relationship-type.model.ts
@@ -33,7 +33,7 @@ export class RelationshipType implements CacheableObject {
   /**
    * The label that describes the Relation to the left of this RelationshipType
    */
-  leftLabel: string;
+  leftwardType: string;
 
   /**
    * The maximum amount of Relationships allowed to the left of this RelationshipType
@@ -48,7 +48,7 @@ export class RelationshipType implements CacheableObject {
   /**
    * The label that describes the Relation to the right of this RelationshipType
    */
-  rightLabel: string;
+  rightwardType: string;
 
   /**
    * The maximum amount of Relationships allowed to the right of this RelationshipType