@sap/open.fe 1.99.0 → 1.100.0

package/packages/sap.fe.macros/src/sap/fe/macros/MacroAPI.ts

@@ -8,9 +8,18 @@ import XMLPreprocessor from "sap/ui/core/util/XMLPreprocessor";
 import ConverterContext from "sap/fe/core/converters/ConverterContext";
 import ClientContextBinding from "sap/ui/model/ClientContextBinding";
 import { InternalModelContext } from "sap/fe/core/helpers/ModelHelper";
+import UI5Event from "sap/ui/base/Event";
+import UI5Element from "sap/ui/core/Element";
 
 const MacroAPIFQN = "sap.fe.macros.MacroAPI";
 
+/**
+ * Base API control for macros.
+ * @hideconstructor
+ * @public
+ * @name sap.fe.macros.MacroAPI
+ * @public
+ */
 @APIClass(MacroAPIFQN)
 class MacroAPI extends Control {
 	static namespace: string = "sap.fe.macros";
@@ -79,26 +88,26 @@ class MacroAPI extends Control {
 		}
 	}
 
-	static getAPI(oEvent: UI5Event): MacroAPI {
-		let oSource = oEvent.getSource();
+	static getAPI(oEvent: UI5Event): MacroAPI | false {
+		let oSource = oEvent.getSource() as MacroAPI;
 		if (this.isDependentBound) {
 			while (oSource && !oSource.isA(MacroAPIFQN) && oSource.getParent) {
-				const oDependents = oSource.getDependents();
-				const hasCorrectDependent = oDependents.find((oDependent: Control) => oDependent.isA(MacroAPIFQN));
+				const oDependents = (oSource as Control).getDependents();
+				const hasCorrectDependent = oDependents.find((oDependent: UI5Element) => oDependent.isA(MacroAPIFQN));
 				if (hasCorrectDependent) {
-					oSource = hasCorrectDependent;
+					oSource = hasCorrectDependent as MacroAPI;
 				} else {
-					oSource = oSource.getParent();
+					oSource = oSource.getParent() as MacroAPI;
 				}
 			}
 		} else {
 			while (oSource && !oSource.isA(MacroAPIFQN) && oSource.getParent) {
-				oSource = oSource.getParent();
+				oSource = oSource.getParent() as MacroAPI;
 			}
 		}
 
 		if (!oSource || !oSource.isA(MacroAPIFQN)) {
-			const oSourceMap = this.instanceMap.get(this) as object[];
+			const oSourceMap = this.instanceMap.get(this) as MacroAPI[];
 			oSource = oSourceMap[oSourceMap.length - 1];
 		}
 		return oSource && oSource.isA(MacroAPIFQN) && oSource;
@@ -109,6 +118,15 @@ class MacroAPI extends Control {
 			oProps[sPropName] = oOverrideValue;
 		}
 	}
+
+	/**
+	 * Retrieve a Converter Context.
+	 *
+	 * @param oDataModelPath
+	 * @param contextPath
+	 * @param mSettings
+	 * @returns A Converter Context
+	 */
 	static getConverterContext = function(oDataModelPath: DataModelObjectPath, contextPath: string, mSettings: any) {
 		const oAppComponent = mSettings.appComponent;
 		const viewData = mSettings.models.viewData && mSettings.models.viewData.getData();
@@ -122,6 +140,12 @@ class MacroAPI extends Control {
 		);
 		return oConverterContext;
 	};
+	/**
+	 * Create a Binding Context.
+	 * @param oData
+	 * @param mSettings
+	 * @returns The binding context
+	 */
 	static createBindingContext = function(oData: object, mSettings: any) {
 		const sContextPath = "/" + uid();
 		mSettings.models.converterContext.setProperty(sContextPath, oData);

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

@@ -85,6 +85,11 @@ sap.ui.define(["sap/fe/core/converters/ConverterContext", "sap/base/util/merge",
 				}
 				return oOutObjects;
 			};
+
+			oContent.getContentId = function(sMacroId) {
+				return sMacroId + "-content";
+			};
+
 			return oContent;
 		}
 	};

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

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/fe/core/converters/ConverterContext","sap/base/util/merge","sap/base/util/uid","sap/base/util/deepClone"],function(C,m,u,d){"use strict";var g=function(c,i){var p={};if(c){var o=c[i];if(o){Object.keys(o).forEach(function(a){p[a]=o[a];});}}return p;};var s=function(p,P,o,f){if(p[P]===undefined||f){p[P]=o;}};var M={metadata:{properties:{_flexId:{type:"string"}}},extend:function(n,c){c.metadata.properties._flexId=M.metadata.properties._flexId;c.hasValidation=true;c.getOverrides=g.bind(c);c.setDefaultValue=s.bind(c);c.getConverterContext=function(v,a,S,e){var A=S.appComponent;var o=S.models.viewData&&S.models.viewData.getData();var b=Object.assign({},o);delete b.resourceBundle;b=d(b);b.controlConfiguration=m(b.controlConfiguration,e);var f=C.createConverterContextForMacro(v.startingEntitySet.name,S.models.metaModel,A&&A.getDiagnostics(),m,v.contextLocation,b);return f;};c.createBindingContext=function(D,S){var a="/"+u();S.models.converterContext.setProperty(a,D);return S.models.converterContext.createBindingContext(a);};c.parseAggregation=function(a,f){var o={};if(a&&a.children.length>0){var b=a.children;for(var e=0;e<b.length;e++){var h=f(b[e],e);if(h){o[h.key]=h;}}}return o;};return c;}};return M;});
+sap.ui.define(["sap/fe/core/converters/ConverterContext","sap/base/util/merge","sap/base/util/uid","sap/base/util/deepClone"],function(C,m,u,d){"use strict";var g=function(c,i){var p={};if(c){var o=c[i];if(o){Object.keys(o).forEach(function(a){p[a]=o[a];});}}return p;};var s=function(p,P,o,f){if(p[P]===undefined||f){p[P]=o;}};var M={metadata:{properties:{_flexId:{type:"string"}}},extend:function(n,c){c.metadata.properties._flexId=M.metadata.properties._flexId;c.hasValidation=true;c.getOverrides=g.bind(c);c.setDefaultValue=s.bind(c);c.getConverterContext=function(v,a,S,e){var A=S.appComponent;var o=S.models.viewData&&S.models.viewData.getData();var b=Object.assign({},o);delete b.resourceBundle;b=d(b);b.controlConfiguration=m(b.controlConfiguration,e);var f=C.createConverterContextForMacro(v.startingEntitySet.name,S.models.metaModel,A&&A.getDiagnostics(),m,v.contextLocation,b);return f;};c.createBindingContext=function(D,S){var a="/"+u();S.models.converterContext.setProperty(a,D);return S.models.converterContext.createBindingContext(a);};c.parseAggregation=function(a,f){var o={};if(a&&a.children.length>0){var b=a.children;for(var e=0;e<b.length;e++){var h=f(b[e],e);if(h){o[h.key]=h;}}}return o;};c.getContentId=function(a){return a+"-content";};return c;}};return M;});

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

@@ -292,7 +292,6 @@ sap.ui.define(
 				sI18nName = sName + ".i18n",
 				mContexts = {},
 				oAttributesModel = new JSONModel(oNode),
-				sMetadataContexts = oNode.getAttribute("metadataContexts"),
 				oMetadataContexts = {},
 				oSettings = oVisitor.getSettings(),
 				j;
@@ -333,73 +332,67 @@ sap.ui.define(
 
 			// First of all we need to visit the attributes
 			var oTargetPromise = null;
-			var bMetadataContextLegacy = true;
 			var mMissingContext = {};
-			if (oMacroDefinition.hasValidation) {
-				var oDefinitionProperties = oMetadata.properties;
-				var oDefinitionContexts = oMetadata.metadataContexts;
-				oSettings.currentContextPath = oSettings.bindingContexts.contextPath;
-				var aDefinitionPropertiesKeys = Object.keys(oDefinitionProperties);
-				var aDefinitionContextsKeys = Object.keys(oDefinitionContexts);
-				var aAttributeVisitorPromises = [];
-				for (j = 0; j < aDefinitionPropertiesKeys.length; j++) {
-					var sKeyValue = aDefinitionPropertiesKeys[j];
-					if (isPublic && !oDefinitionProperties[sKeyValue].isPublic && oNode.hasAttribute(sKeyValue)) {
-						Log.error("Property " + sKeyValue + " was ignored as it is not intended for public usage");
-						var oObj = {};
-						oObj[sKeyValue] = oDefinitionProperties[sKeyValue].defaultValue;
-						aAttributeVisitorPromises.push(Promise.resolve(oObj));
-					} else if (oNode.hasAttribute(sKeyValue)) {
-						aAttributeVisitorPromises.push(
-							oVisitor
-								.visitAttribute(oNode, oNode.attributes[sKeyValue])
-								.then(getAttributeValue(oNode, sKeyValue, oDefinitionProperties[sKeyValue]))
-						);
-					} else {
-						var oObj = {};
-						oObj[sKeyValue] = oDefinitionProperties[sKeyValue].defaultValue;
-						aAttributeVisitorPromises.push(Promise.resolve(oObj));
-					}
+
+			var oDefinitionProperties = oMetadata.properties;
+			var oDefinitionContexts = oMetadata.metadataContexts;
+			oSettings.currentContextPath = oSettings.bindingContexts.contextPath;
+			var aDefinitionPropertiesKeys = Object.keys(oDefinitionProperties);
+			var aDefinitionContextsKeys = Object.keys(oDefinitionContexts);
+			var aAttributeVisitorPromises = [];
+			for (j = 0; j < aDefinitionPropertiesKeys.length; j++) {
+				var sKeyValue = aDefinitionPropertiesKeys[j];
+				if (isPublic && !oDefinitionProperties[sKeyValue].isPublic && oNode.hasAttribute(sKeyValue)) {
+					Log.error("Property " + sKeyValue + " was ignored as it is not intended for public usage");
+					var oObj = {};
+					oObj[sKeyValue] = oDefinitionProperties[sKeyValue].defaultValue;
+					aAttributeVisitorPromises.push(Promise.resolve(oObj));
+				} else if (oNode.hasAttribute(sKeyValue)) {
+					aAttributeVisitorPromises.push(
+						oVisitor
+							.visitAttribute(oNode, oNode.attributes[sKeyValue])
+							.then(getAttributeValue(oNode, sKeyValue, oDefinitionProperties[sKeyValue]))
+					);
+				} else {
+					var oObj = {};
+					oObj[sKeyValue] = oDefinitionProperties[sKeyValue].defaultValue;
+					aAttributeVisitorPromises.push(Promise.resolve(oObj));
 				}
-				// First check if the contexts are defined directly
-				bMetadataContextLegacy = false;
-				// Sort keys to be sure contextPath is before metaPath ( yes I'm desperate )
-				aDefinitionContextsKeys = aDefinitionContextsKeys.sort(function(a, b) {
-					return a > b ? 1 : -1;
-				});
-				for (j = 0; j < aDefinitionContextsKeys.length; j++) {
-					var sAttributeName = aDefinitionContextsKeys[j];
-					var bDoNotResolve = isPublic && !oDefinitionContexts[sAttributeName].isPublic && oNode.hasAttribute(sAttributeName);
-					var oMetadataContext = _getMetadataContext(oSettings, oNode, sAttributeName, oVisitor, bDoNotResolve);
-					if (oMetadataContext) {
-						oMetadataContext.name = sAttributeName;
-						addSingleContext(mContexts, oVisitor, oMetadataContext, oMetadataContexts);
-						if (
-							(sAttributeName === "entitySet" && !oSettings.bindingContexts.hasOwnProperty(sAttributeName)) ||
-							(sAttributeName === "contextPath" && !oSettings.bindingContexts.hasOwnProperty(sAttributeName))
-						) {
-							oSettings.bindingContexts[sAttributeName] = mContexts[sAttributeName];
-						}
-						if (sAttributeName === "contextPath") {
-							oSettings.currentContextPath = mContexts[sAttributeName];
-						}
-						aAttributeVisitorPromises.push(Promise.resolve(wrapOutput(sAttributeName)(mContexts[sAttributeName])));
-					} else {
-						mMissingContext[sAttributeName] = true;
-						bMetadataContextLegacy = true;
+			}
+			// Sort keys to be sure contextPath is before metaPath ( yes I'm desperate )
+			aDefinitionContextsKeys = aDefinitionContextsKeys.sort(function(a, b) {
+				return a > b ? 1 : -1;
+			});
+			for (j = 0; j < aDefinitionContextsKeys.length; j++) {
+				var sAttributeName = aDefinitionContextsKeys[j];
+				var bDoNotResolve = isPublic && !oDefinitionContexts[sAttributeName].isPublic && oNode.hasAttribute(sAttributeName);
+				var oMetadataContext = _getMetadataContext(oSettings, oNode, sAttributeName, oVisitor, bDoNotResolve);
+				if (oMetadataContext) {
+					oMetadataContext.name = sAttributeName;
+					addSingleContext(mContexts, oVisitor, oMetadataContext, oMetadataContexts);
+					if (
+						(sAttributeName === "entitySet" && !oSettings.bindingContexts.hasOwnProperty(sAttributeName)) ||
+						(sAttributeName === "contextPath" && !oSettings.bindingContexts.hasOwnProperty(sAttributeName))
+					) {
+						oSettings.bindingContexts[sAttributeName] = mContexts[sAttributeName];
 					}
+					if (sAttributeName === "contextPath") {
+						oSettings.currentContextPath = mContexts[sAttributeName];
+					}
+					aAttributeVisitorPromises.push(Promise.resolve(wrapOutput(sAttributeName)(mContexts[sAttributeName])));
+				} else {
+					mMissingContext[sAttributeName] = true;
 				}
+			}
 
-				// Aggregation Support
-				if (oNode.firstElementChild !== null) {
-					// If there are aggregation we need to visit the childNodes first and foremost
-					aAttributeVisitorPromises.push(oVisitor.visitChildNodes(oNode));
-				}
-
-				oTargetPromise = SyncPromise.all(aAttributeVisitorPromises);
-			} else {
-				oTargetPromise = oVisitor.visitAttributes(oNode);
+			// Aggregation Support
+			if (oNode.firstElementChild !== null) {
+				// If there are aggregation we need to visit the childNodes first and foremost
+				aAttributeVisitorPromises.push(oVisitor.visitChildNodes(oNode));
 			}
+
+			oTargetPromise = SyncPromise.all(aAttributeVisitorPromises);
+
 			var oAggregations = {};
 			return oTargetPromise
 				.then(function(aProps) {
@@ -468,18 +461,6 @@ sap.ui.define(
 						}
 						oAttributesModel.oProps = oProps;
 					}
-					if (bMetadataContextLegacy && sMetadataContexts) {
-						oMetadataContexts = sMetadataContexts ? ManagedObject.bindingParser(sMetadataContexts) : { parts: [] };
-						if (!oMetadataContexts.parts) {
-							oMetadataContexts = { parts: [oMetadataContexts] };
-						}
-
-						for (j = 0; j < oMetadataContexts.parts.length; j++) {
-							addSingleContext(mContexts, oVisitor, oMetadataContexts.parts[j], oMetadataContexts);
-							// Make sure every previously defined context can be used in the next binding
-							oVisitor = oVisitor["with"](mContexts, false);
-						}
-					}
 				})
 				.then(function() {
 					var oPreviousMacroInfo;
@@ -584,6 +565,7 @@ sap.ui.define(
 				}
 				oMetadataContexts[sKey] = mContexts[sKey]; // make it available inside metadataContexts JSON object
 			} catch (ex) {
+				//console.error(ex);
 				// ignore the context as this can only be the case if the model is not ready, i.e. not a preprocessing model but maybe a model for
 				// providing afterwards
 				// TODO not yet implemented

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

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/model/json/JSONModel","sap/base/Log","sap/ui/base/ManagedObject","sap/fe/macros/ResourceModel","sap/ui/core/util/XMLPreprocessor","sap/ui/base/SyncPromise","./TraceInfo","sap/base/util/ObjectPath"],function(J,L,M,R,X,S,T,O){"use strict";var p="sap.fe.macros.PhantomUtil",I=R.getModel();I.bindContext=I.bindContext||function(){return{initialize:function(){},attachChange:function(){},detachChange:function(){},attachEvents:function(){},detachEvents:function(){},updateRequired:function(){},destroy:function(){},getContext:function(){}};};function v(n,C,o,k){var a,b;if(!C[k]){if(o.required){throw new Error(n+": "+"Required metadataContext '"+k+"' is missing");}}else{a=C[k];b=a.getObject();if(b){var i=Object.assign({},o);delete i.required;delete i.computed;delete i.isPublic;delete i.type;if(b.hasOwnProperty("$kind")){delete i.$Type;}else{delete i.$kind;}Object.keys(i).forEach(function(P){var j=Array.isArray(i[P])?i[P]:[i[P]],V;if(typeof b==="object"){V=b[P];if(!V){if(b.hasOwnProperty("$Path")){V=a.getObject("$Path/"+P);}}}else if(typeof b==="string"){V=a.getObject(P);if(!V){V=j[0];}}else{V=null;}if(P!=="$Type"||V!==undefined){if(j.indexOf(V)===-1){throw new Error(n+": '"+k+"' must be '"+P+"' '"+j+"' but is '"+V+"': "+a.getPath());}}});}}}function c(n,m,C,N){var a=(m.metadataContexts&&Object.keys(m.metadataContexts))||[],P=(m.properties&&Object.keys(m.properties))||[],A={};Object.keys(N.attributes).forEach(function(k){var K=N.attributes[k].name;if(K!=="metadataContexts"){A[K]=true;}});Object.keys(C).forEach(function(k){if(k!=="this"&&k!=="this.i18n"){A[k]=true;}});a.forEach(function(k){var o=m.metadataContexts[k];v(n,C,o,k);delete A[k];});P.forEach(function(k){var o=m.properties[k];if(!N.hasAttribute(k)){if(o.required&&!o.hasOwnProperty("defaultValue")){throw new Error(n+": "+"Required property '"+k+"' is missing");}}else{delete A[k];}});Object.keys(A).forEach(function(k){if(k.charAt(0)!=="_"&&k.indexOf(":")<0){L.warning("Unchecked parameter: "+n+": "+k,null,p);}});}function d(m,i){if(m){var P={};var a={"dependents":{type:"sap.ui.core.Element"},"customData":{type:"sap.ui.core.Element"}};var o=m.metadataContexts||{};Object.keys(m.properties).forEach(function(s){if(m.properties[s].type!=="sap.ui.model.Context"){P[s]=m.properties[s];}else{o[s]=m.properties[s];}});if(m.events){Object.keys(m.events).forEach(function(E){P[E]=m.events[E];});}if(m.aggregations){Object.keys(m.aggregations).forEach(function(s){a[s]=m.aggregations[s];});}return{properties:P,aggregations:a,metadataContexts:o};}else{return{metadataContexts:{},aggregations:{"dependents":{type:"sap.ui.core.Element"},"customData":{type:"sap.ui.core.Element"}},properties:{},events:{}};}}function w(k){return function(V){var o={};o[k]=V;return o;};}function g(n,k,D){return function(){var V=n.getAttribute(k);if(!V&&D.defaultValue){V=D.defaultValue;}return w(k)(V);};}function _(s,n,a,V,D){var m;if(!D&&n.hasAttribute(a)){var A=n.getAttribute(a),b;V.getResult(A,n);m=M.bindingParser(A);if(!m){if((a==="metaPath"&&s.currentContextPath)||a==="contextPath"){if(A.startsWith("/")){b=A;}else{var C=s.currentContextPath.getPath();if(!C.endsWith("/")){C+="/";}b=C+A;}m={model:"metaModel",path:b};}else{m={model:"metaModel",path:s.bindingContexts.entitySet?s.bindingContexts.entitySet.getPath(A):A};}}}else if(s.bindingContexts.hasOwnProperty(a)){m={model:a,path:""};}return m;}function e(m,n,V){return r(m,n,V,true);}function r(m,n,V,k){var F=m.fragment||m.namespace+"."+m.name,N="this",s=N+".i18n",C={},A=new J(n),l=n.getAttribute("metadataContexts"),o={},q=V.getSettings(),j;var t=d(m.metadata,k);A._getObject=function(a,b){if((a===undefined||a==="")&&this.oProps){return this.oProps;}var i=O.get(a.replace(/\//g,"."),this.oProps);if(i!==undefined){return i;}if(this.oProps&&this.oProps.hasOwnProperty(a)){return this.oProps[a];}if(a.indexOf(":")===-1&&a.indexOf("/")===-1){L.error("Missing property "+a+" on macro metadata "+m.name);}return n.getAttribute(a);};A.getContextName=function(){return N;};A.$$valueAsPromise=true;C[s]=I.getContext("/");if(!q[F]){q[F]={};}var u=null;var x=true;var y={};if(m.hasValidation){var D=t.properties;var z=t.metadataContexts;q.currentContextPath=q.bindingContexts.contextPath;var B=Object.keys(D);var E=Object.keys(z);var G=[];for(j=0;j<B.length;j++){var K=B[j];if(k&&!D[K].isPublic&&n.hasAttribute(K)){L.error("Property "+K+" was ignored as it is not intended for public usage");var H={};H[K]=D[K].defaultValue;G.push(Promise.resolve(H));}else if(n.hasAttribute(K)){G.push(V.visitAttribute(n,n.attributes[K]).then(g(n,K,D[K])));}else{var H={};H[K]=D[K].defaultValue;G.push(Promise.resolve(H));}}x=false;E=E.sort(function(a,b){return a>b?1:-1;});for(j=0;j<E.length;j++){var P=E[j];var Q=k&&!z[P].isPublic&&n.hasAttribute(P);var U=_(q,n,P,V,Q);if(U){U.name=P;f(C,V,U,o);if((P==="entitySet"&&!q.bindingContexts.hasOwnProperty(P))||(P==="contextPath"&&!q.bindingContexts.hasOwnProperty(P))){q.bindingContexts[P]=C[P];}if(P==="contextPath"){q.currentContextPath=C[P];}G.push(Promise.resolve(w(P)(C[P])));}else{y[P]=true;x=true;}}if(n.firstElementChild!==null){G.push(V.visitChildNodes(n));}u=S.all(G);}else{u=V.visitAttributes(n);}var W={};return u.then(function(a){if(a!=null){var b=a.reduce(function(c1,d1){return Object.assign(c1,d1);},{});Object.keys(t.properties).forEach(function(Z){if(t.properties[Z].type==="object"&&(!b.hasOwnProperty(Z)||b[Z]===undefined)){b[Z]={};}});var Y=n.firstElementChild;while(Y!==null){var Z=Y.localName;if(Object.keys(t.aggregations).indexOf(Z)!==-1&&(!k||t.aggregations[Z].isPublic)){W[Y.localName]=Y;}else if(Object.keys(t.properties).indexOf(Z)!==-1){b[Z]={};for(var i=0;i<Object.keys(Y.attributes).length;i++){var $=Object.keys(Y.attributes)[i];b[Z][Y.attributes[$].localName]=Y.attributes[$].value;}}Y=Y.nextElementSibling;}var a1=m.prepareMacroParameters||m.create;if(a1){var b1={};if(q.models["sap.fe.i18n"]){q.models["sap.fe.i18n"].getResourceBundle().then(function(c1){R.setApplicationI18nBundle(c1);}).catch(function(c1){L.error(c1);});}if(q.models.viewData){b1=q.models.viewData.getProperty("/controlConfiguration");}b=a1.call(m,b,b1,q,W,k);Object.keys(t.metadataContexts).forEach(function(c1){if(t.metadataContexts[c1].computed){C[c1]=b[c1];}});Object.keys(y).forEach(function(c1){if(b.hasOwnProperty(c1)){C[c1]=b[c1];}});}A.oProps=b;}if(x&&l){o=l?M.bindingParser(l):{parts:[]};if(!o.parts){o={parts:[o]};}for(j=0;j<o.parts.length;j++){f(C,V,o.parts[j],o);V=V["with"](C,false);}}}).then(function(){var a;C[N]=A.getContext("/");if(T.isTraceInfoActive()){var b=T.traceMacroCalls(F,t,C,n,V);if(b){a=q["_macroInfo"];q["_macroInfo"]=b.macroInfo;}}c(F,t,C,n);var i=V["with"](C,true);var Y=n.parentNode;var Z;for(Z=0;Z<Y.children.length;++Z){if(Y.children[Z]===n){break;}}var $;if(m.getTemplate){var a1=m.getTemplate(A.oProps);if(a1){n.replaceWith(a1.firstElementChild);n=Y.children[Z];$=i.visitNode(n);}else{n.remove();$=Promise.resolve();}}else{$=i.insertFragment(F,n);}return $.then(function(){var b1=Y.children[Z];if(Object.keys(W).length>0){Object.keys(W).forEach(function(d1){var e1=W[d1];if(b1!==null&&b1!==undefined){var f1=document.createElementNS(b1.namespaceURI,d1);var g1=e1.firstElementChild;while(g1){var h1=g1.nextElementSibling;f1.appendChild(g1);g1=h1;}if(d1!=="customData"&&d1!=="dependents"){var i1=(t.aggregations[d1]&&t.aggregations[d1].slot)||d1;var j1=b1.querySelector("slot[name='"+i1+"']");if(j1){j1.replaceWith.apply(j1,f1.children);}}else{b1.appendChild(f1);}}});}if(b1){var c1=b1.querySelectorAll("slot");c1.forEach(function(d1){d1.remove();});}if(a){q["_macroInfo"]=a;}else{delete q["_macroInfo"];}});});}function f(C,V,o,m){var k=o.name||o.model||undefined;if(m[k]){return;}try{var s=o.path;if(o.model!=null){s=o.model+">"+s;}var a=V.getSettings();if(!a.bindingContexts[o.model]&&a.models[o.model]){C[k]=a.models[o.model].getContext(o.path);}else{C[k]=V.getContext(s);}if(a&&a.bindingContexts&&a.bindingContexts.entitySet){C[k].$$configModelContext=V.getSettings().bindingContexts.entitySet.$$configModelContext;}m[k]=C[k];}catch(b){}}function h(m){X.plugIn(r.bind(this,m),m.namespace,m.name);if(m.publicName){X.plugIn(e.bind(this,m),m.publicNamespace,m.publicName);}}h._validateMacroSignature=c;return{register:h};});
+sap.ui.define(["sap/ui/model/json/JSONModel","sap/base/Log","sap/ui/base/ManagedObject","sap/fe/macros/ResourceModel","sap/ui/core/util/XMLPreprocessor","sap/ui/base/SyncPromise","./TraceInfo","sap/base/util/ObjectPath"],function(J,L,M,R,X,S,T,O){"use strict";var p="sap.fe.macros.PhantomUtil",I=R.getModel();I.bindContext=I.bindContext||function(){return{initialize:function(){},attachChange:function(){},detachChange:function(){},attachEvents:function(){},detachEvents:function(){},updateRequired:function(){},destroy:function(){},getContext:function(){}};};function v(n,C,o,k){var a,b;if(!C[k]){if(o.required){throw new Error(n+": "+"Required metadataContext '"+k+"' is missing");}}else{a=C[k];b=a.getObject();if(b){var i=Object.assign({},o);delete i.required;delete i.computed;delete i.isPublic;delete i.type;if(b.hasOwnProperty("$kind")){delete i.$Type;}else{delete i.$kind;}Object.keys(i).forEach(function(P){var j=Array.isArray(i[P])?i[P]:[i[P]],V;if(typeof b==="object"){V=b[P];if(!V){if(b.hasOwnProperty("$Path")){V=a.getObject("$Path/"+P);}}}else if(typeof b==="string"){V=a.getObject(P);if(!V){V=j[0];}}else{V=null;}if(P!=="$Type"||V!==undefined){if(j.indexOf(V)===-1){throw new Error(n+": '"+k+"' must be '"+P+"' '"+j+"' but is '"+V+"': "+a.getPath());}}});}}}function c(n,m,C,N){var a=(m.metadataContexts&&Object.keys(m.metadataContexts))||[],P=(m.properties&&Object.keys(m.properties))||[],A={};Object.keys(N.attributes).forEach(function(k){var K=N.attributes[k].name;if(K!=="metadataContexts"){A[K]=true;}});Object.keys(C).forEach(function(k){if(k!=="this"&&k!=="this.i18n"){A[k]=true;}});a.forEach(function(k){var o=m.metadataContexts[k];v(n,C,o,k);delete A[k];});P.forEach(function(k){var o=m.properties[k];if(!N.hasAttribute(k)){if(o.required&&!o.hasOwnProperty("defaultValue")){throw new Error(n+": "+"Required property '"+k+"' is missing");}}else{delete A[k];}});Object.keys(A).forEach(function(k){if(k.charAt(0)!=="_"&&k.indexOf(":")<0){L.warning("Unchecked parameter: "+n+": "+k,null,p);}});}function d(m,i){if(m){var P={};var a={"dependents":{type:"sap.ui.core.Element"},"customData":{type:"sap.ui.core.Element"}};var o=m.metadataContexts||{};Object.keys(m.properties).forEach(function(s){if(m.properties[s].type!=="sap.ui.model.Context"){P[s]=m.properties[s];}else{o[s]=m.properties[s];}});if(m.events){Object.keys(m.events).forEach(function(E){P[E]=m.events[E];});}if(m.aggregations){Object.keys(m.aggregations).forEach(function(s){a[s]=m.aggregations[s];});}return{properties:P,aggregations:a,metadataContexts:o};}else{return{metadataContexts:{},aggregations:{"dependents":{type:"sap.ui.core.Element"},"customData":{type:"sap.ui.core.Element"}},properties:{},events:{}};}}function w(k){return function(V){var o={};o[k]=V;return o;};}function g(n,k,D){return function(){var V=n.getAttribute(k);if(!V&&D.defaultValue){V=D.defaultValue;}return w(k)(V);};}function _(s,n,a,V,D){var m;if(!D&&n.hasAttribute(a)){var A=n.getAttribute(a),b;V.getResult(A,n);m=M.bindingParser(A);if(!m){if((a==="metaPath"&&s.currentContextPath)||a==="contextPath"){if(A.startsWith("/")){b=A;}else{var C=s.currentContextPath.getPath();if(!C.endsWith("/")){C+="/";}b=C+A;}m={model:"metaModel",path:b};}else{m={model:"metaModel",path:s.bindingContexts.entitySet?s.bindingContexts.entitySet.getPath(A):A};}}}else if(s.bindingContexts.hasOwnProperty(a)){m={model:a,path:""};}return m;}function e(m,n,V){return r(m,n,V,true);}function r(m,n,V,k){var F=m.fragment||m.namespace+"."+m.name,N="this",s=N+".i18n",C={},A=new J(n),o={},l=V.getSettings(),j;var q=d(m.metadata,k);A._getObject=function(a,b){if((a===undefined||a==="")&&this.oProps){return this.oProps;}var i=O.get(a.replace(/\//g,"."),this.oProps);if(i!==undefined){return i;}if(this.oProps&&this.oProps.hasOwnProperty(a)){return this.oProps[a];}if(a.indexOf(":")===-1&&a.indexOf("/")===-1){L.error("Missing property "+a+" on macro metadata "+m.name);}return n.getAttribute(a);};A.getContextName=function(){return N;};A.$$valueAsPromise=true;C[s]=I.getContext("/");if(!l[F]){l[F]={};}var t=null;var u={};var D=q.properties;var x=q.metadataContexts;l.currentContextPath=l.bindingContexts.contextPath;var y=Object.keys(D);var z=Object.keys(x);var B=[];for(j=0;j<y.length;j++){var K=y[j];if(k&&!D[K].isPublic&&n.hasAttribute(K)){L.error("Property "+K+" was ignored as it is not intended for public usage");var E={};E[K]=D[K].defaultValue;B.push(Promise.resolve(E));}else if(n.hasAttribute(K)){B.push(V.visitAttribute(n,n.attributes[K]).then(g(n,K,D[K])));}else{var E={};E[K]=D[K].defaultValue;B.push(Promise.resolve(E));}}z=z.sort(function(a,b){return a>b?1:-1;});for(j=0;j<z.length;j++){var G=z[j];var H=k&&!x[G].isPublic&&n.hasAttribute(G);var P=_(l,n,G,V,H);if(P){P.name=G;f(C,V,P,o);if((G==="entitySet"&&!l.bindingContexts.hasOwnProperty(G))||(G==="contextPath"&&!l.bindingContexts.hasOwnProperty(G))){l.bindingContexts[G]=C[G];}if(G==="contextPath"){l.currentContextPath=C[G];}B.push(Promise.resolve(w(G)(C[G])));}else{u[G]=true;}}if(n.firstElementChild!==null){B.push(V.visitChildNodes(n));}t=S.all(B);var Q={};return t.then(function(a){if(a!=null){var b=a.reduce(function(a1,b1){return Object.assign(a1,b1);},{});Object.keys(q.properties).forEach(function(W){if(q.properties[W].type==="object"&&(!b.hasOwnProperty(W)||b[W]===undefined)){b[W]={};}});var U=n.firstElementChild;while(U!==null){var W=U.localName;if(Object.keys(q.aggregations).indexOf(W)!==-1&&(!k||q.aggregations[W].isPublic)){Q[U.localName]=U;}else if(Object.keys(q.properties).indexOf(W)!==-1){b[W]={};for(var i=0;i<Object.keys(U.attributes).length;i++){var Y=Object.keys(U.attributes)[i];b[W][U.attributes[Y].localName]=U.attributes[Y].value;}}U=U.nextElementSibling;}var Z=m.prepareMacroParameters||m.create;if(Z){var $={};if(l.models["sap.fe.i18n"]){l.models["sap.fe.i18n"].getResourceBundle().then(function(a1){R.setApplicationI18nBundle(a1);}).catch(function(a1){L.error(a1);});}if(l.models.viewData){$=l.models.viewData.getProperty("/controlConfiguration");}b=Z.call(m,b,$,l,Q,k);Object.keys(q.metadataContexts).forEach(function(a1){if(q.metadataContexts[a1].computed){C[a1]=b[a1];}});Object.keys(u).forEach(function(a1){if(b.hasOwnProperty(a1)){C[a1]=b[a1];}});}A.oProps=b;}}).then(function(){var a;C[N]=A.getContext("/");if(T.isTraceInfoActive()){var b=T.traceMacroCalls(F,q,C,n,V);if(b){a=l["_macroInfo"];l["_macroInfo"]=b.macroInfo;}}c(F,q,C,n);var i=V["with"](C,true);var U=n.parentNode;var W;for(W=0;W<U.children.length;++W){if(U.children[W]===n){break;}}var Y;if(m.getTemplate){var Z=m.getTemplate(A.oProps);if(Z){n.replaceWith(Z.firstElementChild);n=U.children[W];Y=i.visitNode(n);}else{n.remove();Y=Promise.resolve();}}else{Y=i.insertFragment(F,n);}return Y.then(function(){var $=U.children[W];if(Object.keys(Q).length>0){Object.keys(Q).forEach(function(b1){var c1=Q[b1];if($!==null&&$!==undefined){var d1=document.createElementNS($.namespaceURI,b1);var e1=c1.firstElementChild;while(e1){var f1=e1.nextElementSibling;d1.appendChild(e1);e1=f1;}if(b1!=="customData"&&b1!=="dependents"){var g1=(q.aggregations[b1]&&q.aggregations[b1].slot)||b1;var h1=$.querySelector("slot[name='"+g1+"']");if(h1){h1.replaceWith.apply(h1,d1.children);}}else{$.appendChild(d1);}}});}if($){var a1=$.querySelectorAll("slot");a1.forEach(function(b1){b1.remove();});}if(a){l["_macroInfo"]=a;}else{delete l["_macroInfo"];}});});}function f(C,V,o,m){var k=o.name||o.model||undefined;if(m[k]){return;}try{var s=o.path;if(o.model!=null){s=o.model+">"+s;}var a=V.getSettings();if(!a.bindingContexts[o.model]&&a.models[o.model]){C[k]=a.models[o.model].getContext(o.path);}else{C[k]=V.getContext(s);}if(a&&a.bindingContexts&&a.bindingContexts.entitySet){C[k].$$configModelContext=V.getSettings().bindingContexts.entitySet.$$configModelContext;}m[k]=C[k];}catch(b){}}function h(m){X.plugIn(r.bind(this,m),m.namespace,m.name);if(m.publicName){X.plugIn(e.bind(this,m),m.publicNamespace,m.publicName);}}h._validateMacroSignature=c;return{register:h};});

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

@@ -47,7 +47,7 @@
 						sortConditions="{tableDefinition>annotation/sortConditions}"
 						groupConditions="{= COMMON.stringifyObject(${tableDefinition>annotation/groupConditions})}"
 						aggregateConditions="{= COMMON.stringifyObject(${tableDefinition>annotation/aggregateConditions})}"
-						dt:designtime="{this>dt:designtime}"
+						dt:designtime="{= ${this>variantManagement} === 'None' ? 'not-adaptable' : undefined}"
 						log:kind="{collection>$kind}"
 						log:navigationPath="{this>navigationPath}"
 						id="{this>id}"

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

@@ -14,15 +14,7 @@ sap.ui.define(
 		"sap/fe/core/helpers/StableIdHelper",
 		"sap/fe/macros/internal/helpers/TableTemplating"
 	],
-	function(
-		MacroMetadata,
-		DataModelPathHelper,
-		ConverterContext,
-		MetaModelConverter,
-		DataVisualization,
-		StableIdHelper,
-		TableTemplating
-	) {
+	function(MacroMetadata, DataModelPathHelper, ConverterContext, MetaModelConverter, DataVisualization, StableIdHelper, TableTemplating) {
 		"use strict";
 
 		/**
@@ -356,7 +348,7 @@ sap.ui.define(
 				},
 				aggregations: {
 					actions: {
-						type: "sap.fe.macros.internal.table.Action",
+						type: "sap.fe.macros.internal.table.Action | sap.fe.macros.internal.table.ActionGroup",
 						isPublic: true
 					},
 					columns: {
@@ -371,19 +363,8 @@ sap.ui.define(
 
 				if (!oProps.tableDefinition) {
 					var sVisualizationPath = DataModelPathHelper.getContextRelativeTargetObjectPath(oContextObjectPath);
-					var oExtraActions = this.parseAggregation(oAggregations.actions, function(childAction, childIdx) {
-						var actionKey = childAction.getAttribute("key") || "InlineXMLAction_" + childIdx;
-						return {
-							key: actionKey,
-							text: childAction.getAttribute("text"),
-							position: {
-								placement: childAction.getAttribute("placement"),
-								anchor: childAction.getAttribute("anchor")
-							},
-							__noWrap: true,
-							press: childAction.getAttribute("press")
-						};
-					});
+					//Check if we have ActionGroup and add nested actions
+					var oExtraActions = this._buildActions(oAggregations.actions);
 
 					var oExtraColumns = this.parseAggregation(oAggregations.columns, function(childColumn, columnChildIdx) {
 						var columnKey = childColumn.getAttribute("key") || "InlineXMLColumn_" + columnChildIdx;
@@ -406,11 +387,8 @@ sap.ui.define(
 						selectionMode: oProps.selectionMode,
 						type: oProps.type
 					};
-					Object.keys(mTableSettings).forEach(function(property) {
-						if (mTableSettings[property] === undefined) {
-							delete mTableSettings[property];
-						}
-					});
+					//removes undefined values from mTableSettings
+					mTableSettings = JSON.parse(JSON.stringify(mTableSettings));
 
 					oExtraParams[sVisualizationPath] = {
 						actions: oExtraActions,
@@ -455,7 +433,7 @@ sap.ui.define(
 				if (oProps.id) {
 					// The given ID shall be assigned to the TableAPI and not to the MDC Table
 					oProps._apiId = oProps.id;
-					oProps.id = oProps.id + "-content";
+					oProps.id = this.getContentId(oProps.id);
 				} else {
 					// We generate the ID. Due to compatibility reasons we keep it on the MDC Table but provide assign
 					// the ID with a ::Table suffix to the TableAPI
@@ -476,11 +454,17 @@ sap.ui.define(
 				// readonly = false -> Force editable
 				// readonly = true -> Force display mode
 				// readonly = undefined -> Bound to edit flow
-				if (oProps.readOnly === "false") {
-					oProps.readOnly = false;
-				} else if (oProps.readOnly === "true") {
-					oProps.readOnly = true;
+
+				switch (oProps.readOnly) {
+					case "false":
+						oProps.readOnly = false;
+						break;
+					case "true":
+						oProps.readOnly = true;
+						break;
+					default:
 				}
+
 				if (oProps.readOnly === undefined && oTableDefinition.annotation.displayMode === true) {
 					oProps.readOnly = true;
 				}
@@ -497,9 +481,19 @@ sap.ui.define(
 					oProps.personalization = "Sort,Column,Filter";
 				}
 
+				switch (oProps.personalization) {
+					case "false":
+						oProps.personalization = undefined;
+						break;
+					case "true":
+						oProps.personalization = "Sort,Column,Filter";
+						break;
+					default:
+				}
+
 				var useBasicSearch = false;
 				if (oProps.filterBar) {
-					oProps.filterBarId = oProps.filterBar + "-content";
+					oProps.filterBarId = this.getContentId(oProps.filterBar);
 				} else if (!oProps.filterBarId && oProps.searchable) {
 					oProps.filterBarId = StableIdHelper.generate([oProps.id, "StandardAction", "BasicSearch"]);
 					useBasicSearch = true;
@@ -520,11 +514,16 @@ sap.ui.define(
 							: oContextObjectPath.startingEntitySet.name)
 				);
 				oProps.collection = mSettings.models.metaModel.createBindingContext(oTableDefinition.annotation.collection);
-				oProps.columnEditMode = undefined;
-				if (oProps.readOnly === true) {
-					oProps.columnEditMode = "Display";
-				} else if (oProps.readOnly === false) {
-					oProps.columnEditMode = "Editable";
+
+				switch (oProps.readOnly) {
+					case true:
+						oProps.columnEditMode = "Display";
+						break;
+					case false:
+						oProps.columnEditMode = "Editable";
+						break;
+					default:
+						oProps.columnEditMode = undefined;
 				}
 				// Regarding the remaining ones that I think we could review
 				// selectedContextsModel -> potentially hardcoded or internal only
@@ -537,6 +536,58 @@ sap.ui.define(
 
 				oProps.headerBindingExpression = TableTemplating.buildExpressionForHeaderVisible(oProps);
 				return oProps;
+			},
+			/**
+			 * Build actions and action groups for table visualisation.
+			 *
+			 * @param {*} oActions XML node corresponding to actions
+			 * @returns {object} Prepared actions
+			 */
+			_buildActions: function(oActions) {
+				var oExtraActions = {};
+				if (oActions && oActions.children.length > 0) {
+					var actions = Array.prototype.slice.apply(oActions.children);
+					var actionIdx = 0;
+					actions.forEach(function(act) {
+						actionIdx++;
+						var menuActions = [];
+						if (act.children.length && act.localName === "ActionGroup" && act.namespaceURI === "sap.fe.macros") {
+							var actionsToAdd = Array.prototype.slice.apply(act.children);
+							actionsToAdd.forEach(function(actToAdd) {
+								var actionKeyAdd = actToAdd.getAttribute("key") || "InlineXMLAction_" + actionIdx;
+								var curOutObject = {
+									key: actionKeyAdd,
+									text: actToAdd.getAttribute("text"),
+									__noWrap: true,
+									press: actToAdd.getAttribute("press"),
+									requiresSelection: actToAdd.getAttribute("requiresSelection") === "true"
+								};
+								oExtraActions[curOutObject.key] = curOutObject;
+								actionIdx++;
+							});
+							menuActions = Object.values(oExtraActions)
+								.slice(-act.children.length)
+								.map(function(menuItem) {
+									return menuItem.key;
+								});
+						}
+						var actionKey = act.getAttribute("key") || "InlineXMLAction_" + actionIdx;
+						var actObject = {
+							key: actionKey,
+							text: act.getAttribute("text"),
+							position: {
+								placement: act.getAttribute("placement"),
+								anchor: act.getAttribute("anchor")
+							},
+							__noWrap: true,
+							press: act.getAttribute("press"),
+							requiresSelection: act.getAttribute("requiresSelection") === "true",
+							menu: menuActions.length ? menuActions : null
+						};
+						oExtraActions[actObject.key] = actObject;
+					});
+				}
+				return oExtraActions;
 			}
 		});
 	}

package/packages/sap.fe.macros/src/sap/fe/macros/Table.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/ConverterContext","sap/fe/core/converters/MetaModelConverter","sap/fe/core/converters/controls/Common/DataVisualization","sap/fe/core/helpers/StableIdHelper","sap/fe/macros/internal/helpers/TableTemplating"],function(M,D,C,a,b,S,T){"use strict";return M.extend("sap.fe.macros.Table",{name:"Table",namespace:"sap.fe.macros.internal",publicNamespace:"sap.fe.macros",publicName:"Table",fragment:"sap.fe.macros.Table",metadata:{stereotype:"xmlmacro",properties:{tableDefinition:{type:"sap.ui.model.Context"},metaPath:{type:"sap.ui.model.Context",isPublic:true},contextPath:{type:"sap.ui.model.Context",isPublic:true},collection:{type:"sap.ui.model.Context",required:true,$kind:["EntitySet","NavigationProperty","Singleton"]},parentEntitySet:{type:"sap.ui.model.Context"},id:{type:"string",isPublic:true},_apiId:{type:"string"},navigationPath:{type:"string"},readOnly:{type:"boolean",isPublic:true},fieldMode:{type:"string",defaultValue:"",allowedValues:["","nowrapper"]},disableAddRowButtonForEmptyData:{type:"boolean"},customValidationFunction:{type:"string"},useCondensedTableLayout:{type:"boolean"},rowAction:{type:"string",defaultValue:undefined},selectionMode:{type:"string",isPublic:true},busy:{type:"boolean",isPublic:true},enableFullScreen:{type:"boolean",isPublic:true},header:{type:"string",isPublic:true},headerVisible:{type:"boolean",isPublic:true},noDataText:{type:"string"},creationMode:{type:"string"},createAtEnd:{type:"boolean"},createOutbound:{type:"string"},createOutboundDetail:{type:"string"},createNewAction:{type:"string"},personalization:{type:"string|boolean",isPublic:true},type:{type:"string",isPublic:true},tableType:{type:"string"},enableExport:{type:"boolean",isPublic:true},enablePaste:{type:"boolean",isPublic:true},selectionLimit:{type:"string"},multiSelectMode:{type:"string"},filterBar:{type:"string",isPublic:true},filterBarId:{type:"string"},tableDelegate:{type:"string"},enableAutoScroll:{type:"boolean"},visible:{type:"string"},isAlp:{type:"boolean",defaultValue:false},variantManagement:{type:"string",isPublic:true},columnEditMode:{type:"string",computed:true},tabTitle:{type:"string",defaultValue:""},enableAutoColumnWidth:{type:"boolean"},dataStateIndicatorFilter:{type:"string"}},events:{variantSaved:{type:"function"},variantSelected:{type:"function"},onChange:{type:"function"},rowPress:{type:"function",isPublic:true},onContextChange:{type:"function"},onSegmentedButtonPressed:{type:"function"},stateChanged:{type:"function"},selectionChange:{type:"function",isPublic:true}},aggregations:{actions:{type:"sap.fe.macros.internal.table.Action",isPublic:true},columns:{type:"sap.fe.macros.internal.table.Column",isPublic:true}}},create:function(p,c,s,A){var t;var o=a.getInvolvedDataModelObjects(p.metaPath,p.contextPath);if(!p.tableDefinition){var v=D.getContextRelativeTargetObjectPath(o);var e=this.parseAggregation(A.actions,function(g,h){var i=g.getAttribute("key")||"InlineXMLAction_"+h;return{key:i,text:g.getAttribute("text"),position:{placement:g.getAttribute("placement"),anchor:g.getAttribute("anchor")},__noWrap:true,press:g.getAttribute("press")};});var E=this.parseAggregation(A.columns,function(g,h){var i=g.getAttribute("key")||"InlineXMLColumn_"+h;A[i]=g;return{key:i,header:g.getAttribute("header"),position:{placement:g.getAttribute("placement"),anchor:g.getAttribute("anchor")},type:"Slot"};});var d={};var m={enableExport:p.enableExport,enableFullScreen:p.enableFullScreen,enablePaste:p.enablePaste,selectionMode:p.selectionMode,type:p.type};Object.keys(m).forEach(function(g){if(m[g]===undefined){delete m[g];}});d[v]={actions:e,columns:E,tableSettings:m};var f=this.getConverterContext(o,p.contextPath,s,d);var V=b.getDataVisualizationConfiguration(v,p.useCondensedLayout,f);t=V.visualizations[0];p.tableDefinition=this.createBindingContext(t,s);}else{t=p.tableDefinition.getObject();}t.path=p.tableDefinition.getPath();this.setDefaultValue(p,"selectionMode",t.annotation.selectionMode,true);this.setDefaultValue(p,"enableFullScreen",t.control.enableFullScreen,true);this.setDefaultValue(p,"enableExport",t.control.enableExport,true);this.setDefaultValue(p,"enablePaste",t.annotation.standardActions.actions.paste.enabled,true);this.setDefaultValue(p,"updatablePropertyPath",t.annotation.standardActions.updatablePropertyPath,true);this.setDefaultValue(p,"type",t.control.type,true);this.setDefaultValue(p,"useCondensedTableLayout",t.control.useCondensedTableLayout);this.setDefaultValue(p,"disableAddRowButtonForEmptyData",t.control.disableAddRowButtonForEmptyData);this.setDefaultValue(p,"customValidationFunction",t.control.customValidationFunction);this.setDefaultValue(p,"headerVisible",t.control.headerVisible);this.setDefaultValue(p,"searchable",t.annotation.searchable);this.setDefaultValue(p,"showRowCount",t.control.showRowCount);this.setDefaultValue(p,"header",t.annotation.title);this.setDefaultValue(p,"selectionLimit",t.control.selectionLimit);if(p.id){p._apiId=p.id;p.id=p.id+"-content";}else{this.setDefaultValue(p,"id",t.annotation.id);p._apiId=t.annotation.id+"::Table";}this.setDefaultValue(p,"creationMode",t.annotation.create.mode);this.setDefaultValue(p,"createAtEnd",t.annotation.create.append);this.setDefaultValue(p,"createOutbound",t.annotation.create.outbound);this.setDefaultValue(p,"createNewAction",t.annotation.create.newAction);this.setDefaultValue(p,"createOutboundDetail",t.annotation.create.outboundDetail);this.setDefaultValue(p,"personalization",t.annotation.p13nMode);this.setDefaultValue(p,"variantManagement",t.annotation.variantManagement);this.setDefaultValue(p,"enableAutoColumnWidth",t.control.enableAutoColumnWidth);this.setDefaultValue(p,"dataStateIndicatorFilter",t.control.dataStateIndicatorFilter);if(p.readOnly==="false"){p.readOnly=false;}else if(p.readOnly==="true"){p.readOnly=true;}if(p.readOnly===undefined&&t.annotation.displayMode===true){p.readOnly=true;}if(p.rowPress){p.rowAction="Navigation";}this.setDefaultValue(p,"rowPress",t.annotation.row.press);this.setDefaultValue(p,"rowAction",t.annotation.row.action);if(p.personalization==="false"){p.personalization=undefined;}else if(p.personalization==="true"){p.personalization="Sort,Column,Filter";}var u=false;if(p.filterBar){p.filterBarId=p.filterBar+"-content";}else if(!p.filterBarId&&p.searchable){p.filterBarId=S.generate([p.id,"StandardAction","BasicSearch"]);u=true;}p.useBasicSearch=u;p.tableType=p.type;p.showCreate=t.annotation.standardActions.actions.create.visible||true;p.autoBindOnInit=t.annotation.autoBindOnInit;p.navigationPath=t.annotation.navigationPath;p.parentEntitySet=s.models.metaModel.createBindingContext("/"+(o.contextLocation.targetEntitySet?o.contextLocation.targetEntitySet.name:o.startingEntitySet.name));p.collection=s.models.metaModel.createBindingContext(t.annotation.collection);p.columnEditMode=undefined;if(p.readOnly===true){p.columnEditMode="Display";}else if(p.readOnly===false){p.columnEditMode="Editable";}p.headerBindingExpression=T.buildExpressionForHeaderVisible(p);return p;}});});
+sap.ui.define(["./MacroMetadata","sap/fe/core/templating/DataModelPathHelper","sap/fe/core/converters/ConverterContext","sap/fe/core/converters/MetaModelConverter","sap/fe/core/converters/controls/Common/DataVisualization","sap/fe/core/helpers/StableIdHelper","sap/fe/macros/internal/helpers/TableTemplating"],function(M,D,C,a,b,S,T){"use strict";return M.extend("sap.fe.macros.Table",{name:"Table",namespace:"sap.fe.macros.internal",publicNamespace:"sap.fe.macros",publicName:"Table",fragment:"sap.fe.macros.Table",metadata:{stereotype:"xmlmacro",properties:{tableDefinition:{type:"sap.ui.model.Context"},metaPath:{type:"sap.ui.model.Context",isPublic:true},contextPath:{type:"sap.ui.model.Context",isPublic:true},collection:{type:"sap.ui.model.Context",required:true,$kind:["EntitySet","NavigationProperty","Singleton"]},parentEntitySet:{type:"sap.ui.model.Context"},id:{type:"string",isPublic:true},_apiId:{type:"string"},navigationPath:{type:"string"},readOnly:{type:"boolean",isPublic:true},fieldMode:{type:"string",defaultValue:"",allowedValues:["","nowrapper"]},disableAddRowButtonForEmptyData:{type:"boolean"},customValidationFunction:{type:"string"},useCondensedTableLayout:{type:"boolean"},rowAction:{type:"string",defaultValue:undefined},selectionMode:{type:"string",isPublic:true},busy:{type:"boolean",isPublic:true},enableFullScreen:{type:"boolean",isPublic:true},header:{type:"string",isPublic:true},headerVisible:{type:"boolean",isPublic:true},noDataText:{type:"string"},creationMode:{type:"string"},createAtEnd:{type:"boolean"},createOutbound:{type:"string"},createOutboundDetail:{type:"string"},createNewAction:{type:"string"},personalization:{type:"string|boolean",isPublic:true},type:{type:"string",isPublic:true},tableType:{type:"string"},enableExport:{type:"boolean",isPublic:true},enablePaste:{type:"boolean",isPublic:true},selectionLimit:{type:"string"},multiSelectMode:{type:"string"},filterBar:{type:"string",isPublic:true},filterBarId:{type:"string"},tableDelegate:{type:"string"},enableAutoScroll:{type:"boolean"},visible:{type:"string"},isAlp:{type:"boolean",defaultValue:false},variantManagement:{type:"string",isPublic:true},columnEditMode:{type:"string",computed:true},tabTitle:{type:"string",defaultValue:""},enableAutoColumnWidth:{type:"boolean"},dataStateIndicatorFilter:{type:"string"}},events:{variantSaved:{type:"function"},variantSelected:{type:"function"},onChange:{type:"function"},rowPress:{type:"function",isPublic:true},onContextChange:{type:"function"},onSegmentedButtonPressed:{type:"function"},stateChanged:{type:"function"},selectionChange:{type:"function",isPublic:true}},aggregations:{actions:{type:"sap.fe.macros.internal.table.Action | sap.fe.macros.internal.table.ActionGroup",isPublic:true},columns:{type:"sap.fe.macros.internal.table.Column",isPublic:true}}},create:function(p,c,s,A){var t;var o=a.getInvolvedDataModelObjects(p.metaPath,p.contextPath);if(!p.tableDefinition){var v=D.getContextRelativeTargetObjectPath(o);var e=this._buildActions(A.actions);var E=this.parseAggregation(A.columns,function(g,h){var i=g.getAttribute("key")||"InlineXMLColumn_"+h;A[i]=g;return{key:i,header:g.getAttribute("header"),position:{placement:g.getAttribute("placement"),anchor:g.getAttribute("anchor")},type:"Slot"};});var d={};var m={enableExport:p.enableExport,enableFullScreen:p.enableFullScreen,enablePaste:p.enablePaste,selectionMode:p.selectionMode,type:p.type};m=JSON.parse(JSON.stringify(m));d[v]={actions:e,columns:E,tableSettings:m};var f=this.getConverterContext(o,p.contextPath,s,d);var V=b.getDataVisualizationConfiguration(v,p.useCondensedLayout,f);t=V.visualizations[0];p.tableDefinition=this.createBindingContext(t,s);}else{t=p.tableDefinition.getObject();}t.path=p.tableDefinition.getPath();this.setDefaultValue(p,"selectionMode",t.annotation.selectionMode,true);this.setDefaultValue(p,"enableFullScreen",t.control.enableFullScreen,true);this.setDefaultValue(p,"enableExport",t.control.enableExport,true);this.setDefaultValue(p,"enablePaste",t.annotation.standardActions.actions.paste.enabled,true);this.setDefaultValue(p,"updatablePropertyPath",t.annotation.standardActions.updatablePropertyPath,true);this.setDefaultValue(p,"type",t.control.type,true);this.setDefaultValue(p,"useCondensedTableLayout",t.control.useCondensedTableLayout);this.setDefaultValue(p,"disableAddRowButtonForEmptyData",t.control.disableAddRowButtonForEmptyData);this.setDefaultValue(p,"customValidationFunction",t.control.customValidationFunction);this.setDefaultValue(p,"headerVisible",t.control.headerVisible);this.setDefaultValue(p,"searchable",t.annotation.searchable);this.setDefaultValue(p,"showRowCount",t.control.showRowCount);this.setDefaultValue(p,"header",t.annotation.title);this.setDefaultValue(p,"selectionLimit",t.control.selectionLimit);if(p.id){p._apiId=p.id;p.id=this.getContentId(p.id);}else{this.setDefaultValue(p,"id",t.annotation.id);p._apiId=t.annotation.id+"::Table";}this.setDefaultValue(p,"creationMode",t.annotation.create.mode);this.setDefaultValue(p,"createAtEnd",t.annotation.create.append);this.setDefaultValue(p,"createOutbound",t.annotation.create.outbound);this.setDefaultValue(p,"createNewAction",t.annotation.create.newAction);this.setDefaultValue(p,"createOutboundDetail",t.annotation.create.outboundDetail);this.setDefaultValue(p,"personalization",t.annotation.p13nMode);this.setDefaultValue(p,"variantManagement",t.annotation.variantManagement);this.setDefaultValue(p,"enableAutoColumnWidth",t.control.enableAutoColumnWidth);this.setDefaultValue(p,"dataStateIndicatorFilter",t.control.dataStateIndicatorFilter);switch(p.readOnly){case"false":p.readOnly=false;break;case"true":p.readOnly=true;break;default:}if(p.readOnly===undefined&&t.annotation.displayMode===true){p.readOnly=true;}if(p.rowPress){p.rowAction="Navigation";}this.setDefaultValue(p,"rowPress",t.annotation.row.press);this.setDefaultValue(p,"rowAction",t.annotation.row.action);if(p.personalization==="false"){p.personalization=undefined;}else if(p.personalization==="true"){p.personalization="Sort,Column,Filter";}switch(p.personalization){case"false":p.personalization=undefined;break;case"true":p.personalization="Sort,Column,Filter";break;default:}var u=false;if(p.filterBar){p.filterBarId=this.getContentId(p.filterBar);}else if(!p.filterBarId&&p.searchable){p.filterBarId=S.generate([p.id,"StandardAction","BasicSearch"]);u=true;}p.useBasicSearch=u;p.tableType=p.type;p.showCreate=t.annotation.standardActions.actions.create.visible||true;p.autoBindOnInit=t.annotation.autoBindOnInit;p.navigationPath=t.annotation.navigationPath;p.parentEntitySet=s.models.metaModel.createBindingContext("/"+(o.contextLocation.targetEntitySet?o.contextLocation.targetEntitySet.name:o.startingEntitySet.name));p.collection=s.models.metaModel.createBindingContext(t.annotation.collection);switch(p.readOnly){case true:p.columnEditMode="Display";break;case false:p.columnEditMode="Editable";break;default:p.columnEditMode=undefined;}p.headerBindingExpression=T.buildExpressionForHeaderVisible(p);return p;},_buildActions:function(A){var e={};if(A&&A.children.length>0){var c=Array.prototype.slice.apply(A.children);var d=0;c.forEach(function(f){d++;var m=[];if(f.children.length&&f.localName==="ActionGroup"&&f.namespaceURI==="sap.fe.macros"){var g=Array.prototype.slice.apply(f.children);g.forEach(function(j){var k=j.getAttribute("key")||"InlineXMLAction_"+d;var l={key:k,text:j.getAttribute("text"),__noWrap:true,press:j.getAttribute("press"),requiresSelection:j.getAttribute("requiresSelection")==="true"};e[l.key]=l;d++;});m=Object.values(e).slice(-f.children.length).map(function(j){return j.key;});}var h=f.getAttribute("key")||"InlineXMLAction_"+d;var i={key:h,text:f.getAttribute("text"),position:{placement:f.getAttribute("placement"),anchor:f.getAttribute("anchor")},__noWrap:true,press:f.getAttribute("press"),requiresSelection:f.getAttribute("requiresSelection")==="true",menu:m.length?m:null};e[i.key]=i;});}return e;}});});