@sap/open.fe 1.97.0 → 1.98.0

package/packages/sap.fe.core/test/sap/fe/core/relnotes/changes-1.98.json

@@ -0,0 +1,363 @@
+{
+  "1.98.0": {
+    "date": "January 2022",
+    "notes": [
+      {
+        "id": "2d1f4edb2db6a9d5358635468d668a78cd0c5c18",
+        "type": "FIX",
+        "text": " The documentation for custom hooks has been updated",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "2280013846"
+          }
+        ]
+      },
+      {
+        "id": "d95e0a218fb2b7c4c1525c3544d4454ad541791b",
+        "type": "FIX",
+        "text": " The progress bar now shows the correct value for the currency, even if it is hard coded",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "2170237164"
+          }
+        ]
+      },
+      {
+        "id": "b158f1fa896b996a89e61aef58346df2ef5cb545",
+        "type": "FEATURE",
+        "text": " Applications can now use the Mass Edit feature in list reports"
+      },
+      {
+        "id": "6514158945ff77cf57c8d03758727145b25865ea",
+        "type": "FIX",
+        "text": " SideEffects for actions now request the correct path expressions",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "2170332124"
+          }
+        ]
+      },
+      {
+        "id": "44890af40e39897fae19b862a4adf7a747410d2c",
+        "type": "FEATURE",
+        "text": " SAP Fiori elements now provides hooks for your custom code before standard actions are executed"
+      },
+      {
+        "id": "16a787dceaa6b9c806dd11f07f26c2714a1667c8",
+        "type": "FIX",
+        "text": " The issue related to malformed queries on subobject pages has been fixed",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "2180402182"
+          }
+        ]
+      },
+      {
+        "id": "8d19b0ac0984c96fe64ff5dbed49e8f4baa3e68d",
+        "type": "FIX",
+        "text": " sap.ui.Integration files are now loaded only when necessary",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "2180391454"
+          }
+        ]
+      },
+      {
+        "id": "60700b5920d48582e43c3ee907792ca9bb57fe32",
+        "type": "FIX",
+        "text": " The shared email link for cFLP apps is now fixed",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "2170230319"
+          }
+        ]
+      },
+      {
+        "id": "521ca5261e77d5795602355c2d914f85b8c5f148",
+        "type": "FIX",
+        "text": " The issues relating to the 'Share' button have been resolved",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "2170267078"
+          }
+        ]
+      },
+      {
+        "id": "6fc09bea7bd7079a505accb939e47542f66458ad",
+        "type": "FIX",
+        "text": " Evaluate enabled properties from the manifest for menu actions",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "2180418123"
+          }
+        ]
+      },
+      {
+        "id": "45e6dd9a2e19d35dd9f1ee0337551c58646df72a",
+        "type": "FIX",
+        "text": " Progress bar graphical display is now correct when displayed value switches to zero",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "2180402161"
+          }
+        ]
+      },
+      {
+        "id": "5728c21024a198d122c2f0fa5c8dfce0eeecd9de",
+        "type": "FIX",
+        "text": " The delete button is now visible in List Report Table for non-draft applications if the bound entity is deletable",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "2180415519"
+          }
+        ]
+      },
+      {
+        "id": "5b8c1469acab1cc98e70c59cb9cc6aa5a59419ca",
+        "type": "FIX",
+        "text": " A wrong annotation column key referenced in the manifest no longer prevents the application from starting",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "2180406547"
+          }
+        ]
+      },
+      {
+        "id": "e8e70fa1a51548babb6e3d07a18d6ac812c50464",
+        "type": "FIX",
+        "text": " SAP Fiori elements now properly supports SelectionPresentationVariant with multiple Ranges",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "2180415475"
+          }
+        ]
+      },
+      {
+        "id": "a41d066615069075689807a9098d92cb65825690",
+        "type": "FIX",
+        "text": " You can now correctly set the visibility for subsection titles",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "2180408045"
+          }
+        ]
+      },
+      {
+        "id": "10aa545d19a4b1b8258c1b8006b8d639660ff52b",
+        "type": "FEATURE",
+        "text": " Column width calculation in tables has been disabled on phone"
+      },
+      {
+        "id": "835a0888f46e6d889b5013606e7c51ddd1f1f4a2",
+        "type": "FEATURE",
+        "text": " The button to enable fullscreen mode for a table is now available by default on mobile devices"
+      },
+      {
+        "id": "e7d0738e032786a03ac1d096b05dafae4a412c98",
+        "type": "FIX",
+        "text": " Facet hidden annotation are now set correctly",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "2170316605"
+          }
+        ]
+      },
+      {
+        "id": "fca0dba1af3dd786fa1b35f55cf829eb269f8d71",
+        "type": "FIX",
+        "text": " The display of semantic links is now set correctly in the list report",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "2180402805"
+          }
+        ]
+      },
+      {
+        "id": "110e34e93df15ae151b97f2c1056065e095dcdac",
+        "type": "FIX",
+        "text": " The support of dynamic expressions in facets is set now correctly",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "2170282639"
+          }
+        ]
+      },
+      {
+        "id": "ac6c9ff21f4ec50b3d560e0cbdb492c90167745b",
+        "type": "FEATURE",
+        "text": " The list report now stores/restores the table personalization into the iAppState"
+      },
+      {
+        "id": "6dee94892af1174e0249a6cd64d1c566547c7746",
+        "type": "FEATURE",
+        "text": " The building block for the filter bar now provides default filter values"
+      },
+      {
+        "id": "cf0c4356aab04cdcaf5f0edc58c00dc9d6b19247",
+        "type": "FIX",
+        "text": " Based on the settings you make in the SAP Fiori launchpad, external navigation now opens in a new tab",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "002075129500007350822021"
+          }
+        ]
+      },
+      {
+        "id": "db014b00f0c174862cbcc9548156b15ef42f9620",
+        "type": "FIX",
+        "text": " The issue related to the duplication of a newly created item in flexible column mode has been fixed",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "2170219776"
+          }
+        ]
+      },
+      {
+        "id": "777ccf9a442fffed954d97ad6907538592c5d289",
+        "type": "FIX",
+        "text": " A SideEffect is now requested only if really required"
+      },
+      {
+        "id": "bad3ff5fe8dc01e3f61bc344cf4559990560f918",
+        "type": "FIX",
+        "text": " Column tooltips are now correctly displayed in the 'Settings' dialog",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "2170309258"
+          }
+        ]
+      },
+      {
+        "id": "9bf9d4990429d5f993b75648579886061b164826",
+        "type": "FIX",
+        "text": " Further improvements were made for action dialogs using the preferredMode create/createWith parameter",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "2170326311"
+          }
+        ]
+      },
+      {
+        "id": "be1117510cd4ee273eb2f9579a459463180df829",
+        "type": "FEATURE",
+        "text": " SAP Fiori elements now enables you to navigate to a different internal target"
+      },
+      {
+        "id": "2735847eb6956bdeb5e76120f5200c355f4de6c1",
+        "type": "FIX",
+        "text": " The missing key 'Warning' has been added to the messageBundle.properties file to enable translation",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "2170314917"
+          }
+        ]
+      },
+      {
+        "id": "1e23ffd7112095886bcf239058e1e9543907b28f",
+        "type": "FIX",
+        "text": " SAP Fiori elements now correctly displays the MultiValueField when using a DataField that has a 1:1 with a 1:n navigation",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "2170248261"
+          }
+        ]
+      },
+      {
+        "id": "ce2c9f1e3be676a8083d3823bee8d43dbf1d3139",
+        "type": "FIX",
+        "text": " Columns now support the property type 'binary'",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "2180381903"
+          }
+        ]
+      },
+      {
+        "id": "5f9ad0add514a92470be64bd6ac4c854caa48b91",
+        "type": "FIX",
+        "text": " Applications can now define an individual title for action dialogs using the preferredMode create/createWith parameter",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "2170326311"
+          }
+        ]
+      },
+      {
+        "id": "cea6e821da62fffded3800767bb2426735d164be",
+        "type": "FEATURE",
+        "text": " In the list report, the search field is now also available when you use an analytical table"
+      },
+      {
+        "id": "9ed0eb754813331ba4025013771eca29d3145363",
+        "type": "FIX",
+        "text": " Within a table, the label of a field is now properly aligned with its value"
+      },
+      {
+        "id": "19690c83b199a0cfc7ab38295100a4642b066ff6",
+        "type": "FEATURE",
+        "text": " Side effects are now available for Edm.Stream properties"
+      },
+      {
+        "id": "091959bf20a06ec10387683f6c253cd0b3374896",
+        "type": "FIX",
+        "text": " Dynamic expression now correctly respect operator precedence"
+      },
+      {
+        "id": "5cebd3888dd18df96ee7f299d95a07500594af17",
+        "type": "FIX",
+        "text": " The unit of measure is now correctly displayed in the progress bar"
+      },
+      {
+        "id": "2d72cf999be1c361a8072b9e42b8e7bd660f0a78",
+        "type": "FEATURE",
+        "text": " Navigation to an app by clicking on the header of a KPI card is now supported"
+      },
+      {
+        "id": "279c23061aaa126378e4998cf4935071bef52dfa",
+        "type": "FIX",
+        "text": " The Create Button on the List Report table is now visible if insertion is switched off and external creation is maintained",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "2170323614"
+          }
+        ]
+      },
+      {
+        "id": "9d0f27019e9b5ce00ad91dcace905826acc44981",
+        "type": "FIX",
+        "text": " When you discard a newly created draft in a list report, the navigation now works correctly",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "2170246068"
+          }
+        ]
+      }
+    ]
+  }
+}

package/packages/sap.fe.macros/src/sap/fe/macros/.library

@@ -6,7 +6,7 @@
     <copyright>SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     </copyright>
-    <version>1.97.0</version>
+    <version>1.98.0</version>
 
     <documentation>UI5 library: sap.fe.macros</documentation>
 

package/packages/sap.fe.macros/src/sap/fe/macros/.theming

@@ -1,6 +1,6 @@
 {
   "sEntity": "Library",
   "sId": "sap/fe/macros",
-  "sVersion": "1.97.0",
+  "sVersion": "1.98.0",
   "bIgnore": true
 }

package/packages/sap.fe.macros/src/sap/fe/macros/Chart.fragment.xml

@@ -21,7 +21,7 @@
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
 	xmlns:unittest="http://schemas.sap.com/sapui5/preprocessorextension/sap.fe.unittesting/1"
 	xmlns:mdc="sap.ui.mdc"
-	xmlns:chart="sap.ui.mdc.chartNew"
+	xmlns:chart="sap.ui.mdc.chart"
 	xmlns:mdcat="sap.ui.mdc.actiontoolbar"
 	xmlns:core="sap.ui.core"
 	xmlns:macro="sap.fe.macros"
@@ -38,7 +38,7 @@
 		<template:with path="metaPath>" helper="COMMON.createPresentationPathContext" var="presentationPath">
 			<template:with path="metaPath>" helper="HELPER.getUiChart" var="chart">
 				<macro:ChartAPI id="{this>_apiId}" selectionChange="{this>selectionChange}">
-					<mdc:ChartNew
+					<mdc:Chart
 						core:require="{API: 'sap/fe/macros/ChartAPI'}"
 						binding="{= '{internal>controls/' + ${this>id} + '}' }"
 						unittest:id="ChartMacroFragment"
@@ -69,7 +69,7 @@
 							<template:if test="{= ${chart>Dimensions} }">
 								<template:with path="chart>" helper="HELPER.formatDimensions" var="dimensions">
 									<template:repeat list="{dimensions>}" var="dimension">
-										<chart:ItemNew
+										<chart:Item
 											id="{= ID.generate([${this>id}, 'dimension', ${dimension>key}]) }"
 											name="{dimension>key}"
 											type="groupable"
@@ -81,7 +81,7 @@
 							</template:if>
 							<template:with path="chart>" helper="HELPER.formatMeasures" var="measures">
 								<template:repeat list="{measures>}" var="measure">
-									<chart:ItemNew
+									<chart:Item
 										id="{= ID.generate([${this>id},'measure', ${measure>key}]) }"
 										name="{measure>key}"
 										type="aggregatable"
@@ -166,7 +166,7 @@
 									</chart:detailsItemActions>
 								</chart:SelectionDetailsActions>
 							</mdc:selectionDetailsActions> -->
-						</mdc:ChartNew>
+						</mdc:Chart>
 					</macro:ChartAPI>
 				</template:with>
 			</template:with>

package/packages/sap.fe.macros/src/sap/fe/macros/Chart.metadata-dbg.js

@@ -73,7 +73,6 @@ sap.ui.define(
 					 */
 					metaPath: {
 						type: "sap.ui.model.Context",
-						required: true,
 						isPublic: true
 					},
 					/**
@@ -81,7 +80,6 @@ sap.ui.define(
 					 */
 					contextPath: {
 						type: "sap.ui.model.Context",
-						required: true,
 						isPublic: true
 					},
 					/**

package/packages/sap.fe.macros/src/sap/fe/macros/Chart.metadata.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["./MacroMetadata","sap/fe/core/templating/DataModelPathHelper","sap/fe/core/converters/MetaModelConverter","sap/fe/core/converters/controls/Common/DataVisualization"],function(M,D,a,b){"use strict";var C=M.extend("sap.fe.macros.Chart",{name:"Chart",namespace:"sap.fe.macros.internal",publicNamespace:"sap.fe.macros",publicName:"Chart",fragment:"sap.fe.macros.Chart",metadata:{stereotype:"xmlmacro",properties:{chartDefinition:{type:"sap.ui.model.Context"},id:{type:"string",isPublic:true},_applyIdToContent:{type:"boolean",defaultValue:false},metaPath:{type:"sap.ui.model.Context",required:true,isPublic:true},contextPath:{type:"sap.ui.model.Context",required:true,isPublic:true},height:{type:"string",defaultValue:"400px"},width:{type:"string",defaultValue:"100%"},selectionMode:{type:"string",defaultValue:"MULTIPLE",isPublic:true},personalization:{type:"string|boolean",isPublic:true},filter:{type:"string"},noDataText:{type:"string"},chartDelegate:{type:"string"},vizProperties:{type:"string"},actions:{type:"sap.ui.model.Context"},autoBindOnInit:{type:"boolean"},visible:{type:"string"}},events:{onSegmentedButtonPressed:{type:"function"},selectionChange:{type:"Function",isPublic:true}}},create:function(p,c,s){var o;var d=a.getInvolvedDataModelObjects(p.metaPath,p.contextPath);var e=this.getConverterContext(d,p.contextPath,s);if(p.chartDefinition===undefined||p.chartDefinition===null){var v=D.getContextRelativeTargetObjectPath(d);if(p.metaPath.getObject().$Type==="com.sap.vocabularies.UI.v1.PresentationVariantType"){var V=p.metaPath.getObject().Visualizations;V.forEach(function(g){if(g.$AnnotationPath.indexOf("@com.sap.vocabularies.UI.v1.Chart")>-1){v=g.$AnnotationPath;return;}});}var f=b.getDataVisualizationConfiguration(v,p.useCondensedLayout,e);o=f.visualizations[0];p.chartDefinition=this.createBindingContext(o,s);}else{o=p.chartDefinition.getObject();}o.path=p.chartDefinition.getPath();this.setDefaultValue(p,"navigationPath",o.navigationPath);this.setDefaultValue(p,"autoBindOnInit",o.autoBindOnInit);this.setDefaultValue(p,"vizProperties",o.vizProperties);p.actions=this.createBindingContext(o.actions,s);p.selectionMode=p.selectionMode.toUpperCase();if(!p.filter){this.setDefaultValue(p,"filter",o.filterId);}this.setDefaultValue(p,"onSegmentedButtonPressed",o.onSegmentedButtonPressed);this.setDefaultValue(p,"visible",o.visible);if(p._applyIdToContent){p._apiId=p.id+"::Chart";p._contentId=p.id;}else{p._apiId=p.id;p._contentId=p.id+"-content";}return p;}});return C;});
+sap.ui.define(["./MacroMetadata","sap/fe/core/templating/DataModelPathHelper","sap/fe/core/converters/MetaModelConverter","sap/fe/core/converters/controls/Common/DataVisualization"],function(M,D,a,b){"use strict";var C=M.extend("sap.fe.macros.Chart",{name:"Chart",namespace:"sap.fe.macros.internal",publicNamespace:"sap.fe.macros",publicName:"Chart",fragment:"sap.fe.macros.Chart",metadata:{stereotype:"xmlmacro",properties:{chartDefinition:{type:"sap.ui.model.Context"},id:{type:"string",isPublic:true},_applyIdToContent:{type:"boolean",defaultValue:false},metaPath:{type:"sap.ui.model.Context",isPublic:true},contextPath:{type:"sap.ui.model.Context",isPublic:true},height:{type:"string",defaultValue:"400px"},width:{type:"string",defaultValue:"100%"},selectionMode:{type:"string",defaultValue:"MULTIPLE",isPublic:true},personalization:{type:"string|boolean",isPublic:true},filter:{type:"string"},noDataText:{type:"string"},chartDelegate:{type:"string"},vizProperties:{type:"string"},actions:{type:"sap.ui.model.Context"},autoBindOnInit:{type:"boolean"},visible:{type:"string"}},events:{onSegmentedButtonPressed:{type:"function"},selectionChange:{type:"Function",isPublic:true}}},create:function(p,c,s){var o;var d=a.getInvolvedDataModelObjects(p.metaPath,p.contextPath);var e=this.getConverterContext(d,p.contextPath,s);if(p.chartDefinition===undefined||p.chartDefinition===null){var v=D.getContextRelativeTargetObjectPath(d);if(p.metaPath.getObject().$Type==="com.sap.vocabularies.UI.v1.PresentationVariantType"){var V=p.metaPath.getObject().Visualizations;V.forEach(function(g){if(g.$AnnotationPath.indexOf("@com.sap.vocabularies.UI.v1.Chart")>-1){v=g.$AnnotationPath;return;}});}var f=b.getDataVisualizationConfiguration(v,p.useCondensedLayout,e);o=f.visualizations[0];p.chartDefinition=this.createBindingContext(o,s);}else{o=p.chartDefinition.getObject();}o.path=p.chartDefinition.getPath();this.setDefaultValue(p,"navigationPath",o.navigationPath);this.setDefaultValue(p,"autoBindOnInit",o.autoBindOnInit);this.setDefaultValue(p,"vizProperties",o.vizProperties);p.actions=this.createBindingContext(o.actions,s);p.selectionMode=p.selectionMode.toUpperCase();if(!p.filter){this.setDefaultValue(p,"filter",o.filterId);}this.setDefaultValue(p,"onSegmentedButtonPressed",o.onSegmentedButtonPressed);this.setDefaultValue(p,"visible",o.visible);if(p._applyIdToContent){p._apiId=p.id+"::Chart";p._contentId=p.id;}else{p._apiId=p.id;p._contentId=p.id+"-content";}return p;}});return C;});

package/packages/sap.fe.macros/src/sap/fe/macros/ChartAPI-dbg.js

@@ -26,7 +26,7 @@ sap.ui.define(["sap/fe/core/helpers/ClassSupport", "./MacroAPI", "sap/base/util/
 
   function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-  function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+  function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
 
   function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 

package/packages/sap.fe.macros/src/sap/fe/macros/ChartAPI.js

@@ -2,4 +2,4 @@
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/fe/core/helpers/ClassSupport","./MacroAPI","sap/base/util/merge"],function(C,M,m){"use strict";var _,a,b,c,d,f,g,h,j,k,l,n,q,r;var E=C.Event;var s=C.EventHandler;var P=C.Property;var A=C.APIClass;function t(e,p,i,o){if(!i)return;Object.defineProperty(e,p,{enumerable:i.enumerable,configurable:i.configurable,writable:i.writable,value:i.initializer?i.initializer.call(o):void 0});}function u(i,e){if(!(i instanceof e)){throw new TypeError("Cannot call a class as a function");}}function v(e,p){for(var i=0;i<p.length;i++){var o=p[i];o.enumerable=o.enumerable||false;o.configurable=true;if("value"in o)o.writable=true;Object.defineProperty(e,o.key,o);}}function w(e,p,i){if(p)v(e.prototype,p);if(i)v(e,i);return e;}function x(e,i){if(typeof i!=="function"&&i!==null){throw new TypeError("Super expression must either be null or a function");}e.prototype=Object.create(i&&i.prototype,{constructor:{value:e,writable:true,configurable:true}});if(i)y(e,i);}function y(o,p){y=Object.setPrototypeOf||function y(o,p){o.__proto__=p;return o;};return y(o,p);}function z(e){var i=F();return function p(){var S=G(e),o;if(i){var N=G(this).constructor;o=Reflect.construct(S,arguments,N);}else{o=S.apply(this,arguments);}return B(this,o);};}function B(e,i){if(i&&(typeof i==="object"||typeof i==="function")){return i;}return D(e);}function D(e){if(e===void 0){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return e;}function F(){if(typeof Reflect==="undefined"||!Reflect.construct)return false;if(Reflect.construct.sham)return false;if(typeof Proxy==="function")return true;try{Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}));return true;}catch(e){return false;}}function G(o){G=Object.setPrototypeOf?Object.getPrototypeOf:function G(o){return o.__proto__||Object.getPrototypeOf(o);};return G(o);}function H(o,e,i){if(e in o){Object.defineProperty(o,e,{value:i,enumerable:true,configurable:true,writable:true});}else{o[e]=i;}return o;}function I(e,p,i,o,L){var N={};Object.keys(o).forEach(function(O){N[O]=o[O];});N.enumerable=!!N.enumerable;N.configurable=!!N.configurable;if('value'in N||N.initializer){N.writable=true;}N=i.slice().reverse().reduce(function(N,O){return O(e,p,N)||N;},N);if(L&&N.initializer!==void 0){N.value=N.initializer?N.initializer.call(L):void 0;N.initializer=undefined;}if(N.initializer===void 0){Object.defineProperty(e,p,N);N=null;}return N;}function J(e,i){throw new Error('Decorating class property failed. Please ensure that '+'proposal-class-properties is enabled and runs after the decorators transform.');}var K=(_=A("sap.fe.macros.ChartAPI"),a=P({type:"string"}),b=P({type:"sap.ui.model.Context",required:true}),c=P({type:"sap.ui.model.Context",required:true}),d=P({type:"string",defaultValue:"MULTIPLE"}),f=P({type:"boolean|string"}),_(g=(h=function(e){x(K,e);var i=z(K);function K(){var o;u(this,K);for(var p=arguments.length,L=new Array(p),N=0;N<p;N++){L[N]=arguments[N];}o=i.call.apply(i,[this].concat(L));t(D(o),"id",j,D(o));t(D(o),"metaPath",k,D(o));t(D(o),"contextPath",l,D(o));t(D(o),"selectionMode",n,D(o));t(D(o),"personalization",q,D(o));t(D(o),"selectionChange",r,D(o));return o;}w(K,[{key:"handleSelectionChange",value:function L(o){var p=o.getParameter("data");var S=o.getParameter("name")==="selectData";this.fireSelectionChange(m({},{data:p,selected:S}));}}]);return K;}(M),(j=I(h.prototype,"id",[a],{configurable:true,enumerable:true,writable:true,initializer:null}),k=I(h.prototype,"metaPath",[b],{configurable:true,enumerable:true,writable:true,initializer:null}),l=I(h.prototype,"contextPath",[c],{configurable:true,enumerable:true,writable:true,initializer:null}),n=I(h.prototype,"selectionMode",[d],{configurable:true,enumerable:true,writable:true,initializer:null}),q=I(h.prototype,"personalization",[f],{configurable:true,enumerable:true,writable:true,initializer:null}),r=I(h.prototype,"selectionChange",[E],{configurable:true,enumerable:true,writable:true,initializer:null}),I(h.prototype,"handleSelectionChange",[s],Object.getOwnPropertyDescriptor(h.prototype,"handleSelectionChange"),h.prototype)),h))||g);return K;},false);
+sap.ui.define(["sap/fe/core/helpers/ClassSupport","./MacroAPI","sap/base/util/merge"],function(C,M,m){"use strict";var _,a,b,c,d,f,g,h,j,k,l,n,q,r;var E=C.Event;var s=C.EventHandler;var P=C.Property;var A=C.APIClass;function t(e,p,i,o){if(!i)return;Object.defineProperty(e,p,{enumerable:i.enumerable,configurable:i.configurable,writable:i.writable,value:i.initializer?i.initializer.call(o):void 0});}function u(i,e){if(!(i instanceof e)){throw new TypeError("Cannot call a class as a function");}}function v(e,p){for(var i=0;i<p.length;i++){var o=p[i];o.enumerable=o.enumerable||false;o.configurable=true;if("value"in o)o.writable=true;Object.defineProperty(e,o.key,o);}}function w(e,p,i){if(p)v(e.prototype,p);if(i)v(e,i);return e;}function x(e,i){if(typeof i!=="function"&&i!==null){throw new TypeError("Super expression must either be null or a function");}e.prototype=Object.create(i&&i.prototype,{constructor:{value:e,writable:true,configurable:true}});if(i)y(e,i);}function y(o,p){y=Object.setPrototypeOf||function y(o,p){o.__proto__=p;return o;};return y(o,p);}function z(e){var i=F();return function p(){var S=G(e),o;if(i){var N=G(this).constructor;o=Reflect.construct(S,arguments,N);}else{o=S.apply(this,arguments);}return B(this,o);};}function B(e,i){if(i&&(typeof i==="object"||typeof i==="function")){return i;}else if(i!==void 0){throw new TypeError("Derived constructors may only return object or undefined");}return D(e);}function D(e){if(e===void 0){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return e;}function F(){if(typeof Reflect==="undefined"||!Reflect.construct)return false;if(Reflect.construct.sham)return false;if(typeof Proxy==="function")return true;try{Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}));return true;}catch(e){return false;}}function G(o){G=Object.setPrototypeOf?Object.getPrototypeOf:function G(o){return o.__proto__||Object.getPrototypeOf(o);};return G(o);}function H(o,e,i){if(e in o){Object.defineProperty(o,e,{value:i,enumerable:true,configurable:true,writable:true});}else{o[e]=i;}return o;}function I(e,p,i,o,L){var N={};Object.keys(o).forEach(function(O){N[O]=o[O];});N.enumerable=!!N.enumerable;N.configurable=!!N.configurable;if('value'in N||N.initializer){N.writable=true;}N=i.slice().reverse().reduce(function(N,O){return O(e,p,N)||N;},N);if(L&&N.initializer!==void 0){N.value=N.initializer?N.initializer.call(L):void 0;N.initializer=undefined;}if(N.initializer===void 0){Object.defineProperty(e,p,N);N=null;}return N;}function J(e,i){throw new Error('Decorating class property failed. Please ensure that '+'proposal-class-properties is enabled and runs after the decorators transform.');}var K=(_=A("sap.fe.macros.ChartAPI"),a=P({type:"string"}),b=P({type:"sap.ui.model.Context",required:true}),c=P({type:"sap.ui.model.Context",required:true}),d=P({type:"string",defaultValue:"MULTIPLE"}),f=P({type:"boolean|string"}),_(g=(h=function(e){x(K,e);var i=z(K);function K(){var o;u(this,K);for(var p=arguments.length,L=new Array(p),N=0;N<p;N++){L[N]=arguments[N];}o=i.call.apply(i,[this].concat(L));t(D(o),"id",j,D(o));t(D(o),"metaPath",k,D(o));t(D(o),"contextPath",l,D(o));t(D(o),"selectionMode",n,D(o));t(D(o),"personalization",q,D(o));t(D(o),"selectionChange",r,D(o));return o;}w(K,[{key:"handleSelectionChange",value:function L(o){var p=o.getParameter("data");var S=o.getParameter("name")==="selectData";this.fireSelectionChange(m({},{data:p,selected:S}));}}]);return K;}(M),(j=I(h.prototype,"id",[a],{configurable:true,enumerable:true,writable:true,initializer:null}),k=I(h.prototype,"metaPath",[b],{configurable:true,enumerable:true,writable:true,initializer:null}),l=I(h.prototype,"contextPath",[c],{configurable:true,enumerable:true,writable:true,initializer:null}),n=I(h.prototype,"selectionMode",[d],{configurable:true,enumerable:true,writable:true,initializer:null}),q=I(h.prototype,"personalization",[f],{configurable:true,enumerable:true,writable:true,initializer:null}),r=I(h.prototype,"selectionChange",[E],{configurable:true,enumerable:true,writable:true,initializer:null}),I(h.prototype,"handleSelectionChange",[s],Object.getOwnPropertyDescriptor(h.prototype,"handleSelectionChange"),h.prototype)),h))||g);return K;},false);

package/packages/sap.fe.macros/src/sap/fe/macros/ChartDelegate-dbg.js

@@ -11,7 +11,7 @@
 sap.ui.define(
 	[
 		"sap/ui/mdc/library",
-		"sap/ui/mdc/odata/v4/vizChart/ChartDelegateNew",
+		"sap/ui/mdc/odata/v4/vizChart/ChartDelegate",
 		"sap/fe/macros/ODataMetaModelUtil",
 		"sap/ui/mdc/odata/v4/ODataMetaModelUtil",
 		"sap/base/util/merge",
@@ -427,8 +427,8 @@ sap.ui.define(
 			return aAggregateProperties;
 		};
 
-		ChartDelegate.rebindChart = function(oMDCChart, oBindingInfo) {
-			BaseChartDelegate.rebindChart(oMDCChart, oBindingInfo);
+		ChartDelegate.rebind = function(oMDCChart, oBindingInfo) {
+			BaseChartDelegate.rebind(oMDCChart, oBindingInfo);
 		};
 
 		ChartDelegate._setChart = function(oMDCChart, oInnerChart) {
@@ -454,7 +454,7 @@ sap.ui.define(
 			var oMetaModel = oMDCChart.getModel() && oMDCChart.getModel().getMetaModel();
 			var sTargetCollectionPath = oMDCChart.data("targetCollectionPath");
 			var sEntitySetPath =
-				(oMetaModel.getObject(sTargetCollectionPath + "/$kind") === "EntitySet" ? "/" : "") + oMetadataInfo.contextPath;
+				(oMetaModel.getObject(sTargetCollectionPath + "/$kind") !== "NavigationProperty" ? "/" : "") + oMetadataInfo.contextPath;
 			var oParams = merge({}, oMetadataInfo.parameters, {
 				entitySet: oMDCChart.data("entitySet"),
 				useBatchRequests: true,

package/packages/sap.fe.macros/src/sap/fe/macros/ChartDelegate.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/mdc/library","sap/ui/mdc/odata/v4/vizChart/ChartDelegateNew","sap/fe/macros/ODataMetaModelUtil","sap/ui/mdc/odata/v4/ODataMetaModelUtil","sap/base/util/merge","sap/fe/macros/chart/ChartUtils","sap/ui/mdc/util/FilterUtil","sap/ui/mdc/odata/v4/util/DelegateUtil","sap/ui/base/SyncPromise","sap/base/Log","sap/fe/core/CommonUtils","sap/fe/macros/ResourceModel","sap/fe/macros/CommonHelper","sap/fe/macros/ChartAPI"],function(M,B,a,O,m,C,F,D,S,L,b,R,c,d){"use strict";var e=Object.assign({},B);function s(f,g){var n="",h=C.getAllFilterInfo(f),i=g.path.substr(1);if(f.getFilter()){if(h.search||(h.filters&&h.filters.length)){n="T_OP_TABLE_AND_CHART_NO_DATA_TEXT_WITH_FILTER";}else{n="T_OP_TABLE_AND_CHART_NO_DATA_TEXT";}}else{if(h.search||(h.filters&&h.filters.length)){n="T_OP_TABLE_AND_CHART_NO_DATA_TEXT_WITH_FILTER";}else{n="M_OP_TABLE_AND_CHART_OP_NO_FILTERS_NO_DATA_TEXT";}}if(n==="T_OP_TABLE_AND_CHART_NO_DATA_TEXT_WITH_FILTER"||n==="T_OP_TABLE_AND_CHART_NO_DATA_TEXT"){return f.getModel("sap.fe.i18n").getResourceBundle().then(function(r){f.setNoDataText(b.getTranslatedText(n,r,null,i));}).catch(function(j){L.error(j);});}else{if(R){f.setNoDataText(R.getText(n));}}}e._handleProperty=function(f,E,k,g,p,h){var A=c.parseCustomData(f.data("applySupported"));var l=E["@Org.OData.Capabilities.V1.SortRestrictions"]||{};var n=O.getSortRestrictionsInfo(l);var q=E["@Org.OData.Capabilities.V1.FilterRestrictions"];var r=O.getFilterRestrictionsInfo(q);var t=this.getModel().getObject(this.getPath());var K=this.getModel().getObject(this.getPath()+"@sapui.name");var u=this.getModel();if(t&&t.$kind==="Property"){if(t.$isCollection){return;}var P=u.getObject(this.getPath()+"@");var v=u.getObject("@sapui.name",u.getMetaContext(this.getPath()));var G=A&&A.GroupableProperties;var w=A&&A.AggregatableProperties;var x=false,y=false;if(G&&G.length){for(var i=0;i<G.length;i++){if(G[i].$PropertyPath===v){x=true;break;}}}if(w&&w.length){for(var j=0;j<w.length;j++){if(w[j].Property.$PropertyPath===v){y=true;break;}}}if(!G||(G&&!G.length)){x=P["@Org.OData.Aggregation.V1.Groupable"];}if(!w||(w&&!w.length)){y=P["@Org.OData.Aggregation.V1.Aggregatable"];}if(!x&&!y){return;}if(y){var z=e._createPropertyInfosForAggregatable(K,P,r,n,k,g);z.forEach(function(H){p.push(H);});}if(x){var N=K||"",T=P["@com.sap.vocabularies.Common.v1.Text"]?P["@com.sap.vocabularies.Common.v1.Text"].$Path:null;var I=false;if(N&&N.indexOf("/")>-1){L.error("$expand is not yet supported. Property: "+N+" from an association cannot be used");return;}if(T&&T.indexOf("/")>-1){L.error("$expand is not yet supported. Text Property: "+T+" from an association cannot be used");I=true;}p.push({name:K,propertyPath:K,label:P["@com.sap.vocabularies.Common.v1.Label"]||K,sortable:n[K]?n[K].sortable:true,filterable:r[K]?r[K].filterable:true,groupable:true,aggregatable:false,maxConditions:O.isMultiValueFilterExpression(r.propertyInfo[K])?-1:1,sortKey:K,kind:"Groupable",availableRoles:e._getLayoutOptionsForType("groupable"),role:M.ChartItemRoleType.category,criticality:h,textProperty:!I&&P["@com.sap.vocabularies.Common.v1.Text"]?P["@com.sap.vocabularies.Common.v1.Text"].$Path:null,textFormatter:function(V,H){if(P["@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement"]){var J=P["@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement"];if(J.$EnumMember==="com.sap.vocabularies.UI.v1.TextArrangementType/TextFirst"){return H+" ("+V+")";}else if(J.$EnumMember==="com.sap.vocabularies.UI.v1.TextArrangementType/TextLast"){return V+" ("+H+")";}else if(J.$EnumMember==="com.sap.vocabularies.UI.v1.TextArrangementType/TextOnly"){return H;}}return H?H:V;}});}}};e.updateBindingInfo=function(f,g){s(f,g);var h=sap.ui.getCore().byId(f.getFilter());if(h){var i=h.getConditions();if(i){if(!g){g={};}var I=f.getControlDelegate()._getChart(f);var j;if(I){if(C.getChartSelectionsExist(f)){j=C.getAllFilterInfo(f);}}j=j?j:C.getFilterBarFilterInfo(f);if(j){g.filters=j.filters;}var p=D.getParametersInfo(h,i);if(p){g.path=p;}}}};e.fetchProperties=function(f){var g=this._getModel(f);var p;if(!g){p=new Promise(function(r){f.attachModelContextChange({resolver:r},o,this);}.bind(this)).then(function(g){return this._createPropertyInfos(f,g);}.bind(this));}else{p=this._createPropertyInfos(f,g);}return p.then(function(P){if(f.data){f.data("$mdcChartPropertyInfo",P);}return P;});};function o(E,f){var g=E.getSource();var h=this._getModel(g);if(h){g.detachModelContextChange(o);f.resolver(h);}}e._createPropertyInfos=function(f,g){var E="/"+f.data("entitySet");var h=g.getMetaModel();return Promise.all([h.requestObject(E+"/"),h.requestObject(E+"@")]).then(function(r){var p=[];var i=r[0],j=r[1];var k=c.parseCustomData(f.data("customAgg"));var A;var P=[];for(var l in j){if(l.startsWith("@Org.OData.Aggregation.V1.CustomAggregate")){A=l.replace("@Org.OData.Aggregation.V1.CustomAggregate#","");var n=A.split("@");if(n.length==2&&n[1]=="com.sap.vocabularies.Common.v1.Label"){k[n[0].label]=j[l];}}}var q=[],t=[];if(Object.keys(k).length>=1){var u=f.getItems();for(var v in u){if(u[v].isA("sap.ui.mdc.chart.DimensionItem")){q.push(u[v].getKey());}else if(u[v].isA("sap.ui.mdc.chart.MeasureItem")){t.push(u[v].getKey());}}if(t.filter(function(z){return q.indexOf(z)!=-1;}).length>=1){L.error("Dimension and Measure has the sameProperty Configured");}}var T=c.parseCustomData(f.data("transAgg"));var K={};for(var w in T){var x=T[w].propertyPath;K[x]=K[x]||{};K[x][T[w].aggregationMethod]={name:T[w].name,label:T[w].label};}for(var y in i){if(y.indexOf("$")!==0){P.push(a.fetchCriticality(h,h.createBindingContext(E+"/"+y)).then(e._handleProperty.bind(h.getMetaContext(E+"/"+y),f,j,K,k,p)));}}return Promise.all(P).then(function(){return p;});});};e._createPropertyInfosForAggregatable=function(k,p,f,g,K,h){var A=[];if(Object.keys(K).indexOf(k)>-1){for(var i in K[k]){A.push({name:K[k][i].name,propertyPath:k,label:K[k][i].label||p["@com.sap.vocabularies.Common.v1.Label"]+" ("+i+")"||k+" ("+i+")",sortable:g[k]?g[k].sortable:true,filterable:f[k]?f[k].filterable:true,groupable:false,aggregatable:true,aggregationMethod:i,maxConditions:O.isMultiValueFilterExpression(f.propertyInfo[k])?-1:1,kind:"Aggregatable",availableRoles:e._getLayoutOptionsForType("aggregatable"),role:M.ChartItemRoleType.axis1,datapoint:null});}}else if(Object.keys(h).indexOf(k)>-1){for(var j in h){if(j===k){var I=m({},h[j],{groupable:false,aggregatable:true,kind:"Aggregatable",availableRoles:e._getLayoutOptionsForType("aggregatable"),role:M.ChartItemRoleType.axis1,datapoint:null});A.push(I);break;}}}return A;};e.rebindChart=function(f,g){B.rebindChart(f,g);};e._setChart=function(f,i){var g=f.getParent();i.setVizProperties(f.data("vizProperties"));i.detachSelectData(g.handleSelectionChange.bind(g));i.detachDeselectData(g.handleSelectionChange.bind(g));i.detachDrilledUp(g.handleSelectionChange.bind(g));i.attachSelectData(g.handleSelectionChange.bind(g));i.attachDeselectData(g.handleSelectionChange.bind(g));i.attachDrilledUp(g.handleSelectionChange.bind(g));i.setSelectionMode(f.getPayload().selectionMode.toUpperCase());B._setChart(f,i);};e._getBindingInfo=function(f){if(this._getBindingInfoFromState(f)){return this._getBindingInfoFromState(f);}var g=f.getDelegate().payload;var h=f.getModel()&&f.getModel().getMetaModel();var t=f.data("targetCollectionPath");var E=(h.getObject(t+"/$kind")==="EntitySet"?"/":"")+g.contextPath;var p=m({},g.parameters,{entitySet:f.data("entitySet"),useBatchRequests:true,provideGrandTotals:true,provideTotalResultSize:true,noPaging:true});var i={path:E,parameters:p};return i;};e.removeItemFromInnerChart=function(f,g){B.removeItemFromInnerChart.call(this,f,g);if(g.getType()==="groupable"){var i=this._getChart(f);i.fireDeselectData();}};return e;},false);
+sap.ui.define(["sap/ui/mdc/library","sap/ui/mdc/odata/v4/vizChart/ChartDelegate","sap/fe/macros/ODataMetaModelUtil","sap/ui/mdc/odata/v4/ODataMetaModelUtil","sap/base/util/merge","sap/fe/macros/chart/ChartUtils","sap/ui/mdc/util/FilterUtil","sap/ui/mdc/odata/v4/util/DelegateUtil","sap/ui/base/SyncPromise","sap/base/Log","sap/fe/core/CommonUtils","sap/fe/macros/ResourceModel","sap/fe/macros/CommonHelper","sap/fe/macros/ChartAPI"],function(M,B,a,O,m,C,F,D,S,L,b,R,c,d){"use strict";var e=Object.assign({},B);function s(f,g){var n="",h=C.getAllFilterInfo(f),i=g.path.substr(1);if(f.getFilter()){if(h.search||(h.filters&&h.filters.length)){n="T_OP_TABLE_AND_CHART_NO_DATA_TEXT_WITH_FILTER";}else{n="T_OP_TABLE_AND_CHART_NO_DATA_TEXT";}}else{if(h.search||(h.filters&&h.filters.length)){n="T_OP_TABLE_AND_CHART_NO_DATA_TEXT_WITH_FILTER";}else{n="M_OP_TABLE_AND_CHART_OP_NO_FILTERS_NO_DATA_TEXT";}}if(n==="T_OP_TABLE_AND_CHART_NO_DATA_TEXT_WITH_FILTER"||n==="T_OP_TABLE_AND_CHART_NO_DATA_TEXT"){return f.getModel("sap.fe.i18n").getResourceBundle().then(function(r){f.setNoDataText(b.getTranslatedText(n,r,null,i));}).catch(function(j){L.error(j);});}else{if(R){f.setNoDataText(R.getText(n));}}}e._handleProperty=function(f,E,k,g,p,h){var A=c.parseCustomData(f.data("applySupported"));var l=E["@Org.OData.Capabilities.V1.SortRestrictions"]||{};var n=O.getSortRestrictionsInfo(l);var q=E["@Org.OData.Capabilities.V1.FilterRestrictions"];var r=O.getFilterRestrictionsInfo(q);var t=this.getModel().getObject(this.getPath());var K=this.getModel().getObject(this.getPath()+"@sapui.name");var u=this.getModel();if(t&&t.$kind==="Property"){if(t.$isCollection){return;}var P=u.getObject(this.getPath()+"@");var v=u.getObject("@sapui.name",u.getMetaContext(this.getPath()));var G=A&&A.GroupableProperties;var w=A&&A.AggregatableProperties;var x=false,y=false;if(G&&G.length){for(var i=0;i<G.length;i++){if(G[i].$PropertyPath===v){x=true;break;}}}if(w&&w.length){for(var j=0;j<w.length;j++){if(w[j].Property.$PropertyPath===v){y=true;break;}}}if(!G||(G&&!G.length)){x=P["@Org.OData.Aggregation.V1.Groupable"];}if(!w||(w&&!w.length)){y=P["@Org.OData.Aggregation.V1.Aggregatable"];}if(!x&&!y){return;}if(y){var z=e._createPropertyInfosForAggregatable(K,P,r,n,k,g);z.forEach(function(H){p.push(H);});}if(x){var N=K||"",T=P["@com.sap.vocabularies.Common.v1.Text"]?P["@com.sap.vocabularies.Common.v1.Text"].$Path:null;var I=false;if(N&&N.indexOf("/")>-1){L.error("$expand is not yet supported. Property: "+N+" from an association cannot be used");return;}if(T&&T.indexOf("/")>-1){L.error("$expand is not yet supported. Text Property: "+T+" from an association cannot be used");I=true;}p.push({name:K,propertyPath:K,label:P["@com.sap.vocabularies.Common.v1.Label"]||K,sortable:n[K]?n[K].sortable:true,filterable:r[K]?r[K].filterable:true,groupable:true,aggregatable:false,maxConditions:O.isMultiValueFilterExpression(r.propertyInfo[K])?-1:1,sortKey:K,kind:"Groupable",availableRoles:e._getLayoutOptionsForType("groupable"),role:M.ChartItemRoleType.category,criticality:h,textProperty:!I&&P["@com.sap.vocabularies.Common.v1.Text"]?P["@com.sap.vocabularies.Common.v1.Text"].$Path:null,textFormatter:function(V,H){if(P["@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement"]){var J=P["@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement"];if(J.$EnumMember==="com.sap.vocabularies.UI.v1.TextArrangementType/TextFirst"){return H+" ("+V+")";}else if(J.$EnumMember==="com.sap.vocabularies.UI.v1.TextArrangementType/TextLast"){return V+" ("+H+")";}else if(J.$EnumMember==="com.sap.vocabularies.UI.v1.TextArrangementType/TextOnly"){return H;}}return H?H:V;}});}}};e.updateBindingInfo=function(f,g){s(f,g);var h=sap.ui.getCore().byId(f.getFilter());if(h){var i=h.getConditions();if(i){if(!g){g={};}var I=f.getControlDelegate()._getChart(f);var j;if(I){if(C.getChartSelectionsExist(f)){j=C.getAllFilterInfo(f);}}j=j?j:C.getFilterBarFilterInfo(f);if(j){g.filters=j.filters;}var p=D.getParametersInfo(h,i);if(p){g.path=p;}}}};e.fetchProperties=function(f){var g=this._getModel(f);var p;if(!g){p=new Promise(function(r){f.attachModelContextChange({resolver:r},o,this);}.bind(this)).then(function(g){return this._createPropertyInfos(f,g);}.bind(this));}else{p=this._createPropertyInfos(f,g);}return p.then(function(P){if(f.data){f.data("$mdcChartPropertyInfo",P);}return P;});};function o(E,f){var g=E.getSource();var h=this._getModel(g);if(h){g.detachModelContextChange(o);f.resolver(h);}}e._createPropertyInfos=function(f,g){var E="/"+f.data("entitySet");var h=g.getMetaModel();return Promise.all([h.requestObject(E+"/"),h.requestObject(E+"@")]).then(function(r){var p=[];var i=r[0],j=r[1];var k=c.parseCustomData(f.data("customAgg"));var A;var P=[];for(var l in j){if(l.startsWith("@Org.OData.Aggregation.V1.CustomAggregate")){A=l.replace("@Org.OData.Aggregation.V1.CustomAggregate#","");var n=A.split("@");if(n.length==2&&n[1]=="com.sap.vocabularies.Common.v1.Label"){k[n[0].label]=j[l];}}}var q=[],t=[];if(Object.keys(k).length>=1){var u=f.getItems();for(var v in u){if(u[v].isA("sap.ui.mdc.chart.DimensionItem")){q.push(u[v].getKey());}else if(u[v].isA("sap.ui.mdc.chart.MeasureItem")){t.push(u[v].getKey());}}if(t.filter(function(z){return q.indexOf(z)!=-1;}).length>=1){L.error("Dimension and Measure has the sameProperty Configured");}}var T=c.parseCustomData(f.data("transAgg"));var K={};for(var w in T){var x=T[w].propertyPath;K[x]=K[x]||{};K[x][T[w].aggregationMethod]={name:T[w].name,label:T[w].label};}for(var y in i){if(y.indexOf("$")!==0){P.push(a.fetchCriticality(h,h.createBindingContext(E+"/"+y)).then(e._handleProperty.bind(h.getMetaContext(E+"/"+y),f,j,K,k,p)));}}return Promise.all(P).then(function(){return p;});});};e._createPropertyInfosForAggregatable=function(k,p,f,g,K,h){var A=[];if(Object.keys(K).indexOf(k)>-1){for(var i in K[k]){A.push({name:K[k][i].name,propertyPath:k,label:K[k][i].label||p["@com.sap.vocabularies.Common.v1.Label"]+" ("+i+")"||k+" ("+i+")",sortable:g[k]?g[k].sortable:true,filterable:f[k]?f[k].filterable:true,groupable:false,aggregatable:true,aggregationMethod:i,maxConditions:O.isMultiValueFilterExpression(f.propertyInfo[k])?-1:1,kind:"Aggregatable",availableRoles:e._getLayoutOptionsForType("aggregatable"),role:M.ChartItemRoleType.axis1,datapoint:null});}}else if(Object.keys(h).indexOf(k)>-1){for(var j in h){if(j===k){var I=m({},h[j],{groupable:false,aggregatable:true,kind:"Aggregatable",availableRoles:e._getLayoutOptionsForType("aggregatable"),role:M.ChartItemRoleType.axis1,datapoint:null});A.push(I);break;}}}return A;};e.rebind=function(f,g){B.rebind(f,g);};e._setChart=function(f,i){var g=f.getParent();i.setVizProperties(f.data("vizProperties"));i.detachSelectData(g.handleSelectionChange.bind(g));i.detachDeselectData(g.handleSelectionChange.bind(g));i.detachDrilledUp(g.handleSelectionChange.bind(g));i.attachSelectData(g.handleSelectionChange.bind(g));i.attachDeselectData(g.handleSelectionChange.bind(g));i.attachDrilledUp(g.handleSelectionChange.bind(g));i.setSelectionMode(f.getPayload().selectionMode.toUpperCase());B._setChart(f,i);};e._getBindingInfo=function(f){if(this._getBindingInfoFromState(f)){return this._getBindingInfoFromState(f);}var g=f.getDelegate().payload;var h=f.getModel()&&f.getModel().getMetaModel();var t=f.data("targetCollectionPath");var E=(h.getObject(t+"/$kind")!=="NavigationProperty"?"/":"")+g.contextPath;var p=m({},g.parameters,{entitySet:f.data("entitySet"),useBatchRequests:true,provideGrandTotals:true,provideTotalResultSize:true,noPaging:true});var i={path:E,parameters:p};return i;};e.removeItemFromInnerChart=function(f,g){B.removeItemFromInnerChart.call(this,f,g);if(g.getType()==="groupable"){var i=this._getChart(f);i.fireDeselectData();}};return e;},false);

package/packages/sap.fe.macros/src/sap/fe/macros/CommonHelper-dbg.js

@@ -88,37 +88,39 @@ sap.ui.define(
 					immutable = oAnnotations["@Org.OData.Core.V1.Immutable"],
 					computed = oAnnotations["@Org.OData.Core.V1.Computed"];
 
-				if (fieldControl && fieldControl.$Path) {
-					if (fieldControl.$Path === "ReadOnly") {
-						return sap.ui.mdc.enum.EditMode.ReadOnly;
-					} else {
-						return (
+				var sEditMode = sap.ui.mdc.enum.EditMode.Editable;
+
+				if (immutable || computed) {
+					sEditMode = sap.ui.mdc.enum.EditMode.ReadOnly;
+				} else if (fieldControl) {
+					if (fieldControl.$EnumMember) {
+						if (fieldControl.$EnumMember === "com.sap.vocabularies.Common.v1.FieldControlType/ReadOnly") {
+							sEditMode = sap.ui.mdc.enum.EditMode.ReadOnly;
+						}
+						if (
+							fieldControl.$EnumMember === "com.sap.vocabularies.Common.v1.FieldControlType/Inapplicable" ||
+							fieldControl.$EnumMember === "com.sap.vocabularies.Common.v1.FieldControlType/Hidden"
+						) {
+							sEditMode = sap.ui.mdc.enum.EditMode.Disabled;
+						}
+					}
+					if (fieldControl.$Path) {
+						sEditMode =
 							"{= %{" +
 							fieldControl.$Path +
-							"} ? " +
-							"'" +
+							"} < 3 ? (%{" +
+							fieldControl.$Path +
+							"} === 0 ? '" +
+							sap.ui.mdc.enum.EditMode.Disabled +
+							"' : '" +
 							sap.ui.mdc.enum.EditMode.ReadOnly +
-							"'" +
-							" : " +
-							"'" +
+							"') : '" +
 							sap.ui.mdc.enum.EditMode.Editable +
-							"'" +
-							" }"
-						);
-					}
-				}
-
-				if (fieldControl && fieldControl.$EnumMember) {
-					if (fieldControl.$EnumMember === "com.sap.vocabularies.Common.v1.FieldControlType/ReadOnly") {
-						return sap.ui.mdc.enum.EditMode.ReadOnly;
+							"'}";
 					}
 				}
 
-				if (immutable || computed) {
-					return sap.ui.mdc.enum.EditMode.ReadOnly;
-				}
-
-				return sap.ui.mdc.enum.EditMode.Editable;
+				return sEditMode;
 			},
 			/**
 			 * Get the complete metapath to the target.