@openui5/sap.ui.integration 1.100.0 → 1.101.0

package/src/sap/ui/integration/editor/Editor.js

@@ -144,7 +144,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @constructor
 	 * @since 1.94
 	 * @private
@@ -380,7 +380,7 @@ sap.ui.define([
 								if (oItem.isA("sap.m.Panel")) {
 									oItemLevel = oItem._level;
 								} else if (oItem.isA("sap.m.IconTabBar")) {
-									oItemLevel = oItem.getItems()[0]._level;
+									oItemLevel = "1";
 								}
 								if (oItemLevel === "1") {
 									if (oColFields.length > 0) {
@@ -389,11 +389,13 @@ sap.ui.define([
 									}
 									if (oItem.isA("sap.m.IconTabBar")) {
 										var subItems = oPanel.getContent(),
-										    iconTabBarExist = false;
+										    iconTabBarExist = false,
+											nIconTabBar;
 										if (subItems.length > 0) {
 											for (var j = 0; j < subItems.length; j++) {
 												if (subItems[j].isA("sap.m.IconTabBar")) {
 													iconTabBarExist = true;
+													nIconTabBar = subItems[j];
 												}
 											}
 										}
@@ -409,6 +411,10 @@ sap.ui.define([
 										} else {
 											oSubGroup = oItem.getItems()[0];
 											oSubGroup._subItems = [];
+											//add the iconTabFilter into the existed iconTabBar
+											nIconTabBar.addItem(oItem.getItems()[0]);
+											//remove the unnecessary iconTabBar
+											oItem.destroy();
 										}
 									} else {
 										oSubGroup = oItem;
@@ -886,7 +892,7 @@ sap.ui.define([
 		 * @experimental since 1.94
 		 * @public
 		 * @author SAP SE
-		 * @version 1.100.0
+		 * @version 1.101.0
 		 * @borrows sap.ui.integration.editor.Editor#getParameters as getParameters
 		 * @borrows sap.ui.integration.editor.Editor#resolveDestination as resolveDestination
 		 * @borrows sap.ui.integration.editor.Editor#request as request
@@ -1463,6 +1469,9 @@ sap.ui.define([
 							if (oItem.valueItems) {
 								mResult[oItem.manifestpath.substring(0, oItem.manifestpath.lastIndexOf("/")) + "/valueItems"] = oItem.valueItems;
 							}
+							if (oItem.valueTokens) {
+								mResult[oItem.manifestpath.substring(0, oItem.manifestpath.lastIndexOf("/")) + "/valueTokens"] = oItem.valueTokens;
+							}
 							switch (oItem.type) {
 								case "string":
 									if (!oItem.translatable) {
@@ -2503,6 +2512,7 @@ sap.ui.define([
 			if (oConfig.visualization && oConfig.visualization.type === "Tab") {
 				var oIconTabBar = new IconTabBar({
 					expandable: oConfig.expandable !== false,
+					visible: oConfig.visible,
 					expanded: "{currentSettings>expanded}",
 					objectBindings: {
 						currentSettings: {
@@ -3425,6 +3435,36 @@ sap.ui.define([
 		return false;
 	};
 
+	Editor.prototype.prepareFieldsInKey = function(oConfig) {
+		//get field names in the item key
+		this._sKeySeparator = oConfig.values.keySeparator;
+		if (!this._sKeySeparator) {
+			this._sKeySeparator = "#";
+		}
+		var sKey = oConfig.values.item.key;
+		this._aFields = sKey.split(this._sKeySeparator);
+		for (var n in this._aFields) {
+			//remove the {} in the field
+			if (this._aFields[n].startsWith("{")) {
+				this._aFields[n] = this._aFields[n].substring(1);
+			}
+			if (this._aFields[n].endsWith("}")) {
+				this._aFields[n] = this._aFields[n].substring(0, this._aFields[n].length - 1);
+			}
+		}
+	};
+
+	Editor.prototype.getKeyFromItem = function(oItem) {
+		var sItemKey = "";
+		this._aFields.forEach(function (field) {
+			sItemKey += oItem[field].toString() + this._sKeySeparator;
+		}.bind(this));
+		if (sItemKey.endsWith(this._sKeySeparator)) {
+			sItemKey = sItemKey.substring(0, sItemKey.length - this._sKeySeparator.length);
+		}
+		return sItemKey;
+	};
+
 	//create static context entries
 	Editor._contextEntries =
 	{
@@ -3497,36 +3537,6 @@ sap.ui.define([
 		}
 	};
 
-	Editor.prototype.prepareFieldsInKey = function(oConfig) {
-		//get field names in the item key
-		this._sKeySeparator = oConfig.values.keySeparator;
-		if (!this._sKeySeparator) {
-			this._sKeySeparator = "#";
-		}
-		var sKey = oConfig.values.item.key;
-		this._aFields = sKey.split(this._sKeySeparator);
-		for (var n in this._aFields) {
-			//remove the {} in the field
-			if (this._aFields[n].startsWith("{")) {
-				this._aFields[n] = this._aFields[n].substring(1);
-			}
-			if (this._aFields[n].endsWith("}")) {
-				this._aFields[n] = this._aFields[n].substring(0, this._aFields[n].length - 1);
-			}
-		}
-	};
-
-	Editor.prototype.getKeyFromItem = function(oItem) {
-		var sItemKey = "";
-		this._aFields.forEach(function (field) {
-			sItemKey += oItem[field].toString() + this._sKeySeparator;
-		}.bind(this));
-		if (sItemKey.endsWith(this._sKeySeparator)) {
-			sItemKey = sItemKey.substring(0, sItemKey.length - this._sKeySeparator.length);
-		}
-		return sItemKey;
-	};
-
 	//initializes global settings
 	Editor.init = function () {
 		this.init = function () { }; //replace self

package/src/sap/ui/integration/editor/EditorResourceBundles.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.EditorResourceBundles
 	 * @author SAP SE
 	 * @since 1.94.0
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @private
 	 * @experimental since 1.94.0
 	 * @ui5-restricted

package/src/sap/ui/integration/editor/Extension.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/integration/editor/Manifest.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.util.Manifest
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @since 1.94

package/src/sap/ui/integration/editor/Settings.js

@@ -66,7 +66,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.Settings
 	 * @author SAP SE
 	 * @since 1.83.0
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @private
 	 * @experimental since 1.83.0
 	 * @ui5-restricted

package/src/sap/ui/integration/editor/fields/BaseField.js

@@ -32,8 +32,7 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	var oResourceBundle = Core.getLibraryResourceBundle("sap.ui.integration"),
-		sBuildInViz = "sap/ui/integration/editor/fields/viz";
+	var sBuildInViz = "sap/ui/integration/editor/fields/viz";
 
 	/**
 	 * @class
@@ -41,7 +40,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.fields.BaseField
 	 * @author SAP SE
 	 * @since 1.83.0
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @private
 	 * @ui5-restricted
 	 * @experimental since 1.83.0
@@ -173,10 +172,11 @@ sap.ui.define([
 		}
 	};
 
+	BaseField.prototype.getResourceBundle = function() {
+		return this.getModel("i18n").getResourceBundle();
+	};
+
 	BaseField.prototype.setConfiguration = function (oConfig, bSuppress) {
-		if (oResourceBundle && oResourceBundle.sLocale !== Core.getConfiguration().getLanguage()) {
-			oResourceBundle = Core.getLibraryResourceBundle("sap.ui.integration");
-		}
 		if (oConfig !== this.getConfiguration()) {
 			//sanitize configuration
 			this._sanitizeValidationSettings(oConfig);
@@ -407,9 +407,9 @@ sap.ui.define([
 			}
 			if (!sError) {
 				if (oSettings._txt) {
-					sError = oResourceBundle.getText(oValidations[oSettings._txt], [oSettings[n]]);
+					sError = this.getResourceBundle().getText(oValidations[oSettings._txt], [oSettings[n]]);
 				} else {
-					sError = oResourceBundle.getText(oValidations[n + "Txt"], [oSettings[n]]);
+					sError = this.getResourceBundle().getText(oValidations[n + "Txt"], [oSettings[n]]);
 				}
 			}
 			this._showValueState(oSettings.type || "error", sError);

package/src/sap/ui/integration/editor/fields/BooleanField.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.fields.BooleanField
 	 * @author SAP SE
 	 * @since 1.83.0
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @private
 	 * @experimental since 1.83.0
 	 * @ui5-restricted

package/src/sap/ui/integration/editor/fields/DateField.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.fields.DateField
 	 * @author SAP SE
 	 * @since 1.83.0
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @private
 	 * @experimental since 1.83.0
 	 * @ui5-restricted

package/src/sap/ui/integration/editor/fields/DateTimeField.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.fields.DateTimeField
 	 * @author SAP SE
 	 * @since 1.83.0
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @private
 	 * @experimental since 1.83.0
 	 * @ui5-restricted

package/src/sap/ui/integration/editor/fields/DestinationField.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.fields.DestinationField
 	 * @author SAP SE
 	 * @since 1.83.0
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @private
 	 * @experimental since 1.83.0
 	 * @ui5-restricted

package/src/sap/ui/integration/editor/fields/IntegerField.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.fields.IntegerField
 	 * @author SAP SE
 	 * @since 1.83.0
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @private
 	 * @experimental since 1.83.0
 	 * @ui5-restricted

package/src/sap/ui/integration/editor/fields/NumberField.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.fields.NumberField
 	 * @author SAP SE
 	 * @since 1.83.0
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @private
 	 * @experimental since 1.83.0
 	 * @ui5-restricted

package/src/sap/ui/integration/editor/fields/ObjectField.js

@@ -58,7 +58,6 @@ sap.ui.define([
 	merge
 ) {
 	"use strict";
-	var oResourceBundle = Core.getLibraryResourceBundle("sap.ui.integration");
 	var REGEXP_TRANSLATABLE = /\{\{(?!parameters.)(?!destinations.)([^\}\}]+)\}\}/g;
 
 	/**
@@ -67,7 +66,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.fields.ObjectField
 	 * @author SAP SE
 	 * @since 1.100.0
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @private
 	 * @experimental since 1.100.0
 	 * @ui5-restricted
@@ -170,6 +169,7 @@ sap.ui.define([
 
 	ObjectField.prototype.createSimpleFormVisualization = function(oConfig) {
 		var that = this;
+		var oResourceBundle = that.getResourceBundle();
 		var fnChange = function() {
 			var oModel = this.getAggregation("_field").getModel();
 			oModel.checkUpdate(true);
@@ -335,7 +335,6 @@ sap.ui.define([
 				case "Text":
 					oCellSettings = {
 						text: sDefaultValue,
-						tooltip: sDefaultValue,
 						wrapping: false
 					};
 					oCellSettings = merge(oCellSettings, oCell);
@@ -365,6 +364,7 @@ sap.ui.define([
 							};
 						}
 					}
+					oCellSettings.tooltip = oCell.tooltip || oCellSettings.text;
 					oCellTemplate = new Text(oCellSettings);
 					break;
 				case "Icon":
@@ -428,11 +428,13 @@ sap.ui.define([
 
 	ObjectField.prototype.createTableToolbar = function(oConfig) {
 		var that = this;
+		var oResourceBundle = that.getResourceBundle();
 		// check if has filterProperty defined in each column of config.properties
 		var bHasFilterDefined = that.checkHasFilter(oConfig);
 		var bAddButtonVisible = oConfig.enabled !== false;
+		var sAddButtonTooltip = oConfig.addButtonTooltip || oResourceBundle.getText("EDITOR_FIELD_OBJECT_TABLE_BUTTON_ADD_TOOLTIP");
 		if (bAddButtonVisible && oConfig.values) {
-			bAddButtonVisible = oConfig.values.allowCreateNew === true;
+			bAddButtonVisible = oConfig.values.allowAdd === true;
 		}
 		return new OverflowToolbar({
 			content: [
@@ -440,7 +442,7 @@ sap.ui.define([
 				new Button({
 					icon: "sap-icon://add",
 					visible: bAddButtonVisible,
-					tooltip: oResourceBundle.getText("EDITOR_FIELD_OBJECT_TABLE_BUTTON_ADD_TOOLTIP"),
+					tooltip: sAddButtonTooltip,
 					press: that.createNewObject.bind(that)
 				}),
 				new Button({
@@ -511,6 +513,7 @@ sap.ui.define([
 	ObjectField.prototype.createActionColumn = function() {
 		var that = this;
 		var oConfig = that.getConfiguration();
+		var oResourceBundle = that.getResourceBundle();
 		return new Column({
 			width: "5rem",
 			hAlign: "Center",
@@ -611,7 +614,7 @@ sap.ui.define([
 	ObjectField.prototype.createNewObject = function (oEvent) {
 		var that = this;
 		var oControl = oEvent.getSource();
-		that.openObjectDetailsPopover(that._newObjectTemplate, oControl, "create");
+		that.openObjectDetailsPopover(that._newObjectTemplate, oControl, "add");
 	};
 
 	ObjectField.prototype.mergeValueWithRequestResult = function (tResult) {
@@ -648,6 +651,7 @@ sap.ui.define([
 
 	ObjectField.prototype.onChangeOfTextArea = function (oEvent) {
 		var that = this;
+		var oResourceBundle = that.getResourceBundle();
 		var oTextArea = oEvent.getSource();
 		var sValue = oTextArea.getValue();
 		if (!sValue || sValue === "") {
@@ -670,6 +674,7 @@ sap.ui.define([
 
 	ObjectField.prototype.onChangeOfTextAreaInPopover = function (oEvent) {
 		var that = this;
+		var oResourceBundle = that.getResourceBundle();
 		var oTextArea = oEvent.getSource();
 		var sValue = oTextArea.getValue();
 		if (!sValue || sValue === "") {
@@ -917,12 +922,13 @@ sap.ui.define([
 	ObjectField.prototype.openObjectDetailsPopover = function (oItem, oControl, sMode) {
 		var that = this;
 		var oField = that.getAggregation("_field");
+		var oResourceBundle = that.getResourceBundle();
 		var oItemCloned = deepClone(oItem, 500);
 		var oModel;
 		if (!that._oObjectDetailsPopover) {
-			var oCreateButton = new Button({
-				text: oResourceBundle.getText("EDITOR_FIELD_OBJECT_DETAILS_POPOVER_BUTTON_CREATE"),
-				visible: sMode === "create",
+			var oAddButton = new Button({
+				text: oResourceBundle.getText("EDITOR_FIELD_OBJECT_DETAILS_POPOVER_BUTTON_ADD"),
+				visible: sMode === "add",
 				enabled: {
 					path: '/value',
 					formatter: function(vValue) {
@@ -948,6 +954,20 @@ sap.ui.define([
 				},
 				press: that.onUpdate.bind(that)
 			});
+			var oCancelButton = new Button({
+				text: oResourceBundle.getText("EDITOR_FIELD_OBJECT_DETAILS_POPOVER_BUTTON_CANCEL"),
+				visible: sMode !== "view",
+				press: function () {
+					that._oObjectDetailsPopover.close();
+				}
+			});
+			var oCloseButton = new Button({
+				text: oResourceBundle.getText("EDITOR_FIELD_OBJECT_DETAILS_POPOVER_BUTTON_CLOSE"),
+				visible: sMode === "view",
+				press: function () {
+					that._oObjectDetailsPopover.close();
+				}
+			});
 			oModel = new JSONModel({
 				"value": oItemCloned,
 				"editMode": "Properties"
@@ -958,9 +978,9 @@ sap.ui.define([
 				oModel.checkUpdate(true);
 				var oNewObject = oModel.getProperty("/value");
 				if (oNewObject && oNewObject !== "" && typeof oNewObject === "object" && !deepEqual(oNewObject, {})) {
-					oCreateButton.setEnabled(true);
+					oAddButton.setEnabled(true);
 				} else {
-					oCreateButton.setEnabled(false);
+					oAddButton.setEnabled(false);
 				}
 			};
 			var fnChange = function() {};
@@ -1035,34 +1055,38 @@ sap.ui.define([
 				footer: new OverflowToolbar({
 					content: [
 						new ToolbarSpacer(),
-						oCreateButton,
+						oAddButton,
 						oUpdateButton,
-						new Button({
-							text: oResourceBundle.getText("EDITOR_FIELD_OBJECT_DETAILS_POPOVER_BUTTON_CLOSE"),
-							press: function () {
-								that._oObjectDetailsPopover.close();
-							}
-						})
+						oCancelButton,
+						oCloseButton
 					]
 				})
 			}).addStyleClass("sapUiIntegrationEditorItemObjectFieldDetailsPopover");
 			that._oObjectDetailsPopover.setModel(oModel);
 			that._oObjectDetailsPopover.setModel(that.getModel("i18n"), "i18n");
-			that._oObjectDetailsPopover._oCreateButton = oCreateButton;
+			that._oObjectDetailsPopover._oAddButton = oAddButton;
 			that._oObjectDetailsPopover._oUpdateButton = oUpdateButton;
+			that._oObjectDetailsPopover._oCancelButton = oCancelButton;
+			that._oObjectDetailsPopover._oCloseButton = oCloseButton;
 			that._oObjectDetailsPopover._openBy = oControl;
 		} else {
 			oModel = that._oObjectDetailsPopover.getModel();
 			oModel.setProperty("/value", oItemCloned);
-			if (sMode === "create") {
-				that._oObjectDetailsPopover._oCreateButton.setVisible(true);
+			if (sMode === "add") {
+				that._oObjectDetailsPopover._oAddButton.setVisible(true);
 				that._oObjectDetailsPopover._oUpdateButton.setVisible(false);
+				that._oObjectDetailsPopover._oCancelButton.setVisible(true);
+				that._oObjectDetailsPopover._oCloseButton.setVisible(false);
 			} else if (sMode === "update") {
-				that._oObjectDetailsPopover._oCreateButton.setVisible(false);
+				that._oObjectDetailsPopover._oAddButton.setVisible(false);
 				that._oObjectDetailsPopover._oUpdateButton.setVisible(true);
+				that._oObjectDetailsPopover._oCancelButton.setVisible(true);
+				that._oObjectDetailsPopover._oCloseButton.setVisible(false);
 			} else {
-				that._oObjectDetailsPopover._oCreateButton.setVisible(false);
+				that._oObjectDetailsPopover._oAddButton.setVisible(false);
 				that._oObjectDetailsPopover._oUpdateButton.setVisible(false);
+				that._oObjectDetailsPopover._oCancelButton.setVisible(false);
+				that._oObjectDetailsPopover._oCloseButton.setVisible(true);
 			}
 			that._oObjectDetailsPopover._openBy = oControl;
 		}
@@ -1089,7 +1113,7 @@ sap.ui.define([
 
 		// restore the selections since the selections are lost, BCP: 2280048930, JIRA: CPOUIFTEAMB-252
 		if (bHasBeforeValue) {
-			that.applyBeforeValueAndSelections("create", oParameter);
+			that.applyBeforeValueAndSelections("add", oParameter);
 		}
 	};
 
@@ -1166,7 +1190,7 @@ sap.ui.define([
 		var sPath = oControl.getBinding("rows").getPath();
 		var iRealIndexOfFilteredOut;
 		switch (sMode) {
-			case "create":
+			case "add":
 				if (iSelectedIndex > -1) {
 					oControl.setSelectedIndex(iSelectedIndex);
 					oControl._sPathOfFilteredOut = null;

package/src/sap/ui/integration/editor/fields/ObjectListField.js

@@ -22,7 +22,6 @@ sap.ui.define([
 	includes
 ) {
 	"use strict";
-	var oResourceBundle = Core.getLibraryResourceBundle("sap.ui.integration");
 
 	/**
 	 * @class Object List Field with object list value, such as [{"key": "key1"}, {"key": "key2"}]
@@ -30,7 +29,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.fields.ObjectListField
 	 * @author SAP SE
 	 * @since 1.100.0
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @private
 	 * @experimental since 1.100.0
 	 * @ui5-restricted
@@ -169,6 +168,7 @@ sap.ui.define([
 
 	ObjectListField.prototype.onChangeOfTextArea = function (oEvent) {
 		var that = this;
+		var oResourceBundle = that.getResourceBundle();
 		var oTextArea = oEvent.getSource();
 		var sValue = oTextArea.getValue();
 		if (!sValue || sValue === "") {
@@ -225,7 +225,7 @@ sap.ui.define([
 		var oNewValue = [];
 		var aSelectedIndicesCloned;
 		switch (sMode) {
-			case "create":
+			case "add":
 				// update the selections
 				aSelectedIndices.forEach(function(iSelectedIndex) {
 					oControl.addSelectionInterval(iSelectedIndex, iSelectedIndex);

package/src/sap/ui/integration/editor/fields/StringField.js

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.fields.StringField
 	 * @author SAP SE
 	 * @since 1.83.0
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @private
 	 * @experimental since 1.83.0
 	 * @ui5-restricted
@@ -273,9 +273,9 @@ sap.ui.define([
 			if (this.isFilterBackend()) {
 				this.onInput = _debounce(this.onInput, 500);
 				//if need to filter backend by input value, need to hook the onInput function which only support filter locally.
-				oControl.oninput = this.onInput;
+				oControl.oninput = this.onInput.bind(this);
 				//listen to the selectionChange event of Combobox
-				oControl.attachSelectionChange(this.onSelectionChange);
+				oControl.attachSelectionChange(this.onSelectionChange.bind(this));
 			}
 		}
 		this._settingsModel = this.getModel("currentSettings");
@@ -400,7 +400,7 @@ sap.ui.define([
 			that._aOriginTranslatedValues = oField.getOriginTranslatedValues(oConfig);
 		}
 		var aTempTranslatedLanguages = deepClone(that._aOriginTranslatedValues, 500);
-		var oResourceBundle = Core.getLibraryResourceBundle("sap.ui.integration");
+		var oResourceBundle = oField.getResourceBundle();
 		//merge the value in texts or beforeLayerChange into the value list of i18n files
 		aTempTranslatedLanguages.forEach(function (translatedValue) {
 			var sTranslateText = oField.getTranslationValueInTexts(translatedValue.key, oConfig.manifestpath);