@sap/open.fe 1.98.0 → 1.99.0

package/packages/sap.fe.templates/src/sap/fe/templates/ListReport/overrides/ViewState-dbg.js

@@ -53,19 +53,33 @@ sap.ui.define(
 					oController = oView.getController(),
 					oFilterBar = oController._getFilterBarControl(),
 					aTables = oController._getControls("table");
-
-				oFilterBar.setSuspendSelection(true);
+				if (oFilterBar) {
+					oFilterBar.setSuspendSelection(true);
+					aPromises.push(oFilterBar.initialized());
+				}
 				aTables.forEach(function(oTable) {
 					aPromises.push(oTable.initialized());
 				});
-				aPromises.push(oFilterBar.initialized());
 
 				delete this._bSearchTriggered;
 			},
 			onAfterStateApplied: function() {
-				var oView = this.getView(),
-					oController = oView.getController();
-				oController._getFilterBarControl().setSuspendSelection(false);
+				var oController = this.getView().getController();
+				var oFilterBar = oController._getFilterBarControl();
+				if (oFilterBar) {
+					oFilterBar.setSuspendSelection(false);
+				} else if (oController._isFilterBarHidden()) {
+					var oInternalModelContext = oController.getView().getBindingContext("internal"),
+						aControls = oController._getControls();
+					oInternalModelContext.setProperty("hasPendingFilters", false);
+					if (oController._isMultiMode()) {
+						oController._setCountsOutDated();
+						var sDisplayedControlId = oController._getCurrentControl().getId();
+						aControls.forEach(function(oControl) {
+							oControl.data("outdatedRows", oControl.getId() !== sDisplayedControlId);
+						});
+					}
+				}
 			},
 			adaptBindingRefreshControls: function(aControls) {
 				var oView = this.getView(),
@@ -81,14 +95,13 @@ sap.ui.define(
 					oViewData = oView.getViewData(),
 					bControlVM = oViewData.variantManagement === VariantManagement.Control;
 
-				if (oController._isMultiMode()) {
-					aStateControls.push(oController._getMultiModeControl());
-				}
-
 				var oFilterBarVM = this._getFilterBarVM(oView);
 				if (oFilterBarVM) {
 					aStateControls.push(oFilterBarVM);
 				}
+				if (oController._isMultiMode()) {
+					aStateControls.push(oController._getMultiModeControl());
+				}
 				oController._getControls("table").forEach(function(oTable) {
 					var oQuickFilter = oTable.getQuickFilter();
 					if (oQuickFilter) {
@@ -104,7 +117,10 @@ sap.ui.define(
 					aStateControls.push(oController._getSegmentedButton(TemplateContentView.Chart));
 					aStateControls.push(oController._getSegmentedButton(TemplateContentView.Table));
 				}
-				aStateControls.push(oController._getFilterBarControl());
+				var oFilterBar = oController._getFilterBarControl();
+				if (oFilterBar) {
+					aStateControls.push(oFilterBar);
+				}
 				aStateControls.push(oView.byId("fe::ListReport"));
 			},
 			retrieveAdditionalStates: function(mAdditionalStates) {
@@ -127,10 +143,13 @@ sap.ui.define(
 
 				if (oAdditionalStates) {
 					// explicit check for boolean values - 'undefined' should not alter the triggered search property
-					if (oAdditionalStates.dataLoaded === false) {
+					if (oAdditionalStates.dataLoaded === false && oFilterBar) {
+						// without this, the data is loaded on navigating back
 						oFilterBar._bSearchTriggered = false;
 					} else if (oAdditionalStates.dataLoaded === true) {
-						oController._getFilterBarControl().triggerSearch();
+						if (oFilterBar) {
+							oFilterBar.triggerSearch();
+						}
 						this._bSearchTriggered = true;
 					}
 					if (oController._hasMultiVisualizations()) {
@@ -148,42 +167,44 @@ sap.ui.define(
 				var oView = this.getView(),
 					that = this,
 					oController = oView.getController(),
-					oComponent = oController.getOwnerComponent(),
-					oAppComponent = sap.ui.core.Component.getOwnerComponentFor(oComponent),
+					oAppComponent = oController.getAppComponent(oView),
 					oComponentData = oAppComponent.getComponentData(),
 					oStartupParameters = (oComponentData && oComponentData.startupParameters) || {},
 					oVariantPromise = that.handleVariantIdPassedViaURLParams(oStartupParameters),
 					bFilterVariantApplied;
-				oVariantPromise
-					.then(function(aVariants) {
-						if (aVariants && aVariants.length > 0) {
-							if (aVariants[0] === true || aVariants[1] === true) {
-								bFilterVariantApplied = true;
-							}
-						}
-						var oRes = that._applySelectionVariant(oView, oNavigationParameter, bFilterVariantApplied).then(function() {
-							var oController = oView.getController();
-							var oDynamicPage = oView.byId("fe::ListReport");
-							var bPreventInitialSearch = false;
-							var oFilterBarVM = that._getFilterBarVM(oView);
-							var oFilterBarControl = oController._getFilterBarControl();
-							if (
-								(oNavigationParameter.navigationType !== NavType.initial && oNavigationParameter.requiresStandardVariant) ||
-								(!oFilterBarVM && oView.getViewData().initialLoad === InitialLoadMode.Enabled) ||
-								oController._shouldAutoTriggerSearch(oFilterBarVM)
-							) {
-								oFilterBarControl.triggerSearch();
-							} else {
-								bPreventInitialSearch = that._preventInitialSearch(oFilterBarVM);
+				aResults.push(
+					oVariantPromise
+						.then(function(aVariants) {
+							if (aVariants && aVariants.length > 0) {
+								if (aVariants[0] === true || aVariants[1] === true) {
+									bFilterVariantApplied = true;
+								}
 							}
-							that._bSearchTriggered = !bPreventInitialSearch;
-							oDynamicPage.setHeaderExpanded(Device.system.desktop || bPreventInitialSearch);
-						});
-						aResults.push(oRes);
-					})
-					.catch(function() {
-						Log.error("Variant ID cannot be applied");
-					});
+							return that._applySelectionVariant(oView, oNavigationParameter, bFilterVariantApplied).then(function() {
+								var oDynamicPage = oView.byId("fe::ListReport");
+								var bPreventInitialSearch = false;
+								var oFilterBarVM = that._getFilterBarVM(oView);
+								var oFilterBarControl = oController._getFilterBarControl();
+								if (oFilterBarControl) {
+									if (
+										(oNavigationParameter.navigationType !== NavType.initial &&
+											oNavigationParameter.requiresStandardVariant) ||
+										(!oFilterBarVM && oView.getViewData().initialLoad === InitialLoadMode.Enabled) ||
+										oController._shouldAutoTriggerSearch(oFilterBarVM)
+									) {
+										oFilterBarControl.triggerSearch();
+									} else {
+										bPreventInitialSearch = that._preventInitialSearch(oFilterBarVM);
+									}
+									that._bSearchTriggered = !bPreventInitialSearch;
+									oDynamicPage.setHeaderExpanded(Device.system.desktop || bPreventInitialSearch);
+								}
+							});
+						})
+						.catch(function() {
+							Log.error("Variant ID cannot be applied");
+						})
+				);
 			},
 
 			handleVariantIdPassedViaURLParams: function(oUrlParams) {
@@ -216,11 +237,13 @@ sap.ui.define(
 				} else if (oVariantIDs && sVariantManagement === "Control") {
 					if (oVariantIDs.sFilterBarVariantId) {
 						var oVM = oView.byId(oView.getContent()[0].data("filterBarVariantId"));
-						oVM.getVariants().forEach(function(oVariant) {
-							if (oVariant.key === oVariantIDs.sFilterBarVariantId) {
-								aPromises.push(that._applyControlVariant(oVM, oVariantIDs.sFilterBarVariantId, true));
-							}
-						});
+						if (oVM) {
+							oVM.getVariants().forEach(function(oVariant) {
+								if (oVariant.key === oVariantIDs.sFilterBarVariantId) {
+									aPromises.push(that._applyControlVariant(oVM, oVariantIDs.sFilterBarVariantId, true));
+								}
+							});
+						}
 					}
 					if (oVariantIDs.sTableVariantId) {
 						var oController = oView.getController(),
@@ -280,17 +303,16 @@ sap.ui.define(
 			},
 
 			_applySelectionVariant: function(oView, oNavigationParameter, bFilterVariantApplied) {
-				var oSelectionVariant = oNavigationParameter.selectionVariant,
+				var oFilterBar = oView.getController()._getFilterBarControl(),
+					oSelectionVariant = oNavigationParameter.selectionVariant,
 					oSelectionVariantDefaults = oNavigationParameter.selectionVariantDefaults;
-				if (!oSelectionVariant) {
+				if (!oFilterBar || !oSelectionVariant) {
 					return Promise.resolve();
 				}
-
 				var oConditions = {},
 					oMetaModel = oView.getModel().getMetaModel(),
 					oViewData = oView.getViewData(),
 					sContextPath = oViewData.contextPath || "/" + oViewData.entitySet,
-					oFilterBar = oView.byId(oView.getContent()[0].data("filterBarId")),
 					aMandatoryFilterFields = CommonUtils.getMandatoryFilterFields(oMetaModel, sContextPath),
 					oVariant,
 					bRequiresStandardVariant = oNavigationParameter.requiresStandardVariant;

package/packages/sap.fe.templates/src/sap/fe/templates/ListReport/overrides/ViewState.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/fe/core/library","sap/fe/navigation/library","sap/fe/core/CommonUtils","sap/fe/core/helpers/KeepAliveHelper","sap/ui/fl/apply/api/ControlVariantApplyAPI","sap/ui/mdc/p13n/StateUtil","sap/ui/Device","sap/ui/mdc/enum/ConditionValidated","sap/fe/macros/DelegateUtil","sap/fe/core/helpers/ModelHelper","sap/fe/macros/filter/FilterUtils","sap/fe/core/templating/PropertyFormatters","sap/base/Log"],function(C,N,a,K,b,S,D,c,d,M,F,P,L){"use strict";var e=N.NavType,V=C.VariantManagement,T=C.TemplateContentView,I=C.InitialLoadMode;var f=a.FilterRestrictions,g=/\+|\*/g;return{applyInitialStateOnly:function(){return true;},onBeforeStateApplied:function(p){var v=this.getView(),o=v.getController(),h=o._getFilterBarControl(),t=o._getControls("table");h.setSuspendSelection(true);t.forEach(function(i){p.push(i.initialized());});p.push(h.initialized());delete this._bSearchTriggered;},onAfterStateApplied:function(){var v=this.getView(),o=v.getController();o._getFilterBarControl().setSuspendSelection(false);},adaptBindingRefreshControls:function(h){var v=this.getView(),o=v.getController(),i=o._getControls(),j=K.getControlsForRefresh(v,i);Array.prototype.push.apply(h,j);},adaptStateControls:function(s){var v=this.getView(),o=v.getController(),h=v.getViewData(),i=h.variantManagement===V.Control;if(o._isMultiMode()){s.push(o._getMultiModeControl());}var j=this._getFilterBarVM(v);if(j){s.push(j);}o._getControls("table").forEach(function(t){var q=t.getQuickFilter();if(q){s.push(q);}if(i){s.push(t.getVariant());}s.push(t);});if(o._hasMultiVisualizations()){s.push(o._getSegmentedButton(T.Chart));s.push(o._getSegmentedButton(T.Table));}s.push(o._getFilterBarControl());s.push(v.byId("fe::ListReport"));},retrieveAdditionalStates:function(A){var v=this.getView(),o=v.getController(),p=v.getBindingContext("internal").getProperty("hasPendingFilters");A.dataLoaded=!p||!!this._bSearchTriggered;if(o._hasMultiVisualizations()){var s=v.getBindingContext("internal").getProperty("alpContentView");A.alpContentView=s;}delete this._bSearchTriggered;},applyAdditionalStates:function(A){var v=this.getView(),o=v.getController(),h=o._getFilterBarControl();if(A){if(A.dataLoaded===false){h._bSearchTriggered=false;}else if(A.dataLoaded===true){o._getFilterBarControl().triggerSearch();this._bSearchTriggered=true;}if(o._hasMultiVisualizations()){var i=v.getBindingContext("internal");if(!D.system.desktop&&A.alpContentView==T.Hybrid){A.alpContentView=T.Chart;}i.getModel().setProperty(i.getPath()+"/alpContentView",A.alpContentView);}}},applyNavigationParameters:function(n,r){var v=this.getView(),t=this,o=v.getController(),h=o.getOwnerComponent(),A=sap.ui.core.Component.getOwnerComponentFor(h),i=A.getComponentData(),s=(i&&i.startupParameters)||{},j=t.handleVariantIdPassedViaURLParams(s),k;j.then(function(l){if(l&&l.length>0){if(l[0]===true||l[1]===true){k=true;}}var R=t._applySelectionVariant(v,n,k).then(function(){var o=v.getController();var m=v.byId("fe::ListReport");var p=false;var q=t._getFilterBarVM(v);var u=o._getFilterBarControl();if((n.navigationType!==e.initial&&n.requiresStandardVariant)||(!q&&v.getViewData().initialLoad===I.Enabled)||o._shouldAutoTriggerSearch(q)){u.triggerSearch();}else{p=t._preventInitialSearch(q);}t._bSearchTriggered=!p;m.setHeaderExpanded(D.system.desktop||p);});r.push(R);}).catch(function(){L.error("Variant ID cannot be applied");});},handleVariantIdPassedViaURLParams:function(u){var p=u["sap-ui-fe-variant-id"],h=u["sap-ui-fe-filterbar-variant-id"],t=u["sap-ui-fe-table-variant-id"],v;if(p||h||t){v={sPageVariantId:p&&p[0],sFilterBarVariantId:h&&h[0],sTableVariantId:t&&t[0]};}return this._handleControlVariantId(v);},_handleControlVariantId:function(v){var o=this.getView(),p=[],t=this;var s=o.getViewData().variantManagement;if(v&&v.sPageVariantId&&s==="Page"){var h=o.byId("fe::PageVariantManagement");h.getVariants().forEach(function(k){if(k.key===v.sPageVariantId){p.push(t._applyControlVariant(h,v.sPageVariantId,true));}});}else if(v&&s==="Control"){if(v.sFilterBarVariantId){var h=o.byId(o.getContent()[0].data("filterBarVariantId"));h.getVariants().forEach(function(k){if(k.key===v.sFilterBarVariantId){p.push(t._applyControlVariant(h,v.sFilterBarVariantId,true));}});}if(v.sTableVariantId){var i=o.getController(),j=i._getControls("table");j.forEach(function(k){var l=k.getVariant();if(k&&l){l.getVariants().forEach(function(m){if(m.key===v.sTableVariantId){p.push(t._applyControlVariant(l,v.sTableVariantId));}});}});}}return Promise.all(p);},_applyControlVariant:function(v,s,h){var i=this._checkIfVariantIdIsAvailable(v,s)?s:v.getStandardVariantKey();var o=b.activateVariant({element:v,variantReference:i});return o.then(function(){return h;});},_getFilterBarVM:function(v){var o=v.getViewData();switch(o.variantManagement){case V.Page:return v.byId("fe::PageVariantManagement");case V.Control:return v.byId(v.getContent()[0].data("filterBarVariantId"));case V.None:return null;default:throw new Error("unhandled variant setting: "+o.variantManagement);}},_preventInitialSearch:function(v){if(!v){return true;}var h=v.getVariants();var o=h.find(function(i){return i.key===v.getCurrentVariantKey();});return!o.executeOnSelect;},_applySelectionVariant:function(v,n,h){var s=n.selectionVariant,o=n.selectionVariantDefaults;if(!s){return Promise.resolve();}var i={},m=v.getModel().getMetaModel(),j=v.getViewData(),k=j.contextPath||"/"+j.entitySet,l=v.byId(v.getContent()[0].data("filterBarId")),p=a.getMandatoryFilterFields(m,k),q,r=n.requiresStandardVariant;if(h){i=l.getConditions();}a.addDefaultDisplayCurrency(p,s,o);a.addSelectionVariantToConditions(s,i,m,k);switch(j.variantManagement){case V.Page:q=v.byId("fe::PageVariantManagement");break;case V.Control:q=v.byId(v.getContent()[0].data("filterBarVariantId"));break;case V.None:default:break;}return this._activateSelectionVariant(l,i,q,r,h);},_activateSelectionVariant:function(o,h,v,r,i){var t=this,p;if(v&&!i){var j=r?v.getStandardVariantKey():v.getDefaultVariantKey();if(j===null){j=v.getId();}p=b.activateVariant({element:v,variantReference:j}).then(function(){return r||v.getDefaultVariantKey()===v.getStandardVariantKey();});}else{p=Promise.resolve(true);}return p.then(function(k){if(k){return t._fnApplyConditions(o,h);}});},_fnApplyConditions:function(o,h){var m={},i=[],A=function(j){j.validated=c.Validated;if(j.operator==="Empty"){j.operator="EQ";j.values=[""];}else if(j.operator==="NotEmpty"){j.operator="NE";j.values=[""];}delete j.isEmpty;};var G=function(j,E){var s=M.getEntitySetPath(E),k=j.getModel().getMetaModel(),l=a.getFilterRestrictionsByPath(s,k),n=l[f.NON_FILTERABLE_PROPERTIES],p=F.getConvertedFilterFields(j,E),q=[];Object.keys(p).forEach(function(r){var t=p[r];var u=t.conditionPath.replace(g,"");if(n.indexOf(u)===-1){var v=t.annotationPath;var w=k.createBindingContext(v);q.push({path:t.conditionPath,hiddenFilter:t.availability==="Hidden",hasValueHelp:!v?false:P.hasValueHelp(w.getObject(),{context:w})});return;}});return q;};return o.initialized().then(function(){var E=d.getCustomData(o,"entityType");var p=G(o,E);p.filter(function(j){return j.path!=="$editState"&&j.path!=="$search";}).forEach(function(j){if(j.path in h){m[j.path]=h[j.path];if(!j.hiddenFilter){i.push({name:j.path});}if(j.hasValueHelp){m[j.path].forEach(A);}else{m[j.path].forEach(function(k){k.validated=c.NotValidated;});}}else{m[j.path]=[];}});return S.applyExternalState(o,{filter:m,items:i});});}};});
+sap.ui.define(["sap/fe/core/library","sap/fe/navigation/library","sap/fe/core/CommonUtils","sap/fe/core/helpers/KeepAliveHelper","sap/ui/fl/apply/api/ControlVariantApplyAPI","sap/ui/mdc/p13n/StateUtil","sap/ui/Device","sap/ui/mdc/enum/ConditionValidated","sap/fe/macros/DelegateUtil","sap/fe/core/helpers/ModelHelper","sap/fe/macros/filter/FilterUtils","sap/fe/core/templating/PropertyFormatters","sap/base/Log"],function(C,N,a,K,b,S,D,c,d,M,F,P,L){"use strict";var e=N.NavType,V=C.VariantManagement,T=C.TemplateContentView,I=C.InitialLoadMode;var f=a.FilterRestrictions,g=/\+|\*/g;return{applyInitialStateOnly:function(){return true;},onBeforeStateApplied:function(p){var v=this.getView(),o=v.getController(),h=o._getFilterBarControl(),t=o._getControls("table");if(h){h.setSuspendSelection(true);p.push(h.initialized());}t.forEach(function(i){p.push(i.initialized());});delete this._bSearchTriggered;},onAfterStateApplied:function(){var o=this.getView().getController();var h=o._getFilterBarControl();if(h){h.setSuspendSelection(false);}else if(o._isFilterBarHidden()){var i=o.getView().getBindingContext("internal"),j=o._getControls();i.setProperty("hasPendingFilters",false);if(o._isMultiMode()){o._setCountsOutDated();var s=o._getCurrentControl().getId();j.forEach(function(k){k.data("outdatedRows",k.getId()!==s);});}}},adaptBindingRefreshControls:function(h){var v=this.getView(),o=v.getController(),i=o._getControls(),j=K.getControlsForRefresh(v,i);Array.prototype.push.apply(h,j);},adaptStateControls:function(s){var v=this.getView(),o=v.getController(),h=v.getViewData(),i=h.variantManagement===V.Control;var j=this._getFilterBarVM(v);if(j){s.push(j);}if(o._isMultiMode()){s.push(o._getMultiModeControl());}o._getControls("table").forEach(function(t){var q=t.getQuickFilter();if(q){s.push(q);}if(i){s.push(t.getVariant());}s.push(t);});if(o._hasMultiVisualizations()){s.push(o._getSegmentedButton(T.Chart));s.push(o._getSegmentedButton(T.Table));}var k=o._getFilterBarControl();if(k){s.push(k);}s.push(v.byId("fe::ListReport"));},retrieveAdditionalStates:function(A){var v=this.getView(),o=v.getController(),p=v.getBindingContext("internal").getProperty("hasPendingFilters");A.dataLoaded=!p||!!this._bSearchTriggered;if(o._hasMultiVisualizations()){var s=v.getBindingContext("internal").getProperty("alpContentView");A.alpContentView=s;}delete this._bSearchTriggered;},applyAdditionalStates:function(A){var v=this.getView(),o=v.getController(),h=o._getFilterBarControl();if(A){if(A.dataLoaded===false&&h){h._bSearchTriggered=false;}else if(A.dataLoaded===true){if(h){h.triggerSearch();}this._bSearchTriggered=true;}if(o._hasMultiVisualizations()){var i=v.getBindingContext("internal");if(!D.system.desktop&&A.alpContentView==T.Hybrid){A.alpContentView=T.Chart;}i.getModel().setProperty(i.getPath()+"/alpContentView",A.alpContentView);}}},applyNavigationParameters:function(n,r){var v=this.getView(),t=this,o=v.getController(),A=o.getAppComponent(v),h=A.getComponentData(),s=(h&&h.startupParameters)||{},i=t.handleVariantIdPassedViaURLParams(s),j;r.push(i.then(function(k){if(k&&k.length>0){if(k[0]===true||k[1]===true){j=true;}}return t._applySelectionVariant(v,n,j).then(function(){var l=v.byId("fe::ListReport");var p=false;var m=t._getFilterBarVM(v);var q=o._getFilterBarControl();if(q){if((n.navigationType!==e.initial&&n.requiresStandardVariant)||(!m&&v.getViewData().initialLoad===I.Enabled)||o._shouldAutoTriggerSearch(m)){q.triggerSearch();}else{p=t._preventInitialSearch(m);}t._bSearchTriggered=!p;l.setHeaderExpanded(D.system.desktop||p);}});}).catch(function(){L.error("Variant ID cannot be applied");}));},handleVariantIdPassedViaURLParams:function(u){var p=u["sap-ui-fe-variant-id"],h=u["sap-ui-fe-filterbar-variant-id"],t=u["sap-ui-fe-table-variant-id"],v;if(p||h||t){v={sPageVariantId:p&&p[0],sFilterBarVariantId:h&&h[0],sTableVariantId:t&&t[0]};}return this._handleControlVariantId(v);},_handleControlVariantId:function(v){var o=this.getView(),p=[],t=this;var s=o.getViewData().variantManagement;if(v&&v.sPageVariantId&&s==="Page"){var h=o.byId("fe::PageVariantManagement");h.getVariants().forEach(function(k){if(k.key===v.sPageVariantId){p.push(t._applyControlVariant(h,v.sPageVariantId,true));}});}else if(v&&s==="Control"){if(v.sFilterBarVariantId){var h=o.byId(o.getContent()[0].data("filterBarVariantId"));if(h){h.getVariants().forEach(function(k){if(k.key===v.sFilterBarVariantId){p.push(t._applyControlVariant(h,v.sFilterBarVariantId,true));}});}}if(v.sTableVariantId){var i=o.getController(),j=i._getControls("table");j.forEach(function(k){var l=k.getVariant();if(k&&l){l.getVariants().forEach(function(m){if(m.key===v.sTableVariantId){p.push(t._applyControlVariant(l,v.sTableVariantId));}});}});}}return Promise.all(p);},_applyControlVariant:function(v,s,h){var i=this._checkIfVariantIdIsAvailable(v,s)?s:v.getStandardVariantKey();var o=b.activateVariant({element:v,variantReference:i});return o.then(function(){return h;});},_getFilterBarVM:function(v){var o=v.getViewData();switch(o.variantManagement){case V.Page:return v.byId("fe::PageVariantManagement");case V.Control:return v.byId(v.getContent()[0].data("filterBarVariantId"));case V.None:return null;default:throw new Error("unhandled variant setting: "+o.variantManagement);}},_preventInitialSearch:function(v){if(!v){return true;}var h=v.getVariants();var o=h.find(function(i){return i.key===v.getCurrentVariantKey();});return!o.executeOnSelect;},_applySelectionVariant:function(v,n,h){var o=v.getController()._getFilterBarControl(),s=n.selectionVariant,i=n.selectionVariantDefaults;if(!o||!s){return Promise.resolve();}var j={},m=v.getModel().getMetaModel(),k=v.getViewData(),l=k.contextPath||"/"+k.entitySet,p=a.getMandatoryFilterFields(m,l),q,r=n.requiresStandardVariant;if(h){j=o.getConditions();}a.addDefaultDisplayCurrency(p,s,i);a.addSelectionVariantToConditions(s,j,m,l);switch(k.variantManagement){case V.Page:q=v.byId("fe::PageVariantManagement");break;case V.Control:q=v.byId(v.getContent()[0].data("filterBarVariantId"));break;case V.None:default:break;}return this._activateSelectionVariant(o,j,q,r,h);},_activateSelectionVariant:function(o,h,v,r,i){var t=this,p;if(v&&!i){var j=r?v.getStandardVariantKey():v.getDefaultVariantKey();if(j===null){j=v.getId();}p=b.activateVariant({element:v,variantReference:j}).then(function(){return r||v.getDefaultVariantKey()===v.getStandardVariantKey();});}else{p=Promise.resolve(true);}return p.then(function(k){if(k){return t._fnApplyConditions(o,h);}});},_fnApplyConditions:function(o,h){var m={},i=[],A=function(j){j.validated=c.Validated;if(j.operator==="Empty"){j.operator="EQ";j.values=[""];}else if(j.operator==="NotEmpty"){j.operator="NE";j.values=[""];}delete j.isEmpty;};var G=function(j,E){var s=M.getEntitySetPath(E),k=j.getModel().getMetaModel(),l=a.getFilterRestrictionsByPath(s,k),n=l[f.NON_FILTERABLE_PROPERTIES],p=F.getConvertedFilterFields(j,E),q=[];Object.keys(p).forEach(function(r){var t=p[r];var u=t.conditionPath.replace(g,"");if(n.indexOf(u)===-1){var v=t.annotationPath;var w=k.createBindingContext(v);q.push({path:t.conditionPath,hiddenFilter:t.availability==="Hidden",hasValueHelp:!v?false:P.hasValueHelp(w.getObject(),{context:w})});return;}});return q;};return o.initialized().then(function(){var E=d.getCustomData(o,"entityType");var p=G(o,E);p.filter(function(j){return j.path!=="$editState"&&j.path!=="$search";}).forEach(function(j){if(j.path in h){m[j.path]=h[j.path];if(!j.hiddenFilter){i.push({name:j.path});}if(j.hasValueHelp){m[j.path].forEach(A);}else{m[j.path].forEach(function(k){k.validated=c.NotValidated;});}}else{m[j.path]=[];}});return S.applyExternalState(o,{filter:m,items:i});});}};});

package/packages/sap.fe.templates/src/sap/fe/templates/ListReport/resources.json

@@ -3,34 +3,34 @@
 	"resources": [
 		{
 			"name": "Component-dbg.js",
-			"size": 937,
+			"size": 1109,
 			"isDebug": true
 		},
 		{
 			"name": "Component.js",
-			"size": 402
+			"size": 452
 		},
 		{
 			"name": "ExtensionAPI-dbg.js",
-			"size": 3936,
+			"size": 4065,
 			"isDebug": true
 		},
 		{
 			"name": "ExtensionAPI.js",
-			"size": 1063
+			"size": 1101
 		},
 		{
 			"name": "ListReport.view.xml",
-			"size": 10455
+			"size": 10781
 		},
 		{
 			"name": "ListReportController-dbg.controller.js",
-			"size": 35647,
+			"size": 39173,
 			"isDebug": true
 		},
 		{
 			"name": "ListReportController.controller.js",
-			"size": 16793
+			"size": 18045
 		},
 		{
 			"name": "manifest.json",
@@ -38,43 +38,34 @@
 		},
 		{
 			"name": "overrides/IntentBasedNavigation-dbg.js",
-			"size": 2381,
+			"size": 2411,
 			"isDebug": true
 		},
 		{
 			"name": "overrides/IntentBasedNavigation.js",
-			"size": 1128
-		},
-		{
-			"name": "overrides/MassEdit-dbg.js",
-			"size": 3224,
-			"isDebug": true
-		},
-		{
-			"name": "overrides/MassEdit.js",
-			"size": 1732
+			"size": 1126
 		},
 		{
 			"name": "overrides/Share-dbg.js",
-			"size": 4928,
+			"size": 4946,
 			"isDebug": true
 		},
 		{
 			"name": "overrides/Share.js",
-			"size": 2254
+			"size": 2255
 		},
 		{
 			"name": "overrides/ViewState-dbg.js",
-			"size": 15798,
+			"size": 16563,
 			"isDebug": true
 		},
 		{
 			"name": "overrides/ViewState.js",
-			"size": 7557
+			"size": 7801
 		},
 		{
 			"name": "view/fragments/CollectionVisualization.fragment.xml",
-			"size": 1566
+			"size": 2131
 		},
 		{
 			"name": "view/fragments/CustomView.fragment.xml",

package/packages/sap.fe.templates/src/sap/fe/templates/ListReport/view/fragments/CollectionVisualization.fragment.xml

@@ -10,6 +10,14 @@
 					<template:repeat list="{converterContext>views}" var="view">
 						<template:with path="view>primaryVisualization" var="presentationContext">
 							<template:repeat list="{presentationContext>visualizations}" var="visualizationDefinition">
+								<m:MessageStrip
+								text="{= '{path:\'internal>controls/ignoredFields' + (${visualizationDefinition>collection}) + (${visualizationDefinition>type}) + '\', formatter: \'.formatters.setChartMessageStrip\'}'}"
+								type="Information"
+								showIcon="true"
+								showCloseButton="true"
+								class="sapUiSmallMargin"
+								visible="{= '{= (${internal>controls/ignoredFields' + (${visualizationDefinition>collection}) + (${visualizationDefinition>type}) + '} || []).length>0 &amp;&amp; ${pageInternal>alpContentView} !== \'Table\'}' }"
+							/>
 								<core:Fragment fragmentName="sap.fe.templates.controls.{visualizationDefinition>type}" type="XML" />
 							</template:repeat>
 						</template:with>

package/packages/sap.fe.templates/src/sap/fe/templates/ObjectPage/AnnotationHelper-dbg.js

@@ -49,7 +49,7 @@ sap.ui.define(
 			 */
 			getSwitchToActiveVisibility: function(oAnnotations) {
 				if (this.checkDraftState(oAnnotations)) {
-					return "{= (${ui>/editMode} === 'Editable') && !${ui>createMode} && %{DraftAdministrativeData/DraftIsCreatedByMe} }";
+					return "{= (%{DraftAdministrativeData/DraftIsCreatedByMe}) ? ( (${ui>/editMode} === 'Editable') && !${ui>createMode} && %{DraftAdministrativeData/DraftIsCreatedByMe} ) : false }";
 				} else {
 					return false;
 				}
@@ -63,7 +63,7 @@ sap.ui.define(
 			 */
 			getSwitchToDraftVisibility: function(oAnnotations) {
 				if (this.checkDraftState(oAnnotations)) {
-					return "{= !(${ui>/editMode} === 'Editable') && !${ui>createMode} && (${HasDraftEntity} && %{DraftAdministrativeData/DraftIsCreatedByMe}) }";
+					return "{= (%{DraftAdministrativeData/DraftIsCreatedByMe}) ? ( !(${ui>/editMode} === 'Editable') && !${ui>createMode} && ${HasDraftEntity} && %{DraftAdministrativeData/DraftIsCreatedByMe} ) : false }";
 				} else {
 					return false;
 				}
@@ -466,7 +466,7 @@ sap.ui.define(
 						" ? true : false) }"
 					);
 				} else {
-					return sSubSectionvisible && sSubSectiontitle !== "undefined" && (sSubSectionshowTitle ? true : false);
+					return sSubSectionvisible && sSubSectiontitle !== "undefined" && (sSubSectionshowTitle ? "true" : "false");
 				}
 			}
 		};

package/packages/sap.fe.templates/src/sap/fe/templates/ObjectPage/AnnotationHelper.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/model/odata/v4/AnnotationHelper","sap/ui/base/ManagedObject","sap/fe/macros/CommonHelper"],function(O,M,C){"use strict";var A={getElementBinding:function(p){var n=O.getNavigationPath(p);if(n){return"{path:'"+n+"'}";}else{return"{path: ''}";}},checkDraftState:function(a){if(a["@com.sap.vocabularies.Common.v1.DraftRoot"]&&a["@com.sap.vocabularies.Common.v1.DraftRoot"]["EditAction"]){return true;}else{return false;}},getSwitchToActiveVisibility:function(a){if(this.checkDraftState(a)){return"{= (${ui>/editMode} === 'Editable') && !${ui>createMode} && %{DraftAdministrativeData/DraftIsCreatedByMe} }";}else{return false;}},getSwitchToDraftVisibility:function(a){if(this.checkDraftState(a)){return"{= !(${ui>/editMode} === 'Editable') && !${ui>createMode} && (${HasDraftEntity} && %{DraftAdministrativeData/DraftIsCreatedByMe}) }";}else{return false;}},_findAction:function(c,a){var o;if(c&&c.length){o=c.find(function(h){return h.type===a;});}return o;},getDeleteCommandExecutionEnabled:function(c){var d=A._findAction(c,"Secondary");return d?d.enabled:"true";},getDeleteCommandExecutionVisible:function(c){var d=A._findAction(c,"Secondary");return d?d.visible:"true";},getEditCommandExecutionVisible:function(c){var e=A._findAction(c,"Primary");return e?e.visible:"true";},getEditCommandExecutionEnabled:function(c){var e=A._findAction(c,"Primary");return e?e.enabled:"true";},getEditAction:function(e){var p=e.getPath(),a=e.getObject(p+"@");var d=a.hasOwnProperty("@com.sap.vocabularies.Common.v1.DraftRoot");var s=a.hasOwnProperty("@com.sap.vocabularies.Session.v1.StickySessionSupported");var b;if(d){b=e.getObject(p+"@com.sap.vocabularies.Common.v1.DraftRoot/EditAction");}else if(s){b=e.getObject(p+"@com.sap.vocabularies.Session.v1.StickySessionSupported/EditAction");}return!b?b:p+"/"+b;},isReadOnlyFromStaticAnnotations:function(a,f){var c,i,r;if(a["@Org.OData.Core.V1.Computed"]){c=a["@Org.OData.Core.V1.Computed"].Bool?a["@Org.OData.Core.V1.Computed"].Bool=="true":true;}if(a["@Org.OData.Core.V1.Immutable"]){i=a["@Org.OData.Core.V1.Immutable"].Bool?a["@Org.OData.Core.V1.Immutable"].Bool=="true":true;}r=c||i;if(f){r=r||f=="com.sap.vocabularies.Common.v1.FieldControlType/ReadOnly";}if(r){return false;}else{return true;}},isReadOnlyFromDynamicAnnotations:function(f){var i;if(f){if(M.bindingParser(f)){i="$"+f+" === '1'";}}if(i){return"{= "+i+"? false : true }";}else{return true;}},getExpressionForMicroChartTitlePress:function(c,m,s){if(c){if((c["targetOutbound"]&&c["targetOutbound"]["outbound"])||(c["targetOutbound"]&&c["targetOutbound"]["outbound"]&&c["targetSections"])){return(".handlers.onDataPointTitlePressed($controller, ${$source>/},'"+JSON.stringify(m)+"','"+c["targetOutbound"]["outbound"]+"','"+s+"' )");}else if(c["targetSections"]){return".handlers.navigateToSubSection($controller, '"+JSON.stringify(c["targetSections"])+"')";}else{return undefined;}}},getMicroChartTitleAsLink:function(c){if(c&&(c["targetOutbound"]||(c["targetOutbound"]&&c["targetSections"]))){return"External";}else if(c&&c["targetSections"]){return"InPage";}else{return"None";}},getGroupIdFromConfig:function(c,a,d){var o=c[a],b=["Heroes","Decoration","Workers","LongRunners"],g=d;if(o&&o.requestGroupId&&b.some(function(e){return e===o.requestGroupId;})){g="$auto."+o.requestGroupId;}return g;},getBindingWithGroupIdFromConfig:function(c,k){var g=A.getGroupIdFromConfig(c,k),b;if(g){b="{ path : '', parameters : { $$groupId : '"+g+"' } }";}return b;},doesFieldGroupContainOnlyOneMultiLineDataField:function(f){return f&&f.length===1&&!!f[0].isValueMultilineText;},getVisibleExpressionForBreadcrumbs:function(v){return v.showBreadCrumbs&&v.fclEnabled!==undefined?"{fclhelper>/breadCrumbIsVisible}":v.showBreadCrumbs;},getShareButtonVisibility:function(v){var s="!${ui>createMode}";if(v.fclEnabled){s="${fclhelper>/showShareIcon} && "+s;}return"{= "+s+" }";},getVisiblityOfHeaderFacet:function(a,f){return(A.isReadOnlyFromStaticAnnotations(a,f)&&A.isReadOnlyFromDynamicAnnotations(f));},getPressExpressionForDelete:function(e){var d="${$view>/getBindingContext}",t="${$view>/#fe::ObjectPage/getHeaderTitle/getExpandedHeading/getItems/1/getText}",D="${$view>/#fe::ObjectPage/getHeaderTitle/getExpandedContent/0/getItems/0/getText}";var p={title:t,entitySetName:C.addSingleQuotes(e),description:D};return C.generateFunction(".editFlow.deleteDocument",d,C.objectToString(p));},getPressExpressionForEdit:function(d,e,h){var E=C.addSingleQuotes(d&&d.Action),D=d&&d.InvocationGrouping&&d.InvocationGrouping["$EnumMember"],i=D==="com.sap.vocabularies.UI.v1.OperationGroupingType/ChangeSet"?"ChangeSet":"Isolated";var p={contexts:"${$view>/getBindingContext}",entitySetName:C.addSingleQuotes(e),invocationGrouping:C.addSingleQuotes(i),model:"${$source>/}.getModel()",label:C.addSingleQuotes(d&&d.Label,true),isNavigable:h&&h.isNavigable,defaultValuesExtensionFunction:h&&h.defaultValuesExtensionFunction?"'"+h.defaultValuesExtensionFunction+"'":undefined};return C.generateFunction(".handlers.onCallAction","${$view>/}",E,C.objectToString(p));},getPressExpressionForFooterAnnotationAction:function(d,e,h){var a=C.addSingleQuotes(d&&d.Action),D=d&&d.InvocationGrouping&&d.InvocationGrouping["$EnumMember"],i=D==="com.sap.vocabularies.UI.v1.OperationGroupingType/ChangeSet"?"ChangeSet":"Isolated";var p={contexts:"${$view>/#fe::ObjectPage/}.getBindingContext()",entitySetName:C.addSingleQuotes(e),invocationGrouping:C.addSingleQuotes(i),model:"${$source>/}.getModel()",label:C.addSingleQuotes(d&&d.Label,true),isNavigable:h&&h.isNavigable,defaultValuesExtensionFunction:h&&h.defaultValuesExtensionFunction?"'"+h.defaultValuesExtensionFunction+"'":undefined};return C.generateFunction(".handlers.onCallAction","${$view>/}",a,C.objectToString(p));},getStashableHBoxBinding:function(c,h){if(h&&h.Facet&&h.Facet.targetAnnotationType==="DataPoint"){return A.getBindingWithGroupIdFromConfig(c,h.Facet.targetAnnotationValue);}},getPressExpressionForLink:function(c,m){if(c){if(c["targetOutbound"]&&c["targetOutbound"]["outbound"]){return(".handlers.onDataPointTitlePressed($controller, ${$source>}, "+JSON.stringify(m)+","+JSON.stringify(c["targetOutbound"]["outbound"])+")");}else if(c["targetSections"]){return".handlers.navigateToSubSection($controller, '"+JSON.stringify(c["targetSections"])+"')";}else{return undefined;}}},isSubSectionTitleVisible:function(s,S,a){if(s.indexOf("{=")===0){var e=s.substring(s.indexOf("{=")+2,s.lastIndexOf("}"));return("{= ("+e+") && ('"+S+"' !=='undefined') && ("+a+" ? true : false) }");}else{return s&&S!=="undefined"&&(a?true:false);}}};return A;},true);
+sap.ui.define(["sap/ui/model/odata/v4/AnnotationHelper","sap/ui/base/ManagedObject","sap/fe/macros/CommonHelper"],function(O,M,C){"use strict";var A={getElementBinding:function(p){var n=O.getNavigationPath(p);if(n){return"{path:'"+n+"'}";}else{return"{path: ''}";}},checkDraftState:function(a){if(a["@com.sap.vocabularies.Common.v1.DraftRoot"]&&a["@com.sap.vocabularies.Common.v1.DraftRoot"]["EditAction"]){return true;}else{return false;}},getSwitchToActiveVisibility:function(a){if(this.checkDraftState(a)){return"{= (%{DraftAdministrativeData/DraftIsCreatedByMe}) ? ( (${ui>/editMode} === 'Editable') && !${ui>createMode} && %{DraftAdministrativeData/DraftIsCreatedByMe} ) : false }";}else{return false;}},getSwitchToDraftVisibility:function(a){if(this.checkDraftState(a)){return"{= (%{DraftAdministrativeData/DraftIsCreatedByMe}) ? ( !(${ui>/editMode} === 'Editable') && !${ui>createMode} && ${HasDraftEntity} && %{DraftAdministrativeData/DraftIsCreatedByMe} ) : false }";}else{return false;}},_findAction:function(c,a){var o;if(c&&c.length){o=c.find(function(h){return h.type===a;});}return o;},getDeleteCommandExecutionEnabled:function(c){var d=A._findAction(c,"Secondary");return d?d.enabled:"true";},getDeleteCommandExecutionVisible:function(c){var d=A._findAction(c,"Secondary");return d?d.visible:"true";},getEditCommandExecutionVisible:function(c){var e=A._findAction(c,"Primary");return e?e.visible:"true";},getEditCommandExecutionEnabled:function(c){var e=A._findAction(c,"Primary");return e?e.enabled:"true";},getEditAction:function(e){var p=e.getPath(),a=e.getObject(p+"@");var d=a.hasOwnProperty("@com.sap.vocabularies.Common.v1.DraftRoot");var s=a.hasOwnProperty("@com.sap.vocabularies.Session.v1.StickySessionSupported");var b;if(d){b=e.getObject(p+"@com.sap.vocabularies.Common.v1.DraftRoot/EditAction");}else if(s){b=e.getObject(p+"@com.sap.vocabularies.Session.v1.StickySessionSupported/EditAction");}return!b?b:p+"/"+b;},isReadOnlyFromStaticAnnotations:function(a,f){var c,i,r;if(a["@Org.OData.Core.V1.Computed"]){c=a["@Org.OData.Core.V1.Computed"].Bool?a["@Org.OData.Core.V1.Computed"].Bool=="true":true;}if(a["@Org.OData.Core.V1.Immutable"]){i=a["@Org.OData.Core.V1.Immutable"].Bool?a["@Org.OData.Core.V1.Immutable"].Bool=="true":true;}r=c||i;if(f){r=r||f=="com.sap.vocabularies.Common.v1.FieldControlType/ReadOnly";}if(r){return false;}else{return true;}},isReadOnlyFromDynamicAnnotations:function(f){var i;if(f){if(M.bindingParser(f)){i="$"+f+" === '1'";}}if(i){return"{= "+i+"? false : true }";}else{return true;}},getExpressionForMicroChartTitlePress:function(c,m,s){if(c){if((c["targetOutbound"]&&c["targetOutbound"]["outbound"])||(c["targetOutbound"]&&c["targetOutbound"]["outbound"]&&c["targetSections"])){return(".handlers.onDataPointTitlePressed($controller, ${$source>/},'"+JSON.stringify(m)+"','"+c["targetOutbound"]["outbound"]+"','"+s+"' )");}else if(c["targetSections"]){return".handlers.navigateToSubSection($controller, '"+JSON.stringify(c["targetSections"])+"')";}else{return undefined;}}},getMicroChartTitleAsLink:function(c){if(c&&(c["targetOutbound"]||(c["targetOutbound"]&&c["targetSections"]))){return"External";}else if(c&&c["targetSections"]){return"InPage";}else{return"None";}},getGroupIdFromConfig:function(c,a,d){var o=c[a],b=["Heroes","Decoration","Workers","LongRunners"],g=d;if(o&&o.requestGroupId&&b.some(function(e){return e===o.requestGroupId;})){g="$auto."+o.requestGroupId;}return g;},getBindingWithGroupIdFromConfig:function(c,k){var g=A.getGroupIdFromConfig(c,k),b;if(g){b="{ path : '', parameters : { $$groupId : '"+g+"' } }";}return b;},doesFieldGroupContainOnlyOneMultiLineDataField:function(f){return f&&f.length===1&&!!f[0].isValueMultilineText;},getVisibleExpressionForBreadcrumbs:function(v){return v.showBreadCrumbs&&v.fclEnabled!==undefined?"{fclhelper>/breadCrumbIsVisible}":v.showBreadCrumbs;},getShareButtonVisibility:function(v){var s="!${ui>createMode}";if(v.fclEnabled){s="${fclhelper>/showShareIcon} && "+s;}return"{= "+s+" }";},getVisiblityOfHeaderFacet:function(a,f){return(A.isReadOnlyFromStaticAnnotations(a,f)&&A.isReadOnlyFromDynamicAnnotations(f));},getPressExpressionForDelete:function(e){var d="${$view>/getBindingContext}",t="${$view>/#fe::ObjectPage/getHeaderTitle/getExpandedHeading/getItems/1/getText}",D="${$view>/#fe::ObjectPage/getHeaderTitle/getExpandedContent/0/getItems/0/getText}";var p={title:t,entitySetName:C.addSingleQuotes(e),description:D};return C.generateFunction(".editFlow.deleteDocument",d,C.objectToString(p));},getPressExpressionForEdit:function(d,e,h){var E=C.addSingleQuotes(d&&d.Action),D=d&&d.InvocationGrouping&&d.InvocationGrouping["$EnumMember"],i=D==="com.sap.vocabularies.UI.v1.OperationGroupingType/ChangeSet"?"ChangeSet":"Isolated";var p={contexts:"${$view>/getBindingContext}",entitySetName:C.addSingleQuotes(e),invocationGrouping:C.addSingleQuotes(i),model:"${$source>/}.getModel()",label:C.addSingleQuotes(d&&d.Label,true),isNavigable:h&&h.isNavigable,defaultValuesExtensionFunction:h&&h.defaultValuesExtensionFunction?"'"+h.defaultValuesExtensionFunction+"'":undefined};return C.generateFunction(".handlers.onCallAction","${$view>/}",E,C.objectToString(p));},getPressExpressionForFooterAnnotationAction:function(d,e,h){var a=C.addSingleQuotes(d&&d.Action),D=d&&d.InvocationGrouping&&d.InvocationGrouping["$EnumMember"],i=D==="com.sap.vocabularies.UI.v1.OperationGroupingType/ChangeSet"?"ChangeSet":"Isolated";var p={contexts:"${$view>/#fe::ObjectPage/}.getBindingContext()",entitySetName:C.addSingleQuotes(e),invocationGrouping:C.addSingleQuotes(i),model:"${$source>/}.getModel()",label:C.addSingleQuotes(d&&d.Label,true),isNavigable:h&&h.isNavigable,defaultValuesExtensionFunction:h&&h.defaultValuesExtensionFunction?"'"+h.defaultValuesExtensionFunction+"'":undefined};return C.generateFunction(".handlers.onCallAction","${$view>/}",a,C.objectToString(p));},getStashableHBoxBinding:function(c,h){if(h&&h.Facet&&h.Facet.targetAnnotationType==="DataPoint"){return A.getBindingWithGroupIdFromConfig(c,h.Facet.targetAnnotationValue);}},getPressExpressionForLink:function(c,m){if(c){if(c["targetOutbound"]&&c["targetOutbound"]["outbound"]){return(".handlers.onDataPointTitlePressed($controller, ${$source>}, "+JSON.stringify(m)+","+JSON.stringify(c["targetOutbound"]["outbound"])+")");}else if(c["targetSections"]){return".handlers.navigateToSubSection($controller, '"+JSON.stringify(c["targetSections"])+"')";}else{return undefined;}}},isSubSectionTitleVisible:function(s,S,a){if(s.indexOf("{=")===0){var e=s.substring(s.indexOf("{=")+2,s.lastIndexOf("}"));return("{= ("+e+") && ('"+S+"' !=='undefined') && ("+a+" ? true : false) }");}else{return s&&S!=="undefined"&&(a?"true":"false");}}};return A;},true);

package/packages/sap.fe.templates/src/sap/fe/templates/ObjectPage/Component-dbg.js

@@ -114,7 +114,7 @@ sap.ui.define(
 								this.oAppComponent.getComponentData().startupParameters,
 							oInboundParameters = this.getViewData().inboundParameters,
 							createParams;
-						if (oStartUpParams.preferredMode && oStartUpParams.preferredMode[0].indexOf("create") !== -1) {
+						if (oStartUpParams && oStartUpParams.preferredMode && oStartUpParams.preferredMode[0].indexOf("create") !== -1) {
 							createParams = CommonUtils.getAdditionalParamsForCreate(oStartUpParams, oInboundParameters);
 						}
 

package/packages/sap.fe.templates/src/sap/fe/templates/ObjectPage/Component.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/fe/core/TemplateComponent","sap/ui/model/odata/v4/ODataListBinding","sap/fe/core/CommonUtils","sap/base/Log","sap/fe/core/library","sap/fe/templates/ObjectPage/SectionLayout"],function(T,O,C,L,a,S){"use strict";var V=a.VariantManagement,b=a.CreationMode,c=T.extend("sap.fe.templates.ObjectPage.Component",{metadata:{properties:{variantManagement:{type:"sap.fe.core.VariantManagement",defaultValue:V.None},sectionLayout:{type:"sap.fe.templates.ObjectPage.SectionLayout",defaultValue:S.Page},showRelatedApps:{type:"boolean",defaultValue:false},additionalSemanticObjects:{type:"object"},editableHeaderContent:{type:"boolean",defaultValue:true},showBreadCrumbs:{type:"boolean",defaultValue:true},prepareOnEdit:{type:"boolean",defaultValue:false},inboundParameters:{type:"object"}},library:"sap.fe.templates",manifest:"json"},isContextExpected:function(){return true;},createDeferredContext:function(p,l,A){if(!this.DeferredContextCreated){this.DeferredContextCreated=true;var t=this,P={"$$groupId":"$auto.Heroes","$$updateGroupId":"$auto"};if(!l||l.isRelative()===false){l=new O(this.getModel(),p.replace("(...)",""),undefined,undefined,undefined,P);}else{l.mParameters=P;}var s=this.oAppComponent&&this.oAppComponent.getComponentData()&&this.oAppComponent.getComponentData().startupParameters,i=this.getViewData().inboundParameters,d;if(s.preferredMode&&s.preferredMode[0].indexOf("create")!==-1){d=C.getAdditionalParamsForCreate(s,i);}t.getRootControl().getController().editFlow.createDocument(l,{creationMode:b.Sync,createAction:A,data:d}).finally(function(){t.DeferredContextCreated=false;}).catch(function(){window.history.back();});}},setVariantManagement:function(v){if(v===V.Page){L.error("ObjectPage does not support Page-level variant management yet");v=V.None;}this.setProperty("variantManagement",v);}});return c;},true);
+sap.ui.define(["sap/fe/core/TemplateComponent","sap/ui/model/odata/v4/ODataListBinding","sap/fe/core/CommonUtils","sap/base/Log","sap/fe/core/library","sap/fe/templates/ObjectPage/SectionLayout"],function(T,O,C,L,a,S){"use strict";var V=a.VariantManagement,b=a.CreationMode,c=T.extend("sap.fe.templates.ObjectPage.Component",{metadata:{properties:{variantManagement:{type:"sap.fe.core.VariantManagement",defaultValue:V.None},sectionLayout:{type:"sap.fe.templates.ObjectPage.SectionLayout",defaultValue:S.Page},showRelatedApps:{type:"boolean",defaultValue:false},additionalSemanticObjects:{type:"object"},editableHeaderContent:{type:"boolean",defaultValue:true},showBreadCrumbs:{type:"boolean",defaultValue:true},prepareOnEdit:{type:"boolean",defaultValue:false},inboundParameters:{type:"object"}},library:"sap.fe.templates",manifest:"json"},isContextExpected:function(){return true;},createDeferredContext:function(p,l,A){if(!this.DeferredContextCreated){this.DeferredContextCreated=true;var t=this,P={"$$groupId":"$auto.Heroes","$$updateGroupId":"$auto"};if(!l||l.isRelative()===false){l=new O(this.getModel(),p.replace("(...)",""),undefined,undefined,undefined,P);}else{l.mParameters=P;}var s=this.oAppComponent&&this.oAppComponent.getComponentData()&&this.oAppComponent.getComponentData().startupParameters,i=this.getViewData().inboundParameters,d;if(s&&s.preferredMode&&s.preferredMode[0].indexOf("create")!==-1){d=C.getAdditionalParamsForCreate(s,i);}t.getRootControl().getController().editFlow.createDocument(l,{creationMode:b.Sync,createAction:A,data:d}).finally(function(){t.DeferredContextCreated=false;}).catch(function(){window.history.back();});}},setVariantManagement:function(v){if(v===V.Page){L.error("ObjectPage does not support Page-level variant management yet");v=V.None;}this.setProperty("variantManagement",v);}});return c;},true);

package/packages/sap.fe.templates/src/sap/fe/templates/ObjectPage/ObjectPage.view.xml

@@ -79,47 +79,10 @@
 					/>
 				</uxap:dependents>
 				<template:if test="{converterContext>header/visible}">
-					<template:with path="converterContext>header/avatar" var="avatar">
+					<template:with path="converterContext>header" var="header">
 						<uxap:headerTitle>
 							<uxap:ObjectPageDynamicHeaderTitle primaryArea="Begin">
-								<uxap:expandedHeading>
-									<FlexBox>
-										<FlexBox visible="{converterContext>header/title/expandedImageVisible}">
-										<Avatar
-												class="sapUiSmallMarginEnd"
-												src="{avatar>src}"
-												initials="{avatar>initials}"
-												fallbackIcon="{avatar>fallbackIcon}"
-												displayShape="{avatar>displayShape}"
-												displaySize="S"
-											/>
-										</FlexBox>
-										<template:with path="entityType>@com.sap.vocabularies.UI.v1.HeaderInfo" var="headerInfo">
-											<Title
-												text="{= OPTemplating.getExpressionForTitle(${headerInfo>@@UI.getConverterContext}, ${viewData>}, ${fullContextPath>@@UI.getDataModelObjectPath}, ${entitySet>@com.sap.vocabularies.Common.v1.DraftRoot})}"
-												wrapping="true"
-											/>
-										</template:with>
-									</FlexBox>
-								</uxap:expandedHeading>
-								<uxap:snappedHeading>
-									<FlexBox>
-											<Avatar
-											class="sapUiSmallMarginEnd"
-											src="{avatar>src}"
-											initials="{avatar>initials}"
-											fallbackIcon="{avatar>fallbackIcon}"
-											displayShape="{avatar>displayShape}"
-											displaySize="S"
-										/>
-										<template:with path="entityType>@com.sap.vocabularies.UI.v1.HeaderInfo" var="headerInfo">
-											<Title
-												text="{= OPTemplating.getExpressionForTitle(${headerInfo>@@UI.getConverterContext}, ${viewData>}, ${fullContextPath>@@UI.getDataModelObjectPath}, ${entitySet>@com.sap.vocabularies.Common.v1.DraftRoot})}"
-												wrapping="true"
-											/>
-										</template:with>
-									</FlexBox>
-								</uxap:snappedHeading>
+								<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.Heading" type="XML" />
 								<uxap:expandedContent>
 								<FlexBox>
 									<template:if test="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description}">
@@ -169,7 +132,7 @@
 								</uxap:breadcrumbs>
 							</uxap:ObjectPageDynamicHeaderTitle>
 						</uxap:headerTitle>
-						<template:if test="{converterContext>header/hasContent}">
+						<template:if test="{header>hasContent}">
 							<uxap:headerContent>
 								<FlexBox
 									id="fe::HeaderContentContainer"
@@ -179,14 +142,14 @@
 									fitContainer="true"
 									alignItems="Stretch"
 								>
-									<template:if test="{converterContext>header/avatar}">
+									<template:if test="{header>avatar}">
 										<Avatar
 											unittest:id="AvatarOPHeaderContent"
 											class="sapUiSmallMarginEnd sapUiSmallMarginBottom"
-											src="{avatar>src}"
-											initials="{avatar>initials}"
-											fallbackIcon="{avatar>fallbackIcon}"
-											displayShape="{avatar>displayShape}"
+											src="{header>avatar/src}"
+											initials="{header>avatar/initials}"
+											fallbackIcon="{header>avatar/fallbackIcon}"
+											displayShape="{header>avatar/displayShape}"
 											displaySize="XL"
 										/>
 									</template:if>

package/packages/sap.fe.templates/src/sap/fe/templates/ObjectPage/ObjectPageController-dbg.controller.js

@@ -360,7 +360,9 @@ sap.ui.define(
 											for (var formElement = 0; formElement < aFormElements.length; formElement++) {
 												var aFields = aFormElements[formElement].getFields();
 
-												if (aFields[0].getRequired() && !aFields[0].getValue()) {
+												// The first field is not necessarily an InputBase (e.g. could be a Text)
+												// So we need to check whether it has a getRequired method
+												if (aFields[0].getRequired && aFields[0].getRequired() && !aFields[0].getValue()) {
 													return aFields[0];
 												}
 											}
@@ -422,8 +424,7 @@ sap.ui.define(
 			_onAfterBinding: function(oBindingContext, mParameters) {
 				var oObjectPage = this.byId("fe::ObjectPage"),
 					that = this,
-					aTables = this._findTables(),
-					aFormContainers = this._findFormContainers();
+					aTables = this._findTables();
 
 				this._sideEffects.clearPropertiesStatus();
 
@@ -444,25 +445,6 @@ sap.ui.define(
 				// 2. Another problem is, that FormContainers assigned to a 'MoreBlock' does not have an
 				// internal model context at all.
 
-				aFormContainers.forEach(function(oFormContainer) {
-					var oInternalModelContext,
-						oInternalModel = oObjectPage.getModel("internal"),
-						sPageContextPath = "/pages/" + that.getView().getId(),
-						sFormContainerContextPath = "controls/" + that.getView().getLocalId(oFormContainer.getId()),
-						SHOW_DETAILS = "showDetails";
-					if (oFormContainer.getModel("internal") === undefined) {
-						oFormContainer.setModel(oInternalModel, "internal");
-						oFormContainer.setBindingContext(
-							oInternalModel.createBindingContext(sPageContextPath + "/" + sFormContainerContextPath),
-							"internal"
-						);
-						oFormContainer.bindElement({ path: "", model: "internal" });
-					} else {
-						oFormContainer.bindElement({ path: sFormContainerContextPath, model: "internal" });
-					}
-					oInternalModelContext = oFormContainer.getBindingContext("internal");
-					oInternalModelContext.setProperty(SHOW_DETAILS, false);
-				});
 				aTables.forEach(function(oTable) {
 					var oInternalModelContext = oTable.getBindingContext("internal");
 					oInternalModelContext.setProperty("creationRowFieldValidity", {});
@@ -823,20 +805,19 @@ sap.ui.define(
 						);
 					}
 				});
-				return Promise.all(aWaitCreateDocuments).then(function(aBindings) {
-					var mParameters = {
-						bExecuteSideEffectsOnError: bExecuteSideEffectsOnError,
-						bindings: aBindings
-					};
-					return that.editFlow
-						.saveDocument(oContext, mParameters)
-						.catch(that._showMessagePopover.bind(that))
-						.finally(function() {
-							if (BusyLocker.isLocked(oModel)) {
-								BusyLocker.unlock(oModel);
-							}
-						});
-				});
+				return Promise.all(aWaitCreateDocuments)
+					.then(function(aBindings) {
+						var mParameters = {
+							bExecuteSideEffectsOnError: bExecuteSideEffectsOnError,
+							bindings: aBindings
+						};
+						return that.editFlow.saveDocument(oContext, mParameters).catch(that._showMessagePopover.bind(that));
+					})
+					.finally(function() {
+						if (BusyLocker.isLocked(oModel)) {
+							BusyLocker.unlock(oModel);
+						}
+					});
 			},
 
 			_cancelDocument: function(oContext, mParameters) {
@@ -917,37 +898,6 @@ sap.ui.define(
 				return aBlocks;
 			},
 
-			_findFormContainers: function() {
-				var aSubSections = this._getAllSubSections(),
-					aFormContainers = [];
-
-				function _collectFormContainersInBlocks(aBlocks) {
-					for (var i = 0; i < aBlocks.length; i++) {
-						var oElement = aBlocks[i].getContent instanceof Function && aBlocks[i].getContent();
-						if (oElement && oElement.isA && oElement.isA("sap.ui.layout.DynamicSideContent")) {
-							oElement = oElement.getMainContent instanceof Function && oElement.getMainContent();
-							if (oElement && oElement.length > 0) {
-								oElement = oElement[0];
-							}
-						}
-						if (
-							oElement &&
-							oElement.isA &&
-							oElement.isA("sap.ui.layout.form.Form") &&
-							oElement.getFormContainers instanceof Function
-						) {
-							aFormContainers = aFormContainers.concat(oElement.getFormContainers());
-						}
-					}
-				}
-
-				for (var i = 0; i < aSubSections.length; i++) {
-					_collectFormContainersInBlocks(aSubSections[i].getBlocks());
-					_collectFormContainersInBlocks(aSubSections[i].getMoreBlocks());
-				}
-				return aFormContainers;
-			},
-
 			//TODO: This is needed for two workarounds - to be removed again
 			_findTables: function() {
 				var aSubSections = this._getAllSubSections(),