@sapui5/sap.rules.ui 1.121.0 → 1.122.0

package/src/sap/rules/ui/TextRule.js

@@ -11,7 +11,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 		"sap/m/Label",
 		"sap/rules/ui/RuleBase",
 		"sap/m/Panel",
-		"sap/ui/core/Title",
+		"sap/m/Title",
 		"sap/ui/layout/form/Form",
 		"sap/m/Toolbar",
 		"sap/m/ToolbarSpacer",
@@ -30,12 +30,29 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 		"sap/rules/ui/AstExpressionBasic",
 		"sap/rules/ui/services/ExpressionLanguage",
 		"sap/rules/ui/services/AstExpressionLanguage",
+		"sap/ui/core/Lib",
+		"sap/ui/model/json/JSONModel",
+		"sap/ui/layout/VerticalLayout",
+		"sap/ui/core/Element",
+		"sap/ui/core/EventBus",
+		"sap/m/MessageToast",
+		"sap/m/library",
+		"sap/ui/core/library",
+		"sap/ui/core/IconPool",
+		"sap/ui/layout/form/ResponsiveGridLayout",
+		"sap/ui/model/odata/v2/Context",
+		"sap/ui/layout/HorizontalLayout",
+		"sap/ui/layout/GridData",
 		"./TextRuleRenderer"
 		
 	], function (Log, jQuery, library, Label, RuleBase, Panel, Title, Form, Toolbar, ToolbarSpacer, Text, Button, Grid, FormContainer, FormElement,
-		ExpressionAdvanced, Link, FlexBox, Dialog, TextRuleSettings, AstYamlConverter, Constants, AstExpressionBasic, ExpressionLanguage, AstExpressionLanguage, TextRuleRenderer) {
+		ExpressionAdvanced, Link, FlexBox, Dialog, TextRuleSettings, AstYamlConverter, Constants, AstExpressionBasic, ExpressionLanguage, AstExpressionLanguage, coreLib, JSONModel, VerticalLayout, Element, EventBus, MessageToast, mobileLibrary,
+		coreLibrary, IconPool, ResponsiveGridLayout, Context, HorizontalLayout, GridData, TextRuleRenderer) {
 		"use strict";
 
+        var DialogType = mobileLibrary.DialogType;
+        var ButtonType = mobileLibrary.ButtonType;
+        var ValueState = coreLibrary.ValueState;
 		/**
 		 * Constructor for a new TextRule Control.
 		 *
@@ -47,14 +64,13 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 		 * @extends  Control
 		 *
 		 * @author SAP SE
-		 * @version 1.121.0
+		 * @version 1.122.0
 		 *
 		 * @constructor
 		 * @private
 		 * @alias sap.rules.ui.TextRule
 		 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) design time meta model
 		 */
-
 		var TextRule = RuleBase.extend("sap.rules.ui.TextRule", {
 			metadata: {
 				properties: {
@@ -171,7 +187,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 					RuleVersion: newCondition.RuleVersion
 				};
 				var sPath = oDataModel.createKey("/TextRuleConditions", oHeaderKey);
-				var oContext = new sap.ui.model.Context(oDataModel, sPath);
+				var oContext = new Context(oDataModel, sPath);
 			    var expandPath = "TextRuleResultExpressions";
                 if (this.getAstExpressionLanguage()) {
                     expandPath = "TextRuleResultExpressions/TextRuleResultExpressionASTs,TextRuleConditionASTs"
@@ -230,7 +246,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 						}
 						that._isAddCallInProgress = false;
 						that._updateBusyState(false);
-						sap.m.MessageToast.show(that.oBundle.getText("branchCreatedSuccess"));
+						MessageToast.show(that.oBundle.getText("branchCreatedSuccess"));
 					},
 					error: function () {
 						Log.info("Error reading TextRuleResultExpressions");
@@ -269,7 +285,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 					enabled: "{TextRuleModel>/editable}"
 				});
 
-				var oTitle = new sap.m.Title({
+				var oTitle = new Title({
 					text: this.oBundle.getText("textRule")
 				});
 
@@ -305,7 +321,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 			},
 
 			_addTextRuleControl: function () {
-				this.verticalLayout = new sap.ui.layout.VerticalLayout({
+				this.verticalLayout = new VerticalLayout({
 					width: "100%"
 				});
 				this.setAggregation("_verticalLayout", this.verticalLayout, true);
@@ -394,7 +410,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 					design: "Transparent"
 				});
 
-				var oTitle = new sap.m.Title({
+				var oTitle = new Title({
 					text: sTitle
 				}); 
 				oToolbar.addContent(oTitle);
@@ -405,7 +421,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 					backgroundDesign: "Translucent",
 					content: [new Form({
                         editable: true,
-                        layout: new sap.ui.layout.form.ResponsiveGridLayout({
+                        layout: new ResponsiveGridLayout({
                             labelSpanXL: 2,
                             labelSpanL: 2,
                             labelSpanM: 2,
@@ -425,7 +441,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
                         ]
                     }),new Form({
                         editable: true,
-                        layout: new sap.ui.layout.form.ResponsiveGridLayout({
+                        layout: new ResponsiveGridLayout({
                             labelSpanXL: 2,
                             labelSpanL: 2,
                             labelSpanM: 2,
@@ -488,7 +504,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 					design: "Transparent"
 				});
 
-				var oTitle = new sap.m.Title({
+				var oTitle = new Title({
 					text: sTitle
 				});
 
@@ -512,7 +528,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 					backgroundDesign: "Translucent",
 					content: new Form({
 						editable: true,
-						layout: new sap.ui.layout.form.ResponsiveGridLayout({
+						layout: new ResponsiveGridLayout({
 							labelSpanXL: 2,
 							labelSpanL: 2,
 							labelSpanM: 2,
@@ -539,11 +555,11 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 			showDeleteConfirmationDialogMessage: function(oSource) {
 				var that = this;
 				var oDialog = new Dialog({	
-					title: this.oBundle.getText("warning_title"),	
-					type: sap.m.DialogType.Message,	
-					state: sap.ui.core.ValueState.Warning,	
+					title: this.oBundle.getText("warning_title"),
+					type: DialogType.Message,
+					state: ValueState.Warning,
 					content: new Text({	
-						text: this.oBundle.getText("condition_delete_confirmation_message")	
+						text: this.oBundle.getText("condition_delete_confirmation_message")
 					}),	
 					afterClose: function() {	
 						oDialog.destroy();	
@@ -557,7 +573,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 					}
 				}));	
 				oDialog.setEndButton(new Button({	
-					text: this.oBundle.getText("textrule_confirmation_dialog_cancel"),	
+					text: this.oBundle.getText("textrule_confirmation_dialog_cancel"),
 					press: function() {
 						oDialog.close();
 					}
@@ -619,7 +635,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 									RuleVersion: oResultExpressions[j].RuleVersion
 								};
 								var sPath = this._getModel().createKey("/TextRuleResultExpressions", oHeaderKey);
-								var oExpressionContext = new sap.ui.model.Context(this._getModel(), sPath);
+								var oExpressionContext = new Context(this._getModel(), sPath);
 								var type = oResultExpressions[j].BusinessDataType;
 								if (this.getExpressionLanguage()) {
 									if (type === Constants.DATE_BUSINESS_TYPE || type === Constants.TIMESTAMP_BUSINESS_TYPE || type === Constants.NUMBER || type ===
@@ -665,7 +681,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 				//Create a copy of the setting model.
 				var settingModelDataStr = JSON.stringify(this._settingsModel.getData());
 				var settingModelData = JSON.parse(settingModelDataStr);
-				var settingModel = new sap.ui.model.json.JSONModel(settingModelData);
+				var settingModel = new JSONModel(settingModelData);
 				oTextRuleSettings.setModel(settingModel);
 
 				//Set configuration model
@@ -754,7 +770,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 					    	}
 					    }
 					});
-					sap.m.MessageToast.show(that.oBundle.getText("branchDeletedSuccess"));
+					MessageToast.show(that.oBundle.getText("branchDeletedSuccess"));
 				};
 
 				this._updateBusyState(true);
@@ -865,7 +881,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
                     };
  
                     var sPath = that._getModel().createKey("/TextRuleResultExpressions", oHeaderKey);
-                    var oExpressionContext = new sap.ui.model.Context(that._getModel(), sPath);
+                    var oExpressionContext = new Context(that._getModel(), sPath);
                     var oTextRuleConditions = that.getModel("displayModel").getProperty("/textRuleConditions");
                     for (var i = 0; i < oTextRuleConditions.length; i++) {
                         if (sConditionId === oTextRuleConditions[i].Id && oTextRuleConditions[i].TextRuleResultExpressions) {
@@ -997,15 +1013,15 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 					visible: bVisible,
 					label: oLabel,
 					//layoutData: new sap.ui.layout.form.GridElementData({hCells: "2"})
-					fields: [oExpressionControl, new sap.ui.layout.HorizontalLayout({
-                        layoutData: new sap.ui.layout.GridData({
+					fields: [oExpressionControl, new HorizontalLayout({
+                        layoutData: new GridData({
                             span: "L1 M1 S1"
                         }),
                         content: [
-                            new sap.m.Button({
+                            new Button({
                                 enabled: "{TextRuleModel>/editable}",
-                                type: sap.m.ButtonType.Transparent,
-                                icon: sap.ui.core.IconPool.getIconURI("sys-cancel"),
+                                type: ButtonType.Transparent,
+                                icon: IconPool.getIconURI("sys-cancel"),
                                 visible:{ parts: [{
                                     path: "displayModel>/bCancelButtonVisible(" + sConditionId + ")"
                                 }, {
@@ -1019,10 +1035,10 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
                                     that._deleteTextRuleResultExpression(oEvent);
                                 }.bind(this)
                             }).setTooltip(this.oBundle.getText("removeColumn")),
-                            new sap.m.Button({
+                            new Button({
                                 enabled: "{TextRuleModel>/editable}",
-                                type: sap.m.ButtonType.Transparent,
-                                icon: sap.ui.core.IconPool.getIconURI("add"),
+                                type: ButtonType.Transparent,
+                                icon: IconPool.getIconURI("add"),
                                 visible: that.bOperationsContext,
                                 press: function (oEvent) {
                                     //Add coulmn from JSON model
@@ -1083,7 +1099,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 
 			//TODO : Remove after Ast Implementation
 			_getConvertedExpression: function (expression, isCodeText, oContext) {
-				var oExpressionLanguage = sap.ui.getCore().byId(this.getExpressionLanguage());
+				var oExpressionLanguage = Element.getElementById(this.getExpressionLanguage());
 				var oRuleData = this._formRuleData(oContext, expression);
 				var oResult;
 				if (isCodeText) {
@@ -1107,8 +1123,8 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 
 			_getElseButton: function () {
 				var that = this;
-				if (!sap.ui.getCore().getElementById("_elseButton")) {
-					this.oElseButton = new sap.m.Button({
+				if (!Element.getElementById("_elseButton")) {
+					this.oElseButton = new Button({
 					id: "_elseButton",
 					text: this.oBundle.getText("addElse"),
 					tooltip: this.oBundle.getText("addElse"),
@@ -1123,8 +1139,8 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 
 			_getElseIfButton: function () {
 				var that = this;
-				if (!sap.ui.getCore().getElementById("_elseIfButton")) {
-					this.oElseIfButton = new sap.m.Button({
+				if (!Element.getElementById("_elseIfButton")) {
+					this.oElseIfButton = new Button({
 					id: "_elseIfButton",
 					text: this.oBundle.getText("addElseIf"),
 					tooltip: this.oBundle.getText("addElseIf"),
@@ -1153,7 +1169,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 							RuleVersion: oElseIfData[i].RuleVersion
 						};
 						var sPath = this._getModel().createKey("/TextRuleConditions", oHeaderKey);
-						var oContext = new sap.ui.model.Context(this._getModel(), sPath);
+						var oContext = new Context(this._getModel(), sPath);
 						var nElseIfIndex = i + 1;
 						var sNumbering = " (" + nElseIfIndex + ")";
 						oControls.push(this._createFormLayout(oContext, sTitle + sNumbering, false));
@@ -1185,7 +1201,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 						RuleVersion: oElseData[0].RuleVersion
 					};
 					var sPath = this._getModel().createKey("/TextRuleConditions", oHeaderKey);
-					var oContext = new sap.ui.model.Context(this._getModel(), sPath);
+					var oContext = new Context(this._getModel(), sPath);
 
 					oControls.push(this._createElseFormLayout(oContext, sTitle), false);
 				} else {
@@ -1207,11 +1223,11 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 				var that = this;
 				var oExpressionLanguage = null;
 				var attributeInfo = "";
-				var sType = businessDataType ? businessDataType : sap.rules.ui.ExpressionType.BooleanEnhanced;
+				var sType = businessDataType ? businessDataType : library.ExpressionType.BooleanEnhanced;
                 this.valueState = "None";
                 this.bOperationsContext = false;
 				if (this.getAstExpressionLanguage()) {
-					oExpressionLanguage = sap.ui.getCore().byId(this.getAstExpressionLanguage());
+					oExpressionLanguage =Element.getElementById(this.getAstExpressionLanguage());
 					var displayExpression = this._getExpressionFromAstNodes(oContext);
 					if(displayExpression && displayExpression.relString){
 					    displayExpression.relString = displayExpression.relString.replace(/\\/g,"\\\\").replace(/{/g, "\\{").replace(/}/g, "\\}");
@@ -1242,7 +1258,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 						ariaLabelledBy: sAriaValue,
 						change: function (oEvent) {
                             var oSource = oEvent.getSource();
-							var oEventBus = sap.ui.getCore().getEventBus();
+							var oEventBus = EventBus.getInstance();
 							oContext = oSource.getBindingContext();
 							var sPath = oContext.getPath();
 							var astNodes = oEvent.getParameter("astNodes");
@@ -1260,7 +1276,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
                         }.bind(this)
 					}).setBindingContext(oContext);
 				} else if (this.getExpressionLanguage()) {
-					oExpressionLanguage = sap.ui.getCore().byId(this.getExpressionLanguage());
+					oExpressionLanguage = Element.getElementById(this.getExpressionLanguage());
 					//TODO: Rebase to this change once vocabulary fixed from ui BUG FIX: 1880107212
 					var oResult = that._getConvertedExpression(expression, false, oContext);
 					var displayExpression = that._getExpressionFromParseResults(expression, oResult);
@@ -1326,7 +1342,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 
 			_removeAndUpdateExisitingNodes: function (sPath, oContext, astNodes, expression, oModel) {
 				var that = this;
-				var oEventBus = sap.ui.getCore().getEventBus();
+				var oEventBus = EventBus.getInstance();
 				oModel.setDeferredGroups(["astGroupId"]);
 				oModel.update(oContext.getPath(), {
 					"Expression": oContext.getProperty("Expression")
@@ -1354,7 +1370,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 
 			_getExpressionFromAstNodes: function (oContext) {
 				var that = this;
-				var oExpressionLanguage = sap.ui.getCore().byId(this.getAstExpressionLanguage());
+				var oExpressionLanguage = Element.getElementById(this.getAstExpressionLanguage());
 				var displayExpression = "";
 				var astList = [];
 				var astNodes = [];
@@ -1385,7 +1401,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 
 			_addNodeObject: function (astNode) {
 				var oNodeArray = [];
-				var oExpressionLanguage = sap.ui.getCore().byId(this.getAstExpressionLanguage());
+				var oExpressionLanguage = Element.getElementById(this.getAstExpressionLanguage());
 				var oAstUtil = oExpressionLanguage._astBunldeInstance.ASTUtil;
 
 				var updatedAstNode = [];
@@ -1425,7 +1441,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 					RuleVersion: oIfData[0].RuleVersion
 				};
 				var sPath = this._getModel() ? this._getModel().createKey("/TextRuleConditions", oHeaderKey) : "";
-				var oContext = new sap.ui.model.Context(this._getModel(), sPath);
+				var oContext = new Context(this._getModel(), sPath);
 
 				return this._createFormLayout(oContext, sTitle, true);
 			},
@@ -1482,7 +1498,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 				data.textRuleConditions.If = [];
 				data.textRuleConditions.ElseIf = [];
 				data.textRuleConditions.Else = [];
-				this._displayModel = new sap.ui.model.json.JSONModel(data);
+				this._displayModel = new JSONModel(data);
 				this.setModel(this._displayModel, "displayModel");
 			},
 
@@ -1504,7 +1520,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 				data.textRuleResultExpressions = [];
 				data.resultDataObjectId = "";
 				data.expressionLanguageVersion = "";
-				this._internalModel = new sap.ui.model.json.JSONModel(data);
+				this._internalModel = new JSONModel(data);
 				this.setModel(this._internalModel, "TextRuleModel");
 				var ruleBuilderModel = this.getModel("ruleBuilderInternalModel");
 				var textRuleModel = this.getModel("TextRuleModel");
@@ -1518,7 +1534,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 			 * JSON model for settings
 			 */
 			_initSettingsModel: function () {
-				this._settingsModel = new sap.ui.model.json.JSONModel();
+				this._settingsModel = new JSONModel();
 				this.setModel(this._settingsModel, "settingModel");
 			},
 
@@ -1539,9 +1555,9 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 				}
 				oDialog.attachBeforeClose(function (oData) {
 					var dialogState = oDialog.getState();
-					if (dialogState === sap.ui.core.ValueState.Success) {
+					if (dialogState === ValueState.Success) {
 						if (this._internalModel.getProperty("/resultChanged")) {
-							var oEventBus = sap.ui.getCore().getEventBus();
+							var oEventBus = EventBus.getInstance();
 							oEventBus.publish("sap.ui.rules", "refreshTextRuleModel");
 						}
 						this._resetControl();
@@ -1581,7 +1597,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 				this._internalModel.setProperty("/ruleVersion", sString[7]);
 				this._internalModel.setProperty("/ruleBindingPath", bindingContextPath);
 
-				var oContext = new sap.ui.model.Context(oModel, bindingContextPath);
+				var oContext = new Context(oModel, bindingContextPath);
 				this.setBindingContext(oContext);
 
 				this._bindRule();
@@ -1730,7 +1746,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 			},
 
 			init: function () {
-				this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
+				this.oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
 				this.typeIf = "If";
 				this.typeElseIf = "ElseIf";
 				this.typeElse = "Else";
@@ -1782,7 +1798,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 
 			setExpressionLanguage: function (value) {
 				this.setAssociation("expressionLanguage", value, true);
-				var expressionLanguage = (value instanceof Object) ? value : sap.ui.getCore().byId(value);
+				var expressionLanguage = (value instanceof Object) ? value : Element.getElementById(value);
 				if (!expressionLanguage) {
 					return this;
 				}
@@ -1799,7 +1815,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 
 			setAstExpressionLanguage: function (value) {
 				this.setAssociation("astExpressionLanguage", value, true);
-				var astExpressionLanguage = (value instanceof Object) ? value : sap.ui.getCore().byId(value);
+				var astExpressionLanguage = (value instanceof Object) ? value : Element.getElementById(value);
 				if (!astExpressionLanguage) {
 					return this;
 				}

package/src/sap/rules/ui/TextRuleConfiguration.js

@@ -7,10 +7,9 @@
 
 // Provides control sap.rules.ui.TextRuleConfiguration
 sap.ui.define([
-	"jquery.sap.global", 
 	"./library", 
 	"sap/ui/core/Element"
-], function(jQuery, library, Element) {
+], function(library, Element) {
 	"use strict";
 
 	/**
@@ -24,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.121.0
+	 * @version 1.122.0
 	 *
 	 * @constructor
 	 * @public