@openui5/sap.ui.integration 1.93.3 → 1.96.2

package/src/sap/ui/integration/cards/AnalyticalContent.js

@@ -9,8 +9,17 @@ sap.ui.define([
 	"sap/ui/integration/library",
 	"sap/ui/integration/util/BindingResolver",
 	"sap/base/Log",
+	"sap/base/util/merge",
 	"sap/ui/core/Core"
-], function (AnalyticalContentRenderer, BaseContent, library, BindingResolver, Log, Core) {
+], function (
+	AnalyticalContentRenderer,
+	BaseContent,
+	library,
+	BindingResolver,
+	Log,
+	merge,
+	Core
+) {
 	"use strict";
 
 	var ActionArea = library.CardActionArea;
@@ -30,6 +39,7 @@ sap.ui.define([
 
 	/**
 	 * Enumeration with supported legend alignments.
+	 * Needed for backward compatibility.
 	 */
 	var LegendAlignment = {
 		"TopLeft": "topLeft",
@@ -38,6 +48,7 @@ sap.ui.define([
 
 	/**
 	 * Enumeration with supported title alignments.
+	 * Needed for backward compatibility.
 	 */
 	var TitleAlignment = {
 		"Left": "left",
@@ -46,7 +57,8 @@ sap.ui.define([
 	};
 
 	/**
-	 * Enumeration with supported chart types.
+	 * Chart type to vizType.
+	 * Needed for backward compatibility.
 	 */
 	var ChartTypes = {
 		"Line": "line",
@@ -76,7 +88,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseContent
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @private
@@ -126,85 +138,6 @@ sap.ui.define([
 		});
 	};
 
-	/**
-	 * Creates vizFrame readable vizProperties object.
-	 *
-	 * @private
-	 * @param {object} oConfiguration Configuration from the manifest with resolved bindings
-	 * @returns {object} vizProperties object
-	 */
-	AnalyticalContent.prototype._getVizPropertiesObject = function (oConfiguration) {
-		if (!oConfiguration) {
-			return null;
-		}
-
-		var oTitle = oConfiguration.title,
-			oLegend = oConfiguration.legend,
-			oPlotArea = oConfiguration.plotArea;
-
-		var oVizPropertiesObject = {
-			"title": {
-				"style": {
-					"fontWeight": "normal"
-				},
-				"layout": {
-					"respectPlotPosition": false
-				}
-			},
-			"legend": {},
-			"legendGroup": {
-				"layout": {}
-			},
-			"plotArea": {
-				"window": {
-					"start": "firstDataPoint",
-					"end": "lastDataPoint"
-				}
-			},
-			"categoryAxis": {
-				"title": {}
-			},
-			"valueAxis": {
-				"title": {}
-			},
-			"interaction": {}
-		};
-
-		if (oTitle) {
-			oVizPropertiesObject.title.text = oTitle.text;
-			oVizPropertiesObject.title.visible = oTitle.visible;
-			oVizPropertiesObject.title.alignment = TitleAlignment[oTitle.alignment];
-		}
-
-		if (oLegend) {
-			oVizPropertiesObject.legend.visible = oLegend.visible;
-			oVizPropertiesObject.legendGroup.layout.position = LegendPosition[oLegend.position];
-			oVizPropertiesObject.legendGroup.layout.alignment = LegendAlignment[oLegend.alignment];
-		}
-
-		if (oPlotArea) {
-			if (oPlotArea.dataLabel) {
-				oVizPropertiesObject.plotArea.dataLabel = oPlotArea.dataLabel;
-			}
-			if (oPlotArea.categoryAxisText) {
-				oVizPropertiesObject.categoryAxis.title.visible = oPlotArea.categoryAxisText.visible;
-			}
-			if (oPlotArea.valueAxisText) {
-				oVizPropertiesObject.valueAxis.title.visible = oPlotArea.valueAxisText.visible;
-			}
-		}
-
-		if (oConfiguration.actions || oConfiguration.popover) {
-			var bChartsInteractive = oConfiguration.actionableArea === ActionableArea.Chart
-									|| oConfiguration.popover && oConfiguration.popover.active;
-			oVizPropertiesObject.interaction.noninteractiveMode = !bChartsInteractive;
-		} else {
-			oVizPropertiesObject.interaction.noninteractiveMode = true;
-		}
-
-		return oVizPropertiesObject;
-	};
-
 	/**
 	 * Creates the chart when data in the model is changed.
 	 *
@@ -220,85 +153,30 @@ sap.ui.define([
 	 * @private
 	 */
 	AnalyticalContent.prototype._createChart = function () {
-		var oChartObject = this.getConfiguration(),
-			aMeasures,
-			aDimensions;
+		var oConfiguration = this.getConfiguration();
 
-		if (!oChartObject.chartType) {
-			Log.error("ChartType is a mandatory property");
+		if (!oConfiguration.chartType) {
+			Log.error("\"sap.card\".content.chartType is mandatory property.", null, "sap.ui.integration.widgets.Card");
 			return;
 		}
 
-		var oResolvedChartObject = BindingResolver.resolveValue(oChartObject, this, "/");
-
-		var aDimensionNames = [];
-		if (oChartObject.dimensions) {
-			aDimensions = [];
-			for (var i = 0; i < oChartObject.dimensions.length; i++) {
-				var oDimension = oChartObject.dimensions[i];
-				var sName = oResolvedChartObject.dimensions[i].label;
-				aDimensionNames.push(sName);
-				var oDimensionMap = {
-					name: sName,
-					value: oDimension.value
-				};
-				aDimensions.push(oDimensionMap);
-			}
-
-		}
-
-		var aMeasureNames = [];
-		if (oChartObject.measures) {
-			aMeasures = [];
-			for (var i = 0; i < oChartObject.measures.length; i++) {
-				var oMeasure = oChartObject.measures[i];
-				var sName = oResolvedChartObject.measures[i].label;
-				aMeasureNames.push(sName);
-				var oMeasureMap = {
-					name: sName,
-					value: oMeasure.value
-				};
-				aMeasures.push(oMeasureMap);
-			}
-		}
-
-		var oFlattendedDataset = new FlattenedDataset({
-			measures: aMeasures,
-			dimensions: aDimensions,
-			data: {
-				path: this.getBindingContext().getPath()
-			}
-		});
-
+		var oResolvedConfiguration = BindingResolver.resolveValue(oConfiguration, this, "/");
 		var oChart = new VizFrame({
 			uiConfig: {
-				applicationSet: 'fiori'
+				applicationSet: "fiori"
 			},
 			height: "100%",
 			width: "100%",
-			vizType: ChartTypes[oChartObject.chartType],
-			dataset: oFlattendedDataset,
-			legendVisible: oChartObject.legend,
-			feeds: [
-				new FeedItem({
-					uid: oChartObject.measureAxis,
-					type: 'Measure',
-					values: aMeasureNames
-				}),
-				new FeedItem({
-					uid: oChartObject.dimensionAxis,
-					type: 'Dimension',
-					values: aDimensionNames
-				})
-			]
+			vizType: ChartTypes[oResolvedConfiguration.chartType] || oResolvedConfiguration.chartType,
+			vizProperties: this._getVizProperties(oResolvedConfiguration),
+			dataset: this._getDataset(oResolvedConfiguration),
+			feeds: this._getFeeds(oResolvedConfiguration)
 		});
 
-		var oVizProperties = this._getVizPropertiesObject(oResolvedChartObject);
-		oChart.setVizProperties(oVizProperties);
 		this.setAggregation("_content", oChart);
 		this._attachActions();
 
-		if (oResolvedChartObject.popover && oResolvedChartObject.popover.active) {
+		if (oResolvedConfiguration.popover && oResolvedConfiguration.popover.active) {
 			this._attachPopover();
 		}
 	};
@@ -335,5 +213,158 @@ sap.ui.define([
 		this._oPopover.connect(this.getAggregation("_content").getVizUid());
 	};
 
+	/**
+	 * Creates vizFrame readable vizProperties object.
+	 *
+	 * @private
+	 * @param {object} oResolvedConfiguration Manifest configuration with resolved bindings
+	 * @returns {object} vizProperties object
+	 */
+	 AnalyticalContent.prototype._getVizProperties = function (oResolvedConfiguration) {
+		if (!oResolvedConfiguration) {
+			return null;
+		}
+
+		var oTitle = oResolvedConfiguration.title,
+			oLegend = oResolvedConfiguration.legend,
+			oPlotArea = oResolvedConfiguration.plotArea;
+
+		var oVizProperties = {
+			title: {
+				style: {
+					fontWeight: "normal"
+				},
+				layout: {
+					respectPlotPosition: false
+				}
+			},
+			legend: {},
+			legendGroup: {
+				layout: {}
+			},
+			plotArea: {
+				window: {
+					start: "firstDataPoint",
+					end: "lastDataPoint"
+				}
+			},
+			categoryAxis: {
+				title: {}
+			},
+			valueAxis: {
+				title: {}
+			},
+			interaction: {
+				noninteractiveMode: true
+			}
+		};
+
+		if (oResolvedConfiguration.actions || oResolvedConfiguration.popover) {
+			var bChartsInteractive = oResolvedConfiguration.actionableArea === ActionableArea.Chart
+									|| oResolvedConfiguration.popover && oResolvedConfiguration.popover.active;
+			oVizProperties.interaction.noninteractiveMode = !bChartsInteractive;
+		}
+
+		if (oTitle) {
+			oVizProperties.title.text = oTitle.text;
+			oVizProperties.title.visible = oTitle.visible;
+			oVizProperties.title.alignment = TitleAlignment[oTitle.alignment];
+			Log.warning("\"sap.card\".content.title is deprecated. Use \"sap.card\".content.chartProperties instead", null, "sap.ui.integration.widgets.Card");
+		}
+
+		if (oLegend) {
+			oVizProperties.legend.visible = oLegend.visible;
+			oVizProperties.legendGroup.layout.position = LegendPosition[oLegend.position];
+			oVizProperties.legendGroup.layout.alignment = LegendAlignment[oLegend.alignment];
+			Log.warning("\"sap.card\".content.legend is deprecated. Use \"sap.card\".content.chartProperties instead", null, "sap.ui.integration.widgets.Card");
+		}
+
+		if (oPlotArea) {
+			if (oPlotArea.dataLabel) {
+				oVizProperties.plotArea.dataLabel = oPlotArea.dataLabel;
+			}
+			if (oPlotArea.categoryAxisText) {
+				oVizProperties.categoryAxis.title.visible = oPlotArea.categoryAxisText.visible;
+			}
+			if (oPlotArea.valueAxisText) {
+				oVizProperties.valueAxis.title.visible = oPlotArea.valueAxisText.visible;
+			}
+			Log.warning("\"sap.card\".content.plotArea is deprecated. Use \"sap.card\".content.chartProperties instead", null, "sap.ui.integration.widgets.Card");
+		}
+
+		merge(oVizProperties, oResolvedConfiguration.chartProperties);
+
+		return oVizProperties;
+	};
+
+	/**
+	 * @param {object} oResolvedConfiguration Manifest configuration with resolved bindings
+	 * @returns {sap.viz.ui5.data.FlattenedDataset} The data set for the VizFrame
+	 */
+	AnalyticalContent.prototype._getDataset = function (oResolvedConfiguration) {
+		var oConfiguration = this.getConfiguration();
+		var aMeasures, aDimensions;
+
+		if (oConfiguration.dimensions) {
+			aDimensions = oConfiguration.dimensions.map(function (oDimension, i) {
+				return {
+					name: oResolvedConfiguration.dimensions[i].name || oResolvedConfiguration.dimensions[i].label, // .label for backwards compatibility
+					value: oDimension.value
+				};
+			});
+		}
+
+		if (oConfiguration.measures) {
+			aMeasures = oConfiguration.measures.map(function (oMeasure, i) {
+				return {
+					name: oResolvedConfiguration.measures[i].name || oResolvedConfiguration.measures[i].label, // .label for backwards compatibility
+					value: oMeasure.value
+				};
+			});
+		}
+
+		return new FlattenedDataset({
+			measures: aMeasures,
+			dimensions: aDimensions,
+			data: {
+				path: this.getBindingContext().getPath()
+			}
+		});
+	};
+
+	/**
+	 * @param {object} oResolvedConfiguration Manifest configuration with resolved bindings
+	 * @returns {sap.viz.ui5.controls.common.feeds.FeedItem[]} Feeds for the VizFrame
+	 */
+	AnalyticalContent.prototype._getFeeds = function (oResolvedConfiguration) {
+		var aFeeds = oResolvedConfiguration.feeds;
+
+		// Backwards compatibility
+		if (oResolvedConfiguration.measureAxis || oResolvedConfiguration.dimensionAxis) {
+			Log.warning("\"sap.card\".content.measureAxis and \"sap.card\".content.dimensionAxis are deprecated. Use \"sap.card\".content.feeds instead", null, "sap.ui.integration.widgets.Card");
+
+			aFeeds = [
+				{
+					uid: oResolvedConfiguration.measureAxis,
+					type: "Measure",
+					values: oResolvedConfiguration.measures.map(function (oMeasure) {
+						return oMeasure.label;
+					})
+				},
+				{
+					uid: oResolvedConfiguration.dimensionAxis,
+					type: "Dimension",
+					values: oResolvedConfiguration.dimensions.map(function (oDimension) {
+						return oDimension.label;
+					})
+				}
+			];
+		}
+
+		return aFeeds.map(function (oFeed) {
+			return new FeedItem(oFeed);
+		});
+	};
+
 	return AnalyticalContent;
 });

package/src/sap/ui/integration/cards/AnalyticsCloudContent.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseContent
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @private
@@ -51,8 +51,9 @@ sap.ui.define([
 		BaseContent.prototype.init.apply(this, arguments);
 
 		var sId = this.getId() + "-highchartContainer";
+		// Add "sapFCardAnalyticsCloudContentHCC" class to the container content for CSP compliance
 		this._oHighchartContainer = new HTML(sId, {
-			content: "<div id=" + sId + " style='height:100%; width:100%'></div>"
+			content: "<div id=" + sId + " class='sapFCardAnalyticsCloudContentHCC'></div>"
 		});
 		this.setAggregation("_content", this._oHighchartContainer);
 	};

package/src/sap/ui/integration/cards/BaseContent.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @private
@@ -284,7 +284,16 @@ sap.ui.define([
 	 */
 	BaseContent.prototype.onDataRequestComplete = function () {
 		this.fireEvent("_dataReady");
-	 };
+	};
+
+	/**
+	 * @ui5-restricted
+	 */
+	BaseContent.prototype.refreshData = function () {
+		if (this._oDataProvider) {
+			this._oDataProvider.triggerDataUpdate();
+		}
+	};
 
 	/**
 	 * @private

package/src/sap/ui/integration/cards/BaseListContent.js

@@ -10,14 +10,16 @@ sap.ui.define([
 	"sap/ui/integration/library",
 	"sap/ui/model/Filter",
 	"sap/ui/model/FilterOperator",
-	"sap/base/Log"
+	"sap/base/Log",
+	"sap/ui/model/Sorter"
 ], function (
 	BaseContent,
 	BindingResolver,
 	library,
 	Filter,
 	FilterOperator,
-	Log
+	Log,
+	Sorter
 ) {
 	"use strict";
 
@@ -33,7 +35,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseContent
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @private
@@ -205,5 +207,23 @@ sap.ui.define([
 		}.bind(this));
 	};
 
+	/**
+	 * Define the sorting of a group.
+	 * @param {object} oGroup The group which will be sorted
+	 * @returns {sap.ui.model.Sorter}  Sorter for a list bindings.
+	 */
+	BaseListContent.prototype._getGroupSorter = function(oGroup) {
+
+		var bDescendingOrder = false;
+		if (oGroup.order.dir && oGroup.order.dir === "DESC") {
+			bDescendingOrder = true;
+		}
+		var oSorter = new Sorter(oGroup.order.path, bDescendingOrder, function (oContext) {
+			return BindingResolver.resolveValue(oGroup.title, oContext.getModel(), oContext.getPath());
+		});
+
+		return oSorter;
+	};
+
 	return BaseListContent;
 });

package/src/sap/ui/integration/cards/CalendarContent.js

@@ -64,7 +64,7 @@ sap.ui.define([
 		 * @extends sap.ui.integration.cards.BaseContent
 		 *
 		 * @author SAP SE
-		 * @version 1.93.3
+		 * @version 1.96.2
 		 *
 		 * @constructor
 		 * @private
@@ -663,7 +663,7 @@ sap.ui.define([
 		CalendarContent.prototype._handleStartDateChange = function (oFocusedDate) {
 			var oCardActions = this.getActions(),
 				oCalFocusedDate = CalendarDate.fromLocalJSDate(oFocusedDate),
-				oCalFirstRenderedDate = CalendarUtils._getFirstDateOfWeek(oCalFocusedDate),
+				oCalFirstRenderedDate = CalendarUtils._getFirstDateOfWeek(CalendarUtils._getFirstDateOfMonth(oCalFocusedDate)),
 				oCalLastDateInMonth = new CalendarDate(oFocusedDate.getFullYear(), oFocusedDate.getMonth() + 1, 1),
 				oCalLastRenderedDate;
 

package/src/sap/ui/integration/cards/CalendarContentRenderer.js

@@ -4,11 +4,16 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define(["./BaseContentRenderer",
+sap.ui.define([
+	"./BaseContentRenderer",
+	"sap/ui/core/IconPool",
 	"sap/ui/core/InvisibleText",
 	"sap/ui/unified/library",
-	"sap/ui/unified/CalendarLegendRenderer"],
-	function(BaseContentRenderer,
+	"sap/ui/unified/CalendarLegendRenderer"
+	],
+	function(
+		BaseContentRenderer,
+		IconPool,
 		InvisibleText,
 		unifiedLibrary,
 		CalendarLegendRenderer) {

package/src/sap/ui/integration/cards/ComponentContent.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseContent
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @experimental
 	 * @constructor

package/src/sap/ui/integration/cards/Footer.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/integration/cards/Header.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @extends sap.f.Header
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @private
@@ -250,6 +250,12 @@ sap.ui.define([
 		}
 	};
 
+	Header.prototype.refreshData = function () {
+		if (this._oDataProvider) {
+			this._oDataProvider.triggerDataUpdate();
+		}
+	};
+
 	/**
 	 * @private
 	 * @ui5-restricted

package/src/sap/ui/integration/cards/ListContent.js

@@ -9,6 +9,7 @@ sap.ui.define([
 	"sap/ui/util/openWindow",
 	"sap/m/library",
 	"sap/m/List",
+	"sap/m/ObjectStatus",
 	"sap/ui/integration/library",
 	"sap/ui/integration/util/BindingHelper",
 	"sap/ui/integration/controls/Microchart",
@@ -21,6 +22,7 @@ sap.ui.define([
 	openWindow,
 	mLibrary,
 	List,
+	ObjectStatus,
 	library,
 	BindingHelper,
 	Microchart,
@@ -45,6 +47,9 @@ sap.ui.define([
 	// shortcut for sap.ui.integration.CardActionArea
 	var ActionArea = library.CardActionArea;
 
+	// shortcut for sap.m.EmptyIndicator
+	var EmptyIndicatorMode = mLibrary.EmptyIndicatorMode;
+
 	var LEGEND_COLORS_LOAD = "_legendColorsLoad";
 
 	/**
@@ -59,7 +64,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseListContent
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @private
@@ -68,6 +73,7 @@ sap.ui.define([
 	 */
 	var ListContent = BaseListContent.extend("sap.ui.integration.cards.ListContent", {
 		metadata: {
+			library: "sap.ui.integration",
 			aggregations: {
 
 				/**
@@ -101,10 +107,6 @@ sap.ui.define([
 				}
 			}
 		});
-
-		this._oItemTemplate = new ListContentItem({
-			iconDensityAware: false
-		});
 	};
 
 	/**
@@ -195,13 +197,14 @@ sap.ui.define([
 	ListContent.prototype._setItem = function (mItem) {
 		var oList = this._getList(),
 			mSettings = {
-			iconDensityAware: false,
-			title: mItem.title && (mItem.title.value || mItem.title),
-			description: mItem.description && (mItem.description.value || mItem.description),
-			highlight: mItem.highlight,
-			info: mItem.info && mItem.info.value,
-			infoState: mItem.info && mItem.info.state
-		};
+				iconDensityAware: false,
+				title: mItem.title && (mItem.title.value || mItem.title),
+				description: mItem.description && (mItem.description.value || mItem.description),
+				highlight: mItem.highlight,
+				info: mItem.info && mItem.info.value,
+				infoState: mItem.info && mItem.info.state,
+				attributes: []
+			};
 
 		if (mItem.icon) {
 			mSettings.icon = BindingHelper.formattedProperty(mItem.icon.src, function (sValue) {
@@ -221,6 +224,20 @@ sap.ui.define([
 			mSettings.iconBackgroundColor = mItem.icon.backgroundColor || (mItem.icon.text ? undefined : AvatarColor.Transparent);
 		}
 
+		if (mItem.attributesLayoutType) {
+			mSettings.attributesLayoutType = mItem.attributesLayoutType;
+		}
+
+		if (mItem.attributes) {
+			mItem.attributes.forEach(function (attr) {
+				mSettings.attributes.push(new ObjectStatus({
+					text: attr.value,
+					state: attr.state,
+					emptyIndicatorMode: EmptyIndicatorMode.On
+				}));
+			});
+		}
+
 		if (mItem.chart) {
 			mSettings.microchart = this._createChartAndAddLegend(mItem.chart);
 		}
@@ -243,9 +260,16 @@ sap.ui.define([
 			disabledPropertyValue: ListType.Inactive
 		});
 
+		var oGroup = this.getConfiguration().group;
+
+		if (oGroup) {
+			this._oSorter = this._getGroupSorter(oGroup);
+		}
 		var oBindingInfo = {
-			template: this._oItemTemplate
+			template: this._oItemTemplate,
+			sorter: this._oSorter
 		};
+
 		this._filterHiddenNavigationItems(mItem, oBindingInfo);
 		this._bindAggregationToControl("items", oList, oBindingInfo);
 	};