From dfe876e2cf1857d1b689982a0a16cb768caf9fa2 Mon Sep 17 00:00:00 2001
From: Elena Oresharova <elena.oresharova@sap.com>
Date: Tue, 3 Dec 2019 16:17:20 +0100
Subject: [PATCH] Fix 'City Name' label for the Address

---
 packages/bookshop/app/_i18n/i18n.properties   |  1 +
 .../bookshop/app/orders/fiori-service.cds     | 34 ++++++++++---------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/packages/bookshop/app/_i18n/i18n.properties b/packages/bookshop/app/_i18n/i18n.properties
index d08ea9c4..2226d7c4 100644
--- a/packages/bookshop/app/_i18n/i18n.properties
+++ b/packages/bookshop/app/_i18n/i18n.properties
@@ -12,6 +12,7 @@ Order = Order
 Orders = Orders
 Price = Price
 ShippingAddress = Shipping Address
+CityName = City Name
 HouseNumber = House Number
 StreetName = Street Name
 PostalCode = Postal Code
diff --git a/packages/bookshop/app/orders/fiori-service.cds b/packages/bookshop/app/orders/fiori-service.cds
index 05d22c22..7d1cdbdf 100644
--- a/packages/bookshop/app/orders/fiori-service.cds
+++ b/packages/bookshop/app/orders/fiori-service.cds
@@ -35,12 +35,25 @@ annotate AdminService.Orders with {
 					{ $Type: 'Common.ValueListParameterDisplayOnly', ValueListProperty: 'StreetName'},
 					{ $Type: 'Common.ValueListParameterDisplayOnly', ValueListProperty: 'HouseNumber'},
 				]
-			}
+			},
+			SideEffects : {
+    		EffectTypes      : #ValueChange,
+    		SourceProperties : [shippingAddress_AddressID],
+    		TargetProperties : [
+      		shippingAddress.HouseNumber,
+      		shippingAddress.StreetName,
+      		shippingAddress.CityName,
+					shippingAddress.PostalCode
+    		]
+  		}
 		}
 	);
 }
 
-
+////////////////////////////////////////////////////////////////////////////
+//
+//	UI
+//
 annotate AdminService.Orders with @(
 	UI: {
 		////////////////////////////////////////////////////////////////////////////
@@ -65,9 +78,11 @@ annotate AdminService.Orders with @(
 			Description: {Value: createdBy}
 		},
 		Identification: [ //Is the main field group
+			// labels not considered
 			{Value: createdBy, Label:'Customer'},
 			{Value: createdAt, Label:'Date'},
 			{Value: OrderNo },
+			{Value: 'shippingAddress_AddressID', Label: 'Address ID'}
 		],
 		HeaderFacets: [
 			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Created}', Target: '@UI.FieldGroup#Created'},
@@ -95,34 +110,21 @@ annotate AdminService.Orders with @(
 				{Value: modifiedAt},
 			]
 		},
-		// TODO: Trigger side effects when `shippingAddress_AddressID` is changed
 		FieldGroup#ShippingAddress: {
 			Data: [
 				{Value: shippingAddress_AddressID, Label:'{i18n>ShippingAddress}'},
 				{Value: shippingAddress.HouseNumber, Label:'{i18n>HouseNumber}'},
 				{Value: shippingAddress.StreetName, Label:'{i18n>StreetName}'},
-				{Value: shippingAddress.CityName, Labe:'{i18n>CityName}'},
+				{Value: shippingAddress.CityName, Label:'{i18n>CityName}'},
 				{Value: shippingAddress.PostalCode, Label:'{i18n>PostalCode}'},
 			]
 		},
 	},
-  Common.SideEffects : {
-    EffectTypes      : #ValueChange,
-    SourceProperties : [shippingAddress_AddressID],
-    TargetProperties : [
-      shippingAddress.HouseNumber,
-      shippingAddress.StreetName,
-      shippingAddress.CityName,
-			shippingAddress.PostalCode
-    ]
-  },
 ) {
 	createdAt @UI.HiddenFilter:false;
 	createdBy @UI.HiddenFilter:false;
 };
 
-
-
 //The enity types name is AdminService.my_bookshop_OrderItems
 //The annotations below are not generated in edmx WHY?
 annotate AdminService.OrderItems with @(