@openui5/sap.ui.integration 1.136.1 → 1.138.0

package/src/sap/ui/integration/designtime/baseEditor/util/binding/ObjectBinding.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.designtime.baseEditor.util.ObjectBinding
 	 * @author SAP SE
 	 * @since 1.70.0
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 * @private
 	 * @experimental since 1.70.0
 	 */

package/src/sap/ui/integration/designtime/baseEditor/util/unset.js

@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @alias module:sap/ui/integration/designtime/baseEditor/util/unset
 	 * @author SAP SE
 	 * @since 1.76
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 *
 	 * @private
 	 * @experimental 1.76

package/src/sap/ui/integration/designtime/baseEditor/validator/IsBoolean.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.IsBoolean
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/IsDate.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.IsDate
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/IsInteger.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.IsInteger
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/IsNumber.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.IsNumber
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/IsSelectedKey.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.IsSelectedKey
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/IsStringList.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.IsStringList
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/IsUniqueKey.js

@@ -13,7 +13,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.IsUniqueKey
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/IsUniqueList.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.IsUniqueList
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/IsValidBinding.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.IsValidBinding
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/MaxLength.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.MaxLength
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/NotABinding.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.NotABinding
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/ValidatorRegistry.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.ValidatorRegistry
 	 *
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/cardEditor/propertyEditor/complexMapEditor/ComplexMapEditor.js

@@ -55,7 +55,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.designtime.cardEditor.propertyEditor.complexMapEditor.ComplexMapEditor
 	 * @author SAP SE
 	 * @since 1.76
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 *
 	 * @private
 	 * @experimental 1.76

package/src/sap/ui/integration/designtime/cardEditor/propertyEditor/destinationsEditor/DestinationsEditor.js

@@ -41,7 +41,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.designtime.cardEditor.propertyEditor.destinationsEditor.DestinationsEditor
 	 * @author SAP SE
 	 * @since 1.77
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 *
 	 * @private
 	 * @experimental 1.77

package/src/sap/ui/integration/designtime/cardEditor/propertyEditor/filtersEditor/FiltersEditor.js

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.designtime.cardEditor.propertyEditor.filtersEditor.FiltersEditor
 	 * @author SAP SE
 	 * @since 1.98
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 *
 	 * @private
 	 * @experimental 1.97

package/src/sap/ui/integration/designtime/cardEditor/propertyEditor/iconEditor/IconEditor.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.designtime.cardEditor.propertyEditor.iconEditor.IconEditor
 	 * @author SAP SE
 	 * @since 1.81
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 *
 	 * @private
 	 * @experimental 1.81

package/src/sap/ui/integration/designtime/cardEditor/propertyEditor/parametersEditor/ParametersEditor.js

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.designtime.cardEditor.propertyEditor.parametersEditor.ParametersEditor
 	 * @author SAP SE
 	 * @since 1.70
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 *
 	 * @private
 	 * @experimental 1.70

package/src/sap/ui/integration/designtime/editor/Card.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.widgets.Card
 	 *
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 * @private
 	 * @constructor
 	 * @since 1.112

package/src/sap/ui/integration/designtime/editor/CardEditor.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.editor.Editor
 	 *
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 * @constructor
 	 * @see {@link topic:5b46b03f024542ba802d99d67bc1a3f4 Cards}
 	 * @since 1.83

package/src/sap/ui/integration/designtime/editor/CardPreview.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.designtime.editor.CardPreview
 	 * @author SAP SE
 	 * @since 1.83.0
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 * @private
 	 * @experimental since 1.83.0
 	 * @ui5-restricted

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

@@ -133,7 +133,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 * @constructor
 	 * @since 1.94
 	 * @private
@@ -911,7 +911,7 @@ sap.ui.define([
 		 * @experimental since 1.94
 		 * @public
 		 * @author SAP SE
-		 * @version 1.136.1
+		 * @version 1.138.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
@@ -1950,7 +1950,16 @@ sap.ui.define([
 				for (var n in Editor.fieldMap) {
 					Editor.Fields[n] = arguments[Object.keys(Editor.fieldMap).indexOf(n)];
 				}
-				resolve();
+
+				const aFieldsDependencies = [];
+
+				for (const FieldClass of Object.values(Editor.Fields)) {
+					if (FieldClass.loadDependencies) {
+						aFieldsDependencies.push(FieldClass.loadDependencies());
+					}
+				}
+
+				Promise.all(aFieldsDependencies).then(resolve);
 			});
 		});
 	};

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

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.EditorResourceBundles
 	 * @author SAP SE
 	 * @since 1.94.0
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 * @private
 	 */
 	var EditorResourceBundles = ManagedObject.extend("sap.ui.integration.editor.EditorResourceBundles", {
@@ -35,6 +35,9 @@ sap.ui.define([
 				supportedLocales: {
 					type: "array"
 				}
+			},
+			events: {
+				ready: {}
 			}
 		}
 	});
@@ -105,10 +108,12 @@ sap.ui.define([
 				});
 				Log.info("sap.ui.integration.editor.EditorResourceBundles: resource bundles loaded.");
 				that._ready = true;
+				that.fireReady();
 			});
 		} else {
 			Log.info("sap.ui.integration.editor.EditorResourceBundles: no resource bundles.");
 			that._ready = true;
+			that.fireReady();
 		}
 	};
 

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.Extension
 	 *
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.138.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.136.1
+	 * @version 1.138.0
 	 *
 	 * @constructor
 	 * @since 1.94

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

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

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

@@ -54,7 +54,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.fields.BaseField
 	 * @author SAP SE
 	 * @since 1.83.0
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 * @private
 	 * @ui5-restricted
 	 * @experimental since 1.83.0

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.136.1
+	 * @version 1.138.0
 	 * @private
 	 * @experimental since 1.83.0
 	 * @ui5-restricted

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

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

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

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

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

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

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

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.fields.GroupField
 	 * @author SAP SE
 	 * @since 1.106.0
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 * @private
 	 * @experimental since 1.106.0
 	 * @ui5-restricted

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

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

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

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

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

@@ -16,9 +16,6 @@ sap.ui.define([
 	"sap/m/ToolbarSpacer",
 	"sap/m/Button",
 	"sap/ui/model/json/JSONModel",
-	"sap/ui/table/Table",
-	"sap/ui/table/Column",
-	"sap/ui/table/rowmodes/Fixed",
 	"sap/m/Label",
 	"sap/ui/model/Filter",
 	"sap/ui/model/FilterOperator",
@@ -42,7 +39,8 @@ sap.ui.define([
 	"sap/m/HBox",
 	"sap/ui/core/CustomData",
 	"sap/ui/integration/editor/fields/viz/IconSelect",
-	"sap/m/Image"
+	"sap/m/Image",
+	"sap/ui/core/Lib"
 ], function (
 	BaseField,
 	Text,
@@ -55,9 +53,6 @@ sap.ui.define([
 	ToolbarSpacer,
 	Button,
 	JSONModel,
-	Table,
-	Column,
-	FixedRowMode,
 	Label,
 	Filter,
 	FilterOperator,
@@ -81,9 +76,13 @@ sap.ui.define([
 	HBox,
 	CustomData,
 	IconSelect,
-	Image
+	Image,
+	Library
 ) {
 	"use strict";
+
+	let Table, Column, FixedRowMode;
+
 	var REGEXP_TRANSLATABLE = /\{\{(?!parameters.)(?!destinations.)([^\}\}]+)\}\}/g;
 
 	/**
@@ -92,7 +91,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.editor.fields.ObjectField
 	 * @author SAP SE
 	 * @since 1.100.0
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 * @private
 	 * @experimental since 1.100.0
 	 * @ui5-restricted
@@ -117,6 +116,24 @@ sap.ui.define([
 		renderer: BaseField.getMetadata().getRenderer()
 	});
 
+	ObjectField.loadDependencies = function () {
+		return Library.load("sap.ui.table")
+			.then(() => {
+				return new Promise((resolve, reject) => {
+					sap.ui.require([
+						"sap/ui/table/Table",
+						"sap/ui/table/Column",
+						"sap/ui/table/rowmodes/Fixed"
+					], (_Table, _Column, _FixedRowMode) => {
+						Table = _Table;
+						Column = _Column;
+						FixedRowMode = _FixedRowMode;
+						resolve();
+					}, reject);
+				});
+			});
+	};
+
 	ObjectField.prototype.initVisualization = function (oConfig) {
 		var that = this;
 		that._newObjectTemplate = {
@@ -248,7 +265,7 @@ sap.ui.define([
 			oValue = deepClone(oValue, 500);
 			this.setValue(oValue);
 		}.bind(that);
-		var aObjectPropertyFormContents = that.createFormContents(fnChange, "/value/", false, that.openTranslationPopup);
+		var aObjectPropertyFormContents = that.createFormContents(fnChange, "/value/", false, that.openTranslationListPopup);
 		var oEditModeButton = new Button(sParameterId + "_control_form_editmode_btn", {
 			icon: {
 				path: '/editMode',
@@ -752,8 +769,8 @@ sap.ui.define([
 				press: that.addNewObject.bind(that)
 			}),
 			new Button(sParameterId + "_control_table_edit_btn", {
-				icon: "sap-icon://edit",
-				tooltip: oResourceBundle.getText("EDITOR_FIELD_OBJECT_TABLE_BUTTON_EDIT_TOOLTIP"),
+				icon: "{= ${/_hasNotEditableItemSelected} ===  true ? 'sap-icon://display' : 'sap-icon://edit' }",
+				tooltip: "{= ${/_hasNotEditableItemSelected} ===  true ? oResourceBundle.getText('EDITOR_FIELD_OBJECT_TABLE_BUTTON_VIEW_TOOLTIP') : oResourceBundle.getText('EDITOR_FIELD_OBJECT_TABLE_BUTTON_EDIT_TOOLTIP')}",
 				enabled: "{= !!${/_hasTableSelected}}",
 				visible: that.getAllowPopover(),
 				press: that.onEditOrViewDetail.bind(that)
@@ -830,6 +847,14 @@ sap.ui.define([
 		var oRowContexts = oTable.getBinding("rows").getContexts();
 		var oItem = oRowContexts[iSelectIndex].getObject();
 		var iFirstIndex = oTable.getFirstVisibleRow();
+		// if the 1st selected row is hidden, scroll to it
+		if (iSelectIndex < iFirstIndex) {
+			oTable.setFirstVisibleRow(iSelectIndex);
+			iFirstIndex = iSelectIndex;
+		} else if (iSelectIndex >= iFirstIndex + 5) {
+			oTable.setFirstVisibleRow(iSelectIndex - 5 + 1);
+			iFirstIndex = iSelectIndex - 5 + 1;
+		}
 		var oRow = oTable.getRows()[iSelectIndex - iFirstIndex];
 		var oCell1 = oRow.getCells()[0];
 		that.openObjectDetailsPopover(oItem, oCell1, !oItem._dt || oItem._dt._editable !== false ? "update" : "view");
@@ -909,6 +934,7 @@ sap.ui.define([
 		var oTable = that.getAggregation("_field");
 		var oModel = oTable.getModel();
 		var aSelectedIndices = oTable.getSelectedIndices();
+		var aRowContexts = oTable.getBinding("rows").getContexts();
 		if (aSelectedIndices.length > 0) {
 			oModel.setProperty("/_hasTableSelected", true);
 			if (aSelectedIndices.length === 1) {
@@ -916,8 +942,15 @@ sap.ui.define([
 			} else {
 				oModel.setProperty("/_hasOnlyOneRowSelected", false);
 			}
+			var oFirstSelectedItem = aRowContexts[aSelectedIndices[0]].getObject();
+			if (oFirstSelectedItem._dt && oFirstSelectedItem._dt._editable === false) {
+				oModel.setProperty("/_hasNotEditableItemSelected", true);
+			} else {
+				oModel.setProperty("/_hasNotEditableItemSelected", false);
+			}
 		} else {
 			oModel.setProperty("/_hasTableSelected", false);
+			oModel.setProperty("/_hasNotEditableItemSelected", false);
 			oModel.setProperty("/_hasOnlyOneRowSelected", false);
 			oModel.setProperty("/_canDelete", false);
 			return;
@@ -928,7 +961,6 @@ sap.ui.define([
 			oModel.setProperty("/_hasTableAllSelected", false);
 		}
 		var aSelectedPaths = [];
-		var aRowContexts = oTable.getBinding("rows").getContexts();
 		aSelectedIndices.forEach(function (iSelectIndex) {
 			var oObject = aRowContexts[iSelectIndex].getObject();
 			if (oObject._dt && oObject._dt._editable !== false) {
@@ -956,6 +988,7 @@ sap.ui.define([
 		var oModel = oTable.getModel();
 		oTable.clearSelection();
 		oModel.setProperty("/_hasTableSelected", false);
+		oModel.setProperty("/_hasNotEditableItemSelected", false);
 		oModel.setProperty("/_hasOnlyOneRowSelected", false);
 		oModel.setProperty("/_canDelete", false);
 		oModel.setProperty("/_hasTableAllSelected", false);
@@ -1684,9 +1717,9 @@ sap.ui.define([
 			};
 			var fnChange = function() {};
 			if (oItem._dt && oItem._dt._editable === false) {
-				aObjectPropertyFormContents = that.createFormContents(fnChange, "/value/", true, that.navToTranslationPage);
+				aObjectPropertyFormContents = that.createFormContents(fnChange, "/value/", true, that.navToTranslationListPage);
 			} else {
-				aObjectPropertyFormContents = that.createFormContents(fnChangeWithDataSave, "/value/", true, that.navToTranslationPage);
+				aObjectPropertyFormContents = that.createFormContents(fnChangeWithDataSave, "/value/", true, that.navToTranslationListPage);
 			}
 			var oForm = new SimpleForm({
 				layout: "ResponsiveGridLayout",
@@ -1909,13 +1942,13 @@ sap.ui.define([
 		});
 	};
 
-	ObjectField.prototype.openTranslationPopup = function (sProperty, oEvent) {
+	ObjectField.prototype.openTranslationListPopup = function (sProperty, oEvent) {
 		var that = this;
 		if (!that._oEditorResourceBundles.isReady()) {
 			// waiting for loading resource bundles
-			setTimeout(function() {
-				that.openTranslationPopup(sProperty, oEvent);
-			}, 100);
+			that._oEditorResourceBundles.attachEventOnce("ready", function() {
+				that.openTranslationListPopup(sProperty, oEvent);
+			});
 			return;
 		}
 		var oControl = oEvent.getSource();
@@ -1966,13 +1999,13 @@ sap.ui.define([
 		that._oTranslationPopover.openBy(oControl._oValueHelpIcon);
 	};
 
-	ObjectField.prototype.navToTranslationPage = function (sProperty, oEvent) {
+	ObjectField.prototype.navToTranslationListPage = function (sProperty, oEvent) {
 		var that = this;
 		if (!that._oEditorResourceBundles.isReady()) {
 			// waiting for loading resource bundles
-			setTimeout(function() {
-				that.navToTranslationPage(sProperty, oEvent);
-			}, 100);
+			that._oEditorResourceBundles.attachEventOnce("ready", function() {
+				that.navToTranslationListPage(oEvent);
+			});
 			return;
 		}
 		var oNewObject = that._oObjectDetailsPopover.getModel().getProperty("/value");
@@ -2013,6 +2046,7 @@ sap.ui.define([
 		oModel.setProperty("/_hasSelected", true);
 		oModel.setProperty("/_hasTableAllSelected", false);
 		oModel.setProperty("/_hasTableSelected", false);
+		oModel.setProperty("/_hasNotEditableItemSelected", false);
 		oModel.setProperty("/_hasOnlyOneRowSelected", false);
 		oModel.checkUpdate();
 		that.refreshValue();