@sapui5/sap.suite.ui.generic.template 1.94.0 → 1.96.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.94.0",
+  "version": "1.96.2",
   "description": "SAPUI5 Library sap.suite.ui.generic.template",
   "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
   "author": "SAP SE (https://www.sap.com)",

package/src/sap/suite/ui/generic/template/.library

@@ -7,7 +7,7 @@
 
 		(c) Copyright 2009-2015 SAP SE. All rights reserved
 	</copyright>
-	<version>1.94.0</version>
+	<version>1.96.2</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/control/SmartKpiTag.js

@@ -222,7 +222,7 @@ sap.ui.define([
 				if (this.getEntitySet() === this._oSmartFilter.getEntitySet()) {
 					bIsSameEntitySet = true;
 					//to check all the mandatory fields are filled in SFB
-					if (!FilterUtil.checkManditoryFieldsFilled(this._oSmartFilter)) {
+					if (!FilterUtil.checkManditoryFieldsFilled(this._oSmartFilter).bIsMandatoryFilter) {
 						this._mandatoryfieldsErrorHandler(false, false, true);
 						return;
 					}
@@ -384,7 +384,7 @@ sap.ui.define([
 				}
 				//Check for mandatory values for KPI entityset than main entityset with matching fields
 				if (!bIsSameEntitySet || !bIsDiffEntSetWithNoMatchFields) {
-					if (!FilterUtil.checkManditoryFieldsFilled(this._oSmartFilter)) {
+					if (!FilterUtil.checkManditoryFieldsFilled(this._oSmartFilter).bIsMandatoryFilter) {
 						this._mandatoryfieldsErrorHandler(false, false, true);
 						return;
 					}

package/src/sap/suite/ui/generic/template/AnalyticalListPage/control/visualfilterbar/FilterItemMicroChart.js

@@ -83,15 +83,17 @@ sap.ui.define([
 	FilterItemChart.prototype._shortRefNumber;
 	FilterItemChart.prototype._isTriggeredBySync = false;
 	FilterItemChart.prototype._multiUnit = false;
-	FilterItemChart.prototype.technicalIssueMessage = "TECHNICAL_ISSUES_OVERLAY_MESSAGE";
+	FilterItemChart.prototype.technicalIssueMessage = "M_VISUAL_FILTERS_ERROR_DATA_TEXT";
 	FilterItemChart.prototype.noDataIssueMessage = "NO_DATA_FOUND_OVERLAY_MESSAGE";
-	FilterItemChart.prototype.requiredFilterMessage = "REQUIRED_FIELDS_OVERLAY_MESSAGE";
-	FilterItemChart.prototype.multipleCurrencyMessage = "MULTIPLE_CURRENCY_OVERLAY_MESSAGE";
-	FilterItemChart.prototype.multipleUnitMessage = "MULTIPLE_UNIT_OVERLAY_MESSAGE";
-	FilterItemChart.prototype.hiddenMeasureMessage = "HIDDEN_MEASURE_OVERLAY_MESSAGE";
+	// FilterItemChart.prototype.requiredFilterMessage = "REQUIRED_FIELDS_OVERLAY_MESSAGE";
+	FilterItemChart.prototype.multipleCurrencyMessage = "M_VISUAL_FILTERS_MULTIPLE_CURRENCY";
+	FilterItemChart.prototype.multipleUnitMessage = "M_VISUAL_FILTERS_MULTIPLE_UNIT";
+	FilterItemChart.prototype.hiddenMeasureMessage = "M_VISUAL_FILTER_HIDDEN_MEASURE";
 	FilterItemChart.prototype.invalidMeasureForDonutMessage = "INVALID_MEASURE_DONUT_MESSAGE";
 	FilterItemChart.prototype.valuehelpAllMandatoryFilters = {};
 	FilterItemChart.prototype.oDataQueryOptions = ["$select", "$top", "$expand", "$inlinecount", "$orderby", "$filter", "$skip", "$format"];
+	FilterItemChart.prototype.missingMandatoryField = "M_VISUAL_FILTERS_PROVIDE_FILTER_VAL_SINGLEVF";
+	FilterItemChart.prototype.missingMultipleMandatoryFields = "M_VISUAL_FILTERS_PROVIDE_FILTER_VAL_MULTIPLEVF";
 
 	FilterItemChart.prototype.init = function() {
 		this._bAllowBindingUpdateOnPropertyChange = false;
@@ -105,7 +107,8 @@ sap.ui.define([
 				if (me._getChartAggregations().length) {
 					// if multi unit show overlay
 					if (me._multiUnit) {
-						me.applyOverlay(me.getIsCurrency() ? me.multipleCurrencyMessage : me.multipleUnitMessage);
+						var dimLabel = FilterUtil.getPropertyNameDisplay(me.getModel(), me.getEntitySet(), me.getDimensionField(), me.getModel("@i18n"));
+						me.applyOverlay((me.getIsCurrency() ? me.multipleCurrencyMessage : me.multipleUnitMessage), dimLabel);
 						if (me.data("isDialogFilterItem") === "true") {
 							FilterUtil._updateVisualFilterAria(me.getParent().getParent());
 						}
@@ -159,8 +162,12 @@ sap.ui.define([
 			var oSFBParams = oSmartFilterBar.getEntitySet() === entitySet ? oSmartFilterBar.getAnalyticalParameters() : [];
 			var aSVSelectOptions = this.getSelectFilters() && this.getSelectFilters().SelectOptions;
 			var bSearchable = this.checkSearchable(oModel, entitySet, oSmartFilterBar, aSVParameters, aSVSelectOptions);
-			if (!bSearchable) {
-				this.applyOverlay(this.requiredFilterMessage);
+			if (bSearchable.aMandatoryFilter.length === 1) {
+				this.applyOverlay(this.missingMandatoryField, bSearchable.aMandatoryFilter[0]);
+				return;
+			}
+			if (!bSearchable.bIsMandatoryFilter) {
+				this.applyOverlay(this.missingMultipleMandatoryFields);
 				return;
 			}
 			if (aSVParameters) {
@@ -417,9 +424,16 @@ sap.ui.define([
 			return;
 		}
 		if (this._determineHiddenVisualFilter(oMetaModel, entityName, measureField)) {
-			this.applyOverlay(this.hiddenMeasureMessage);
+			var measureLabel = FilterUtil.getPropertyNameDisplay(oModel, entityName, measureField, this.getModel("@i18n"));
+			this.applyOverlay(this.hiddenMeasureMessage, measureLabel);
 			return;
 		}
+		if (unitField) {
+			var unitFieldText = FilterUtil.getUnitFieldText(this.getModel(), entityName, unitField);
+			if (unitFieldText && FilterUtil.IsNavigationProperty(this.getModel(), entityName, unitFieldText)) {
+				var navPropertyForUnitField = unitFieldText.split("/")[0];
+			}
+		}
 		//Non Accumulative measure will not be supported for Donut chart. Bringing up the overlay in this case
 		if (bIsChartDonut) {
 			if (this._determineIfInvalidMeasure(oMetaModel, entityName, measureField)) {
@@ -430,7 +444,7 @@ sap.ui.define([
 		var selectFields = [measureField, dimField],
 		navProperty = FilterUtil.IsNavigationProperty(this.getModel(), entityName, dimFieldDisplay) ? dimFieldDisplay.split("/")[0] : null,
 		aNavigationPropertyKeys = FilterUtil.getKeysForNavigationEntitySet(oMetaModel, this.getEntitySet(), navProperty),
-		selectFields = FilterUtil.getVisualFilterSelectFields(measureField, dimField, dimFieldDisplay, unitField, aSortFields, aNavigationPropertyKeys);
+		selectFields = FilterUtil.getVisualFilterSelectFields(measureField, dimField, dimFieldDisplay, unitField, aSortFields, aNavigationPropertyKeys,  unitFieldText);
 		//filter defined for donut chart total read call
 		var filtersForTotal = (bIsChartDonut && this._inParameterFilterList && this._inParameterFilterList.aFilters && this._inParameterFilterList.aFilters.length) ? [this._inParameterFilterList] : [];
 		var filterList = [];
@@ -517,19 +531,19 @@ sap.ui.define([
 						}
 					}
 				});
-				this._updateBindingInfo(oDataBindingInfo, selectFields, aRelativeToProperties, count, oExtensionContext, navProperty, bIsChartDonut);
+				this._updateBindingInfo(oDataBindingInfo, selectFields, aRelativeToProperties, count, oExtensionContext, navProperty, navPropertyForUnitField, bIsChartDonut);
 
 				this._fetchData(oVisualFilterModel, sBindingPath, oDataBindingInfo, bIsChartDonut);
 			} else { //for donut chart
 				//update binding info for total data call
-				this._updateBindingInfo(oDataBindingInfo, [measureField], aRelativeToProperties, 1, oExtensionContext, navProperty, bIsChartDonut, true, filtersForTotal);
+				this._updateBindingInfo(oDataBindingInfo, [measureField], aRelativeToProperties, 1, oExtensionContext, navProperty, navPropertyForUnitField, bIsChartDonut, true, filtersForTotal);
 				var oTotalDataPromise = this._fetchData(oVisualFilterModel, sBindingPath, oDataBindingInfo, bIsChartDonut, true, oDatapoint);
 
 				//setting filters of binding info to filter list as update binding info will change the object while updating fot total data read call
 				oDataBindingInfo.filters = filterList;
 
 				//updating binding info for top4 data call
-				this._updateBindingInfo(oDataBindingInfo, selectFields, aRelativeToProperties, 4, oExtensionContext, navProperty, bIsChartDonut, false);
+				this._updateBindingInfo(oDataBindingInfo, selectFields, aRelativeToProperties, 4, oExtensionContext, navProperty, navPropertyForUnitField, bIsChartDonut, false);
 				var oTop4DataPromise = this._fetchData(oVisualFilterModel, sBindingPath, oDataBindingInfo, bIsChartDonut, false, oDatapoint);
 
 				// jQuery.when either waits for all promises to be resolved before executing handler, or
@@ -580,7 +594,7 @@ sap.ui.define([
 	};
 
 	//this function updates the Odata Binding info based on the chart type and return the updated object
-	FilterItemChart.prototype._updateBindingInfo = function(oDataBindingInfo, selectFields, aRelativeToProperties, count, oExtensionContext, navProperty, bIsChartDonut, bToFetchTotalData, filtersForTotal) {
+	FilterItemChart.prototype._updateBindingInfo = function(oDataBindingInfo, selectFields, aRelativeToProperties, count, oExtensionContext, navProperty, navPropertyForUnitField, bIsChartDonut, bToFetchTotalData, filtersForTotal) {
 		oDataBindingInfo.urlParameters = {
 			"$select":  aRelativeToProperties ? [aRelativeToProperties].concat(selectFields).join(",") : selectFields.join(","),
 			"$top": count
@@ -600,6 +614,10 @@ sap.ui.define([
 			extend(oDataBindingInfo.urlParameters, {"$expand": navProperty});
 		}
 
+		if (bIsChartDonut ? (navPropertyForUnitField && !bToFetchTotalData) : navPropertyForUnitField) {
+			extend(oDataBindingInfo.urlParameters, {"$expand": navPropertyForUnitField});
+		}
+
 		if (bIsChartDonut && (!bToFetchTotalData)) {
 			//Only set if its a top4Data call
 			oDataBindingInfo.sorters = this._sorters;
@@ -824,11 +842,23 @@ sap.ui.define([
 				}
 				prevUnit = unit;
 			}
-			this._applyUnitValue(this._multiUnit ? "" : prevUnit);
+			var unitFieldText = FilterUtil.getUnitFieldText(this.getModel(), this.getEntitySet(), unitField);
+			if (unitFieldText && FilterUtil.IsNavigationProperty(this.getModel(), this.getEntitySet(), unitFieldText)) {
+				var sUnitFieldText1 = unitFieldText.split("/")[0],
+					sUnitFieldText2 = unitFieldText.split("/")[1];
+				this._applyUnitValue(this._multiUnit ? "" : prevUnit + " (" + data[0][sUnitFieldText1][sUnitFieldText2] + ")");
+				return;
+			}
+			if (unitFieldText) {
+				unitFieldText = data[0][unitFieldText];
+				this._applyUnitValue(this._multiUnit ? "" : prevUnit + " (" + unitFieldText + ")");
 			} else {
-				// no unit field, so no unit displayed in title
-				this._applyUnitValue("");
+				this._applyUnitValue(this._multiUnit ? "" : prevUnit);
 			}
+		} else {
+			// no unit field, so no unit displayed in title
+			this._applyUnitValue("");
+		}
 	};
 	FilterItemChart.prototype._applyUnitValue = function(val) {
 		if (this._lastUnitValue != val) {
@@ -1000,8 +1030,9 @@ sap.ui.define([
 		return fixedInteger.format(parseFloat(value));
 	};
 
-	FilterItemChart.prototype._getFormattedNumberWithUoM = function(value, UoM) {
+	FilterItemChart.prototype._getFormattedNumberWithUoM = function(value, UoM, unitFieldText) {
 		UoM = (UoM) ? UoM : "";
+		unitFieldText = (unitFieldText) ? " (" + unitFieldText + ")" : "";
 		//As per the documentation default locale is taken.
 		var oLocale = sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale();
 		var formattedValue = NumberFormat.getFloatInstance({
@@ -1011,7 +1042,7 @@ sap.ui.define([
 		oLocale
 		).format(value);
 
-		return (UoM === "%") ? formattedValue + "%" : formattedValue + " " + UoM;
+		return (UoM === "%") ? formattedValue + "%" : formattedValue + " " + UoM + unitFieldText;
 	};
 
 	FilterItemChart.prototype._getDisplayedValue =  function(value, sUnitFieldValue) {
@@ -1021,13 +1052,13 @@ sap.ui.define([
 		return (bIsPercentage) ? nScaledValue + "%" : "" + nScaledValue;
 	};
 
-	FilterItemChart.prototype._getToolTip = function(dimLabel, dimValue, unitField, color) {
+	FilterItemChart.prototype._getToolTip = function(dimLabel, dimValue, unitField, unitFieldText, color) {
 		var i18nModel = this.getModel("i18n");
 		if (!i18nModel) {
 			return "";
 		}
 		var rb = i18nModel.getResourceBundle();
-		var nFormattedNumberWithUoM = this._getFormattedNumberWithUoM(dimValue, unitField);
+		var nFormattedNumberWithUoM = this._getFormattedNumberWithUoM(dimValue, unitField, unitFieldText);
 		var color_translated;
 		switch (color) {
 			case "Good":
@@ -1200,9 +1231,11 @@ sap.ui.define([
 			sDimFieldDisplay = this.getDimensionFieldDisplay(),
 			sMeasureField = this.getMeasureField(),
 			sUnitField = this.getUnitField(),
+			sUnitFieldText = sUnitField && FilterUtil.getUnitFieldText(this.getModel(), this.getEntitySet(), sUnitField),
 			aLabelParts = ( sDimField === sDimFieldDisplay ) ? [sDimFieldDisplay] : [sDimFieldDisplay, sDimField],
 			aToolTipParts = ( sDimField === sDimFieldDisplay ) ? [sDimFieldDisplay, sMeasureField, ""] : [sDimFieldDisplay, sMeasureField, sDimField],
 			aUnitFieldToolTipParts = sUnitField ? aToolTipParts.push(sUnitField) : aToolTipParts,
+			aUnitFieldToolTipParts = sUnitFieldText ? aToolTipParts.push(sUnitFieldText) : aToolTipParts,
 			me = this,
 			oSettings = {
 				label : {
@@ -1226,14 +1259,14 @@ sap.ui.define([
 				},
 				tooltip: {
 					parts: aUnitFieldToolTipParts.constructor === Array ? aUnitFieldToolTipParts : aToolTipParts,
-					formatter: function(dimLabel, dimValue, sDimField, unitField) {
+					formatter: function(dimLabel, dimValue, sDimField, unitField, unitFieldText) {
 						//Convert false equivalent values (like undefined or null or NaN) to ""
 						dimLabel = dimLabel || dimLabel === "" || dimLabel === 0 ? dimLabel : "";
 						sDimField = sDimField || sDimField === "" || sDimField === 0 ? sDimField : "";
 
 						sDimField = sDimField.constructor === Object ? "" : sDimField;
 						dimLabel = me._getLabel(dimLabel, sDimField, false) || me._getI18nText("NOT_ASSIGNED");
-						return me._getToolTip(dimLabel, dimValue, unitField, this.getColor());
+						return me._getToolTip(dimLabel, dimValue, unitField, unitFieldText, this.getColor());
 					}
 				},
 				selected: {
@@ -1266,21 +1299,21 @@ sap.ui.define([
 	 * @param  {string} sI18n  i18n string for overlay message
 	 * @return {void}
 	**/
-	FilterItemChart.prototype.applyOverlay = function(sI18n) {
-		var sPath = this.data("sPath");
-		if (sPath) {
-			var sShowOverlay =  sPath + "/showChartOverlay";
-			var conFigModel = this.getModel('_visualFilterDialogModel') ? this.getModel('_visualFilterDialogModel') : this.getModel('_visualFilterConfigModel');
-			conFigModel.setProperty(sShowOverlay, (sI18n ? true : false));
-			if (sI18n) {
-				var sOverlayMessage =  sPath + "/overlayMessage";
-				conFigModel.setProperty(sOverlayMessage, sI18n);
-				this.data("sOverlay", "true");
-				if (this.data("isDialogFilterItem") === "true") {
-					this.data("needsToUpdateAria", "true");
-				}
-				this.fireTitleChange();
+	FilterItemChart.prototype.applyOverlay = function(sI18n, sLabel) {
+		if (sI18n) {
+			this._chart.setShowError(true);
+			this._chart.setErrorMessageTitle(this._getI18nText("M_VISUAL_FILTERS_ERROR_MESSAGE_TITLE"));
+			this._chart.setErrorMessage(this.getModel("i18n").getResourceBundle().getText(sI18n, sLabel));
+			this._chart.setBusy(false);
+			this.data("sOverlay", "true");
+			if (this.data("isDialogFilterItem") === "true") {
+				this.data("needsToUpdateAria", "true");
 			}
+			this.fireTitleChange();
+		} else {
+			this._chart.setShowError(false);
+			this._chart.setErrorMessageTitle("");
+			this._chart.setErrorMessage("");
 		}
 	};
 
@@ -1348,10 +1381,14 @@ sap.ui.define([
 	FilterItemChart.prototype.checkSearchable = function(oDataModel, oEntitySet, oSmartFilterBar, aParameters, aSVOptions) {
 		var o4a = new oData4Analytics.Model(oData4Analytics.Model.ReferenceByModel(oDataModel));
 		var queryResult = o4a.findQueryResultByName(oEntitySet);
-		var parameterization = queryResult && queryResult.getParameterization(), allParamsList = [], bSearchable = true;
+		var parameterization = queryResult && queryResult.getParameterization(), allParamsList = [], bSearchable = { bIsMandatoryFilter: true };
 		bSearchable = FilterUtil.checkManditoryFieldsFilled(oSmartFilterBar);
-		if (!bSearchable) {
-			FilterItemChart.prototype.requiredFilterMessage = "REQUIRED_FIELDS_OVERLAY_MESSAGE";
+		if (bSearchable.aMandatoryFilter.length === 1) {
+			FilterItemChart.prototype.missingMandatoryField = "M_VISUAL_FILTERS_PROVIDE_FILTER_VAL_SINGLEVF";
+			return bSearchable;
+		}
+		if (!bSearchable.bIsMandatoryFilter) {
+			FilterItemChart.prototype.missingMultipleMandatoryFields = "M_VISUAL_FILTERS_PROVIDE_FILTER_VAL_MULTIPLEVF";
 			return bSearchable;
 		}
 		//if the collection path of the VF is a parameterized entity set
@@ -1374,9 +1411,9 @@ sap.ui.define([
 				});
 			});
 			//required in case the last visual filter had overlay message of the main entity set
-			FilterItemChart.prototype.requiredFilterMessage = "REQUIRED_VH_FIELDS_OVERLAY_MESSAGE";
+			FilterItemChart.prototype.missingMultipleMandatoryFields = "REQUIRED_VH_FIELDS_OVERLAY_MESSAGE";
 			if (oSmartFilterBar.getEntitySet() === oEntitySet) {
-				FilterItemChart.prototype.requiredFilterMessage = "REQUIRED_FIELDS_OVERLAY_MESSAGE";
+				FilterItemChart.prototype.missingMultipleMandatoryFields = "M_VISUAL_FILTERS_PROVIDE_FILTER_VAL_MULTIPLEVF";
 				var oAllFilterData = oSmartFilterBar.getFilterData(true);
 				//if collection path is the same as main entity set, then consider the param values set in SFB
 				allMandatoryParameters.forEach(function(mParam) {
@@ -1387,38 +1424,38 @@ sap.ui.define([
 			}
 			//only if all parameters have values filled then the app is searchable
 			if (allMandatoryParameters.length !== allParamsList.length) {
-				bSearchable = false;
+				bSearchable.bIsMandatoryFilter = false;
 				return bSearchable;
 			}
 		}
 		// there could be mandatory filters (sap:required-in-filter = true) which have to b considered for the searchable state
 		if (oSmartFilterBar.getEntitySet() === oEntitySet) {
 			//required in case the last visual filter had overlay message of the valuehelp entity set and the current one is non-parameterized main entity set
-			FilterItemChart.prototype.requiredFilterMessage = "REQUIRED_FIELDS_OVERLAY_MESSAGE";
+			FilterItemChart.prototype.missingMultipleMandatoryFields = "M_VISUAL_FILTERS_PROVIDE_FILTER_VAL_MULTIPLEVF";
 			var allMandatoryFilters = oSmartFilterBar.determineMandatoryFilterItems();
 			//API determineMandatoryFilters have both mandatory parameters and filters.
 			//hence get only the mandatory filters
 			var allMandatoryFilters = allMandatoryFilters.filter(function(elem) {
 				return !elem._bIsParameter;
 			});
-			bSearchable = allMandatoryFilters.every(function(mFilter) { //mandatory filters can be set via SV
+			bSearchable.bIsMandatoryFilter = allMandatoryFilters.every(function(mFilter) { //mandatory filters can be set via SV
 				return FilterUtil.checkFilterHasValueFromSelectionVariantOrSmartFilterBar(mFilter.getName(), mFilter.getName(), aSVOptions, oSmartFilterBar);
 			});
 		} else { //different VH entityset
-			FilterItemChart.prototype.requiredFilterMessage = "REQUIRED_VH_FIELDS_OVERLAY_MESSAGE";
+			FilterItemChart.prototype.missingMultipleMandatoryFields = "REQUIRED_VH_FIELDS_OVERLAY_MESSAGE";
 			var valuehelpMandatoryFiltersMapped;
 			if (!FilterItemChart.prototype.valuehelpAllMandatoryFilters[oEntitySet]) { //first time
 				FilterItemChart.prototype.valuehelpAllMandatoryFilters[oEntitySet] = FilterUtil.getAllMandatoryFilters(oDataModel, oEntitySet);
 			}
 			valuehelpMandatoryFiltersMapped = FilterUtil.getAllMandatoryFiltersMapping(FilterItemChart.prototype.valuehelpAllMandatoryFilters[oEntitySet], this.getInParameters());
-			bSearchable = valuehelpMandatoryFiltersMapped.aMappedFilterList.every(function(oFilter) { //mandatory filters can be set via SV or IN param
+			bSearchable.bIsMandatoryFilter = valuehelpMandatoryFiltersMapped.aMappedFilterList.every(function(oFilter) { //mandatory filters can be set via SV or IN param
 				return FilterUtil.checkFilterHasValueFromSelectionVariantOrSmartFilterBar(oFilter.valueListProperty, oFilter.localDataProperty, aSVOptions, oSmartFilterBar);
 			});
-			if (!bSearchable) {
+			if (!bSearchable.bIsMandatoryFilter) {
 				return bSearchable;
 			}
 			//now for the IN mapping missing VH mandatory filters only
-			bSearchable = valuehelpMandatoryFiltersMapped.aMappingMissingFilterList.every(function(sFilter) { //mandatory filters can be set via SV
+			bSearchable.bIsMandatoryFilter = valuehelpMandatoryFiltersMapped.aMappingMissingFilterList.every(function(sFilter) { //mandatory filters can be set via SV
 				var bHasValue = aSVOptions && FilterUtil.checkFilterHasValueFromSelectionVariant(aSVOptions, sFilter);
 				return bHasValue;
 			});

package/src/sap/suite/ui/generic/template/AnalyticalListPage/control/visualfilterbar/SmartVisualFilterBar.js

@@ -446,32 +446,6 @@ sap.ui.define([
 			items: [oToolbar]
 		});
 
-		var oHeaderOverlay = new VBox({
-			width: "100%",
-			height: this._cellItemHeightSouth,
-			items: [
-				new Text({
-					width: this.cellWidth + "px",
-					textAlign: SapCoreLibrary.TextAlign.Center,
-					text: {
-						path: '_visualFilterConfigModel>' + sPath + '/overlayMessage',
-						formatter: function(sOverlayMessage) {
-							return sOverlayMessage && this.getModel("i18n").getResourceBundle().getText(sOverlayMessage);
-						}
-					}
-				})
-			],
-			visible: {
-				path: '_visualFilterConfigModel>' + sPath + '/showChartOverlay',
-				formatter: function( bValue) {
-					return bValue;
-				}
-			}
-		});
-
-		oHeaderOverlay.addStyleClass("sapUiOverlay");
-		oHeaderOverlay.addStyleClass("sapSmartTemplatesAnalyticalListPageVFOverflow");
-		oHeaderOverlay.addStyleClass("sapSmartTemplatesAnalyticalListPageVFOverflowCozy");
 		var oHeaderChartBar = new VBox({
 			height: this._cellItemHeightSouth,
 			items: [oFilterItem],
@@ -503,13 +477,11 @@ sap.ui.define([
 			width: (this.cellWidth + 16) + "px",//to fix focus issue temporarily
 			items:[
 				oHeaderTitleBar,
-				oHeaderOverlay,
 				oHeaderChartBar,
 				oInvisibleText
 			]
 		});
 		oHeaderTitleBar.addStyleClass("sapSmartTemplatesAnalyticalListPageVFTitle");
-		oHeaderOverlay.addStyleClass("sapSmartTemplatesAnalyticalListPageVFChart");
 		oHeaderChartBar.addStyleClass("sapSmartTemplatesAnalyticalListPageVFChart");
 		//firing onFilterItemAdded event every time a filter item is created
 		this.fireOnFilterItemAdded(oFilterItem);
@@ -1046,7 +1018,7 @@ sap.ui.define([
 			sText += " " + oResourceBundle.getText("VIS_FILTER_MANDATORY_PROPERTY_ARIA_LABEL");
 		}
 		if (sOverlay === "true") {
-			sText += " " + aItems[1].getItems()[0].getText();
+			sText += " " + oResourceBundle.getText("M_VISUAL_FILTERS_ERROR_MESSAGE_TITLE") + " " + oFilterItem._chart.getProperty("errorMessage");
 			sText += " " + oResourceBundle.getText("VIS_FILTER_BAR_NAVIGATE_ARIA");
 		} else {
 			sText += " " + oResourceBundle.getText("VIS_FILTER_BAR_NAVIGATE_ARIA") + " " + oResourceBundle.getText("VIS_FILTER_ACCESS_FIELDS_ARIA");

package/src/sap/suite/ui/generic/template/AnalyticalListPage/controller/ControllerImplementation.js

@@ -215,7 +215,7 @@ sap.ui.define(["sap/ui/generic/app/navigation/service/SelectionVariant",
 					var oEventParameters, oEventSource;
 					oEventParameters = oEvent.getParameters();
 					oEventSource = oEvent.getSource();	//set on semanticObjectController
-					oTemplateUtils.oCommonEventHandlers.onSemanticObjectLinkNavigationTargetObtained(oEventSource, oEventParameters, oState, undefined, undefined);
+					oTemplateUtils.oCommonEventHandlers.onSemanticObjectLinkNavigationTargetObtained(oEventSource.getEntitySet(), oEventSource.getFieldSemanticObjectMap(), oEventParameters, oState, undefined, undefined);
 				}
 
 				function _getFilters(oSmartCtrl) {
@@ -480,7 +480,7 @@ sap.ui.define(["sap/ui/generic/app/navigation/service/SelectionVariant",
 							}
 							// Rebind table
 							if (oState.oSmartTable) {
-								oTemplateUtils.oCommonUtils.refreshSmartTable(oState.oSmartTable);
+								oTemplateUtils.oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oState.oSmartTable).refresh();
 							}
 							//Refresh Global Kpi
 							if (oState.oKpiTagContainer) {
@@ -605,9 +605,7 @@ sap.ui.define(["sap/ui/generic/app/navigation/service/SelectionVariant",
 						},
 						addEntry: function(oEvent) {
 							var oEventSource = oEvent.getSource();
-							oTemplateUtils.oCommonUtils.fnProcessDataLossOrDraftDiscardConfirmation(function(){
 								oTemplateUtils.oCommonEventHandlers.addEntry(oEventSource, false, oState.oSmartFilterbar);
-							}, Function.prototype, oState);
 						},
 						deleteEntries: function(oEvent) {
 							oTemplateUtils.oCommonEventHandlers.deleteEntries(oEvent);
@@ -627,7 +625,7 @@ sap.ui.define(["sap/ui/generic/app/navigation/service/SelectionVariant",
 							var bAllLocked = true;
 							var bAllNotDeletable = (sDeletablePath && sDeletablePath !== ""); // if Deletable-Path is undefined, then the items are deletable.
 
-							var aContexts = oTemplateUtils.oCommonUtils.getSelectedContexts(oTable);
+							var aContexts = oTemplateUtils.oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oTemplateUtils.oCommonUtils.getOwnerPresentationControl(oTable)).getSelectedContexts();
 							if (aContexts.length > 0) {
 								for (var i = 0; i < aContexts.length; i++) {
 									var oObject = oModel.getObject(aContexts[i].getPath());
@@ -767,13 +765,16 @@ sap.ui.define(["sap/ui/generic/app/navigation/service/SelectionVariant",
 							oTemplateUtils.oCommonEventHandlers.onDataFieldWithIntentBasedNavigation(oEvent, oState);
 						},
 						onBeforeSemanticObjectLinkPopoverOpens: function(oEvent) {
-							oTemplateUtils.oCommonUtils.fnProcessDataLossOrDraftDiscardConfirmation(function(){
-								//Success function
-								var sSelectionVariant = oState.oSmartFilterbar.getUiState({
-									allFilters : false
-								}).getSelectionVariant();
-								oTemplateUtils.oCommonUtils.semanticObjectLinkNavigation(oEvent, sSelectionVariant, oController);
-							}, Function.prototype, oState, Function.prototype);
+							var oSmartControl = oEvent.getSource();
+							var oSelectionVariant = oState.oSmartFilterbar.getUiState({
+								allFilters : false
+							}).getSelectionVariant();
+							//In case of Multiple View Applications, the filter context URL needs to be adjusted as the selected tab's context could be different from that of the filter context.
+							if (oState.oSmartFilterbar.getEntitySet() !== oSmartControl.getEntitySet()) {
+								oSelectionVariant.FilterContextUrl = oTemplateUtils.oServices.oApplication.getNavigationHandler().constructContextUrl(oSmartControl.getEntitySet(), oSmartControl.getModel());
+							}
+							var sSelectionVariant = JSON.stringify(oSelectionVariant);
+							oTemplateUtils.oCommonUtils.semanticObjectLinkNavigation(oEvent, sSelectionVariant, oController);
 						},
 						onAssignedFiltersChanged: function(oEvent) {
 							if (oEvent && oEvent.getSource()) {
@@ -897,8 +898,8 @@ sap.ui.define(["sap/ui/generic/app/navigation/service/SelectionVariant",
 						onDeterminingDataFieldForAction: function(oEvent) {
 							var oTemplatePrivate = oState.oController.getOwnerComponent().getModel("_templPriv");
 							var oContainerView = oTemplatePrivate.getProperty('/alp/contentView');
-							var oContextContainer = (oContainerView === CONTAINER_VIEW_CHART) ? oState.oSmartChart : oState.oSmartTable;
-							oTemplateUtils.oCommonEventHandlers.onDeterminingDataFieldForAction(oEvent, oContextContainer);
+							var oPresentationControlHandler = oTemplateUtils.oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oContainerView === CONTAINER_VIEW_CHART ? oState.oSmartChart : oState.oSmartTable);
+							oTemplateUtils.oCommonEventHandlers.onDeterminingDataFieldForAction(oEvent, oPresentationControlHandler);
 						},
 						/**
 						 * Called from Determining Button belonging to Table and Chart Annotation of type DataFieldForIntentBasedNavigation
@@ -908,15 +909,15 @@ sap.ui.define(["sap/ui/generic/app/navigation/service/SelectionVariant",
 							var oButton = oEvent.getSource();
 							var oTemplatePrivate = oState.oController.getOwnerComponent().getModel("_templPriv");
 							var oContainerView = oTemplatePrivate.getProperty('/alp/contentView');
-							var oContextContainer = (oContainerView === CONTAINER_VIEW_CHART) ? oState.oSmartChart : oState.oSmartTable.getTable();
-							oTemplateUtils.oCommonEventHandlers.onDeterminingDataFieldForIntentBasedNavigation(oButton, oContextContainer, oState);
+							var aSelectedContexts = oTemplateUtils.oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oContainerView === CONTAINER_VIEW_CHART ? oState.oSmartChart : oState.oSmartTable).getSelectedContexts();
+							oTemplateUtils.oCommonEventHandlers.onDeterminingDataFieldForIntentBasedNavigation(oButton, aSelectedContexts, oState.oSmartFilterbar);
 						},
 						/**
 						* onInlineDataFieldForAction Trigger the action as specified in the inline buttons
 						* @param  {Object} oEvent Event object
 						*/
 						onInlineDataFieldForAction: function(oEvent) {
-							oTemplateUtils.oCommonEventHandlers.onInlineDataFieldForAction(oEvent, oState);
+							oTemplateUtils.oCommonEventHandlers.onInlineDataFieldForAction(oEvent);
 						},
 						/**
 						* onInlineDataFieldForIntentBasedNavigation Trigger the navigation as specified in the inline buttons

package/src/sap/suite/ui/generic/template/AnalyticalListPage/controller/VisualFilterDialogController.js

@@ -286,7 +286,6 @@ sap.ui.define([
 					if (this.filterCompList[i].obj.shownInFilterDialog) {
 						// Add toolbar and chart only if filters are visible
 						this.filterCompList[i].toolbar = this._addChartCustomToolbar(this.oConfig.filterCompList[i], i);
-						this.filterCompList[i].overlay = this._addChartOverlay(this.oConfig.filterCompList[i] , i);
 						//this.filterChartList[i] = this._addChart(this.oConfig.filterCompList[i].component.type, this.oConfig.filterCompList[i].component.properties, i);
 
 						var that = this,
@@ -314,7 +313,6 @@ sap.ui.define([
 							new VBox({
 								items: [
 									that.filterCompList[i].toolbar,
-									that.filterCompList[i].overlay,
 									oFilterItemBox,
 									oInvisibleText
 								]
@@ -405,39 +403,6 @@ sap.ui.define([
 			//to enable Restore button on change of chart type, sort order, measure field and  show in filter bar changes
 			this.oState.oSmartFilterbar._oVariantManagement.currentVariantSetModified(true);
 		},
-		/**
-		 * Adds overlay in the filter dialog
-		 * @param {object} obj
-		 * @param {int} idx index in config object
-		 */
-		_addChartOverlay: function(obj, idx) {
-			var oHeaderOverlay = new VBox({
-				width: "100%",
-				height: obj.component.properties.height,
-				items: [
-				new Label({
-					text : {
-						path: '_visualFilterDialogModel>/filterCompList/' + idx  + '/overlayMessage',
-						formatter: function(sOverlayMessage) {
-							return this.getModel("i18n").getResourceBundle().getText(sOverlayMessage);
-						}
-					},
-					wrapping: true,
-					textAlign: SapCoreLibrary.TextAlign.Center
-				})
-				],
-				visible: {
-					path: '_visualFilterDialogModel>/filterCompList/' + idx + '/showChartOverlay',
-					formatter: function( bValue) {
-						return bValue;
-					}
-				}
-			});
-			oHeaderOverlay.addStyleClass("sapUiOverlay");
-			oHeaderOverlay.addStyleClass("sapSmartTemplatesAnalyticalListPageVFOverflow");
-			return oHeaderOverlay;
-
-		},
 
 		_formatTitle: function(titleObj, type){
 			var rb = this.oVerticalBox.getModel("i18n").getResourceBundle();

package/src/sap/suite/ui/generic/template/AnalyticalListPage/extensionAPI/ExtensionAPI.js

@@ -26,7 +26,7 @@ sap.ui.define(["sap/ui/base/Object",
 				if (sUiElementId) {
 					oControl = oController.byId(sUiElementId);
 				}
-				return oTemplateUtils.oCommonUtils.getSelectedContexts(oControl);
+				return oTemplateUtils.oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oTemplateUtils.oCommonUtils.getOwnerPresentationControl(oControl)).getSelectedContexts();
 			},
 			/**
 			 * Triggers rebinding on the list
@@ -45,7 +45,7 @@ sap.ui.define(["sap/ui/base/Object",
 				if (oState.oSmartTable) {
 					//Filters from SmartChart should be considered by table
 					oState.oController.getOwnerComponent().getModel("_templPriv").setProperty('/alp/_ignoreChartSelections', false);
-					oTemplateUtils.oCommonUtils.refreshSmartTable(oState.oSmartTable);
+					oTemplateUtils.oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oState.oSmartTable).refresh();
 				}
 			},
 			/**

package/src/sap/suite/ui/generic/template/AnalyticalListPage/i18n/i18n.properties

@@ -207,6 +207,9 @@ CHARTTABLE_AUTOHIDE_ON=Show only items based on the chart selection
 # XBUT,50: shown as tooltip on toggle of the chart-table mode
 CHARTTABLE_AUTOHIDE_OFF=Show all Items
 
+#YMSG, 100
+M_VISUAL_FILTERS_ERROR_MESSAGE_TITLE=Unable to display filter
+
 #YMSG, 100
 MULTIPLE_UNIT_OVERLAY_MESSAGE=Refine filter to set single unit of measure.
 
@@ -219,6 +222,27 @@ NO_DATA_FOUND_OVERLAY_MESSAGE=No data found.
 #YMSG, 150
 REQUIRED_FIELDS_OVERLAY_MESSAGE=Unable to display this filter due to the missing mandatory fields.
 
+#YMSG, 150
+M_VISUAL_FILTERS_ERROR_DATA_TEXT=Unable to load data due to a technical issue.
+
+#YMSG, 150
+M_VISUAL_FILTERS_PROVIDE_FILTER_VAL_SINGLEVF=Provide a filter value for {0}
+
+#YMSG, 150
+M_VISUAL_FILTERS_PROVIDE_FILTER_VAL_MULTIPLEVF=Provide filter values for all required fields.
+
+#YMSG, 150
+M_VISUAL_FILTERS_MULTIPLE_CURRENCY=To see this chart, set only one currency for {0}
+
+#YMSG, 150
+M_VISUAL_FILTERS_MULTIPLE_UNIT=To see this chart, set only one value for {0}
+
+#YMSG, 150
+M_VISUAL_FILTER_HIDDEN_MEASURE=Unable to load visual filter. Measure {0} is marked with UI.Hidden.
+
+#YMSG, 150
+M_VISUAL_FILTER_UNSUPPORTED_CHART_TYPE=Chart type is not supported for visual filters. Use a line chart or a bar chart.
+
 #YMSG, 150
 REQUIRED_VH_FIELDS_OVERLAY_MESSAGE=Unable to load data due to missing mandatory fields. Please contact your administrator.
 
@@ -229,7 +253,7 @@ TECHNICAL_ISSUES_OVERLAY_MESSAGE=Unable to retrieve data due to a technical issu
 HIDDEN_MEASURE_OVERLAY_MESSAGE=Unable to load visual filter due to a hidden measure.
 
 #YMSG, 100
-INVALID_MEASURE_DONUT_MESSAGE=Invalid measure found for this chart type. Ensure that the measure values are accumulative and positive.
+INVALID_MEASURE_DONUT_MESSAGE=Invalid measure for a donut chart. Ensure that the measure is cumulative and positive.
 
 # XBUT,30: show as tooltip on share button
 SHARE=Share