@sapui5/sap.rules.ui 1.91.1 → 1.95.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (27) hide show
  1. package/package.json +1 -1
  2. package/src/sap/rules/ui/.library +7 -1
  3. package/src/sap/rules/ui/AstExpressionBasic.js +1 -1
  4. package/src/sap/rules/ui/BindingSpy.js +1 -1
  5. package/src/sap/rules/ui/DecisionTable.js +12 -2
  6. package/src/sap/rules/ui/DecisionTableCell.js +1 -1
  7. package/src/sap/rules/ui/DecisionTableCellAstExpressionBasic.js +1 -1
  8. package/src/sap/rules/ui/DecisionTableCellExpressionAdvanced.js +1 -1
  9. package/src/sap/rules/ui/DecisionTableCellExpressionBasic.js +1 -1
  10. package/src/sap/rules/ui/DecisionTableConfiguration.js +9 -1
  11. package/src/sap/rules/ui/DecisionTableSettings.js +21 -11
  12. package/src/sap/rules/ui/DecisionTableSettingsOld.js +1 -1
  13. package/src/sap/rules/ui/ExpressionBase.js +1 -1
  14. package/src/sap/rules/ui/ExpressionBasic.js +1 -1
  15. package/src/sap/rules/ui/RuleBase.js +1 -1
  16. package/src/sap/rules/ui/RuleBuilder.js +9 -1
  17. package/src/sap/rules/ui/TextRule.js +13 -2
  18. package/src/sap/rules/ui/TextRuleConfiguration.js +9 -1
  19. package/src/sap/rules/ui/TextRuleSettings.js +7 -2
  20. package/src/sap/rules/ui/ast/builder/TermsBuilder.js +36 -2
  21. package/src/sap/rules/ui/ast/parser/bundle.js +26959 -1
  22. package/src/sap/rules/ui/library.js +1 -1
  23. package/src/sap/rules/ui/parser/resources/vocabulary/lib/parameterRuntimeServices.js +2 -3
  24. package/src/sap/rules/ui/type/ExpressionAbs.js +1 -1
  25. package/src/sap/rules/ui/i18n/messagebundle_rigi.properties +0 -293
  26. package/src/sap/rules/ui/parser/i18n/messages_descriptions_rigi.properties +0 -213
  27. package/src/sap/rules/ui/parser/i18n/op_messages_descriptions_rigi.properties +0 -50
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sapui5/sap.rules.ui",
3
- "version": "1.91.1",
3
+ "version": "1.95.0",
4
4
  "description": "SAPUI5 Library sap.rules.ui",
5
5
  "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
6
6
  "author": "SAP SE (https://www.sap.com)",
@@ -7,7 +7,7 @@
7
7
 
8
8
  (c) Copyright 2009-2016 SAP SE. All rights reserved
9
9
  </copyright>
10
- <version>1.91.1</version>
10
+ <version>1.95.0</version>
11
11
 
12
12
  <documentation>UI5 library: sap.rules.ui</documentation>
13
13
 
@@ -32,6 +32,12 @@
32
32
  <jscoverage xmlns="http://www.sap.com/ui5/buildext/jscoverage">
33
33
  <exclude name="sap.rules.ui.js."/>
34
34
  </jscoverage>
35
+ <packaging xmlns="http://www.sap.com/ui5/buildext/packaging" version="2.0" >
36
+ <module-infos>
37
+ <raw-module name="sap/rules/ui/ast/parser/bundle.js"
38
+ requiresTopLevelScope="false" />
39
+ </module-infos>
40
+ </packaging>
35
41
  </appData>
36
42
 
37
43
  </library>
@@ -2554,7 +2554,7 @@ sap.ui.define([
2554
2554
  this.isReference = true;
2555
2555
  }
2556
2556
  //Add the ./ to Associations if it has a relative path
2557
- if (this.getDataObjectInfo() && this.isDotRequired) {
2557
+ if (this.getDataObjectInfo() && this.isDotRequired && oBindingContextObject.type !== 'S' && oBindingContextObject.type !== 'T') {
2558
2558
  item.reference = oBindingContextObject.id ? "./" + oBindingContextObject.id : "";
2559
2559
  this.isDotRequired = false;
2560
2560
  } else {
@@ -23,7 +23,7 @@ sap.ui.define([
23
23
  * @extends ManagedObject
24
24
  *
25
25
  * @author SAP SE
26
- * @version 1.91.1
26
+ * @version 1.95.0
27
27
  *
28
28
  * @constructor
29
29
  * @private
@@ -55,7 +55,7 @@ sap.ui.define([
55
55
  * @extends Control
56
56
  *
57
57
  * @author SAP SE
58
- * @version 1.91.1
58
+ * @version 1.95.0
59
59
  *
60
60
  * @constructor
61
61
  * @private
@@ -80,6 +80,10 @@ sap.ui.define([
80
80
  group: "Misc",
81
81
  defaultValue: false
82
82
  },
83
+ enableSettingResult: {
84
+ type: "boolean",
85
+ defaultValue: true
86
+ },
83
87
  cellFormat: {
84
88
  type: "sap.rules.ui.DecisionTableCellFormat",
85
89
  defaultValue: sap.rules.ui.DecisionTableCellFormat.Both
@@ -908,7 +912,8 @@ sap.ui.define([
908
912
  hitPolicies: "{dtModel>/hitPolicies}",
909
913
  newDecisionTable: this._internalModel.getProperty("/newTable"),
910
914
  cellFormat: "{dtModel>/cellFormat}",
911
- decisionTableFormat: this.getDecisionTableFormat()
915
+ decisionTableFormat: this.getDecisionTableFormat(),
916
+ enableSettingResult: this.getEnableSettingResult()
912
917
  });
913
918
  if (this.getAstExpressionLanguage()) {
914
919
  oDecisionTableSettings.setAstExpressionLanguage(this.getAstExpressionLanguage());
@@ -2049,6 +2054,11 @@ sap.ui.define([
2049
2054
  this._internalModel.setProperty("/enableSettings", value);
2050
2055
  return this;
2051
2056
  },
2057
+
2058
+ setEnableSettingResult: function (value) {
2059
+ this.setProperty("enableSettingResult", value, true);
2060
+ return this;
2061
+ },
2052
2062
 
2053
2063
  setExpressionLanguage: function (value) {
2054
2064
  this.setAssociation("expressionLanguage", value, true);
@@ -32,7 +32,7 @@ sap.ui.define([
32
32
  * @extends sap.ui.core.Control
33
33
  *
34
34
  * @author SAP SE
35
- * @version 1.91.1
35
+ * @version 1.95.0
36
36
  *
37
37
  * @constructor
38
38
  * @public
@@ -24,7 +24,7 @@ sap.ui.define([
24
24
  * @extends sap.rules.ui.AstExpressionBasic
25
25
  *
26
26
  * @author SAP SE
27
- * @version 1.91.1
27
+ * @version 1.95.0
28
28
  *
29
29
  * @constructor
30
30
  * @private
@@ -24,7 +24,7 @@ sap.ui.define([
24
24
  * @extends sap.rules.ui.ExpressionAdvanced
25
25
  *
26
26
  * @author SAP SE
27
- * @version 1.91.1
27
+ * @version 1.95.0
28
28
  *
29
29
  * @constructor
30
30
  * @private
@@ -23,7 +23,7 @@ sap.ui.define([
23
23
  * @extends sap.rules.ui.ExpressionBasic
24
24
  *
25
25
  * @author SAP SE
26
- * @version 1.91.1
26
+ * @version 1.95.0
27
27
  *
28
28
  * @constructor
29
29
  * @private
@@ -22,7 +22,7 @@ sap.ui.define([
22
22
  * @extends sap.ui.core.Element
23
23
  *
24
24
  * @author SAP SE
25
- * @version 1.91.1
25
+ * @version 1.95.0
26
26
  *
27
27
  * @constructor
28
28
  * @public
@@ -59,6 +59,11 @@ sap.ui.define([
59
59
  type: "boolean",
60
60
  defaultValue: false
61
61
  },
62
+
63
+ enableSettingResult: {
64
+ type: "boolean",
65
+ defaultValue: true
66
+ },
62
67
  /**
63
68
  * The value determines whether the user can set the rendering of the decision Table to be based on cellFormat or rule Format
64
69
  */
@@ -115,6 +120,9 @@ sap.ui.define([
115
120
  setDecisionTableFormat: function(bValue){
116
121
  return this._handlePropertySetter("decisionTableFormat", bValue);
117
122
  },
123
+ setEnableSettingResult: function(bValue){
124
+ return this._handlePropertySetter("enableSettingResult", bValue);
125
+ },
118
126
  setThreshold: function (iValue) {
119
127
  return this._handlePropertySetter("threshold", iValue);
120
128
  },
@@ -41,7 +41,7 @@ sap.ui.define([
41
41
  * @extends Control
42
42
  *
43
43
  * @author SAP SE
44
- * @version 1.91.1
44
+ * @version 1.95.0
45
45
  *
46
46
  * @constructor
47
47
  * @private
@@ -71,7 +71,11 @@ sap.ui.define([
71
71
  decisionTableFormat: {
72
72
  type: "sap.rules.ui.DecisionTableFormat",
73
73
  defaultValue: sap.rules.ui.DecisionTableFormat.CellFormat
74
- }
74
+ },
75
+ enableSettingResult: {
76
+ type: "boolean",
77
+ defaultValue: true
78
+ }
75
79
  },
76
80
  aggregations: {
77
81
  mainLayout: {
@@ -730,6 +734,7 @@ sap.ui.define([
730
734
  var model = this.getModel();
731
735
  var resultDataObjectId = model.oData.ResultDataObjectId;
732
736
  var settingsModel = this.getModel("settingsModel");
737
+ var enableSettingResult = this.getProperty("enableSettingResult");
733
738
  var resultEnum = settingsModel.oData.results.resultsEnumration;
734
739
  if (resultDataObjectId !== Constants.NO_RESULT || resultDataObjectId !== "") {
735
740
  resultEnum.splice(0, 1);
@@ -742,17 +747,8 @@ sap.ui.define([
742
747
  //enabled: "{settingsModel>/results/enabled}",
743
748
  valueHelpOnly: true,
744
749
  showValueHelp: true,
745
- selectedKey: "{/ResultDataObjectId}",
746
750
  value: resultText,
747
751
  tooltip: this.oBundle.getText("chooseResultTooltip"),
748
- suggestionItems: {
749
- path: "settingsModel>/results/resultsEnumration",
750
- //sorter: { path: 'name' },
751
- template: new sap.ui.core.Item({
752
- key: "{settingsModel>id}",
753
- text: "{settingsModel>label}"
754
- })
755
- },
756
752
  valueHelpRequest: function (oEvent) {
757
753
 
758
754
  var oInputSource = oEvent.getSource();
@@ -863,6 +859,20 @@ sap.ui.define([
863
859
 
864
860
  }.bind(this)
865
861
  });
862
+
863
+ if(enableSettingResult) {
864
+ this.oResultInput.bindAggregation("suggestionItems",{
865
+ path: "settingsModel>/results/resultsEnumration",
866
+ template: new sap.ui.core.Item({
867
+ key: "{settingsModel>id}",
868
+ text: "{settingsModel>label}"
869
+ })
870
+ });
871
+ this.oResultInput.setSelectedKey(this.getModel().getData().ResultDataObjectId);
872
+ this.oResultInput.setEnabled(enableSettingResult);
873
+ } else {
874
+ this.oResultInput.setEnabled(enableSettingResult);
875
+ }
866
876
 
867
877
  return this.oResultInput;
868
878
  };
@@ -35,7 +35,7 @@ sap.ui.define([
35
35
  * @extends Control
36
36
  *
37
37
  * @author SAP SE
38
- * @version 1.91.1
38
+ * @version 1.95.0
39
39
  *
40
40
  * @constructor
41
41
  * @private
@@ -20,7 +20,7 @@ sap.ui.define([
20
20
  * @extends sap.ui.core.Control
21
21
  *
22
22
  * @author SAP SE
23
- * @version 1.91.1
23
+ * @version 1.95.0
24
24
  *
25
25
  * @constructor
26
26
  * @private
@@ -23,7 +23,7 @@ sap.ui.define([
23
23
  * @extends Control
24
24
  *
25
25
  * @author SAP SE
26
- * @version 1.91.1
26
+ * @version 1.95.0
27
27
  *
28
28
  * @constructor
29
29
  * @private
@@ -22,7 +22,7 @@ sap.ui.define([
22
22
  * @extends Control
23
23
  *
24
24
  * @author SAP SE
25
- * @version 1.91.1
25
+ * @version 1.95.0
26
26
  *
27
27
  * @constructor
28
28
  * @private
@@ -31,7 +31,7 @@ sap.ui.define([
31
31
  * @extends sap.ui.core.Control
32
32
  *
33
33
  * @author SAP SE
34
- * @version 1.91.1
34
+ * @version 1.95.0
35
35
  *
36
36
  * @constructor
37
37
  * @public
@@ -225,6 +225,9 @@ sap.ui.define([
225
225
  enableSettings: {
226
226
  path: "ruleBuilderInternalModel>/textRuleConfiguration/enableSettings"
227
227
  },
228
+ enableSettingResult: {
229
+ path: "ruleBuilderInternalModel>/textRuleConfiguration/enableSettingResult"
230
+ },
228
231
  expressionLanguage: this.getExpressionLanguage(),
229
232
  astExpressionLanguage: this.getAstExpressionLanguage()
230
233
  });
@@ -258,6 +261,9 @@ sap.ui.define([
258
261
  enableSettings: {
259
262
  path: "ruleBuilderInternalModel>/decisionTableConfiguration/enableSettings"
260
263
  },
264
+ enableSettingResult: {
265
+ path: "ruleBuilderInternalModel>/decisionTableConfiguration/enableSettingResult"
266
+ },
261
267
  hitPolicies: {
262
268
  path: "ruleBuilderInternalModel>/decisionTableConfiguration/hitPolicies"
263
269
  },
@@ -351,6 +357,7 @@ sap.ui.define([
351
357
  });
352
358
 
353
359
  this._setTextRuleConfigurationProperty("enableSettings", oTextRuleConfiguration.getEnableSettings());
360
+ this._setTextRuleConfigurationProperty("enableSettingResult", oTextRuleConfiguration.getEnableSettingResult());
354
361
 
355
362
  return this.setAggregation("textRuleConfiguration", oTextRuleConfiguration, true)
356
363
  },
@@ -367,6 +374,7 @@ sap.ui.define([
367
374
  });
368
375
 
369
376
  this._setDecisionTableConfigurationProperty("enableSettings", oDecisionTableConfiguration.getEnableSettings());
377
+ this._setDecisionTableConfigurationProperty("enableSettingResult", oDecisionTableConfiguration.getEnableSettingResult());
370
378
  this._setDecisionTableConfigurationProperty("hitPolicies", oDecisionTableConfiguration.getHitPolicies());
371
379
  this._setDecisionTableConfigurationProperty("cellFormat", oDecisionTableConfiguration.getCellFormat());
372
380
  this._setDecisionTableConfigurationProperty("decisionTableFormat", oDecisionTableConfiguration.getDecisionTableFormat());
@@ -44,7 +44,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
44
44
  * @extends Control
45
45
  *
46
46
  * @author SAP SE
47
- * @version 1.91.1
47
+ * @version 1.95.0
48
48
  *
49
49
  * @constructor
50
50
  * @private
@@ -60,6 +60,10 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
60
60
  group: "Misc",
61
61
  defaultValue: false
62
62
  },
63
+ enableSettingResult: {
64
+ type: "boolean",
65
+ defaultValue: true
66
+ },
63
67
  enableElse: {
64
68
  type: "boolean",
65
69
  defaultValue: true
@@ -587,7 +591,8 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
587
591
  var oModel = this._getModel();
588
592
  var oContext = this.getBindingContext();
589
593
  var oTextRuleSettings = new TextRuleSettings({
590
- newTextRule: this._internalModel.getProperty("/newTextRule")
594
+ newTextRule: this._internalModel.getProperty("/newTextRule"),
595
+ enableSettingResult: this.getEnableSettingResult()
591
596
  });
592
597
  if (this.getAstExpressionLanguage()) {
593
598
  oTextRuleSettings.setAstExpressionLanguage(this.getAstExpressionLanguage());
@@ -1679,6 +1684,12 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
1679
1684
  return this;
1680
1685
  },
1681
1686
 
1687
+ setEnableSettingResult: function (value) {
1688
+ //value = true;
1689
+ this.setProperty("enableSettingResult", value, true);
1690
+ return this;
1691
+ },
1692
+
1682
1693
  setModelName: function (value) {
1683
1694
  this.setProperty("modelName", value);
1684
1695
  this._resetContent = true;
@@ -22,7 +22,7 @@ sap.ui.define([
22
22
  * @extends sap.ui.core.Element
23
23
  *
24
24
  * @author SAP SE
25
- * @version 1.91.1
25
+ * @version 1.95.0
26
26
  *
27
27
  * @constructor
28
28
  * @public
@@ -43,6 +43,10 @@ sap.ui.define([
43
43
  type: "boolean",
44
44
  defaultValue: false
45
45
  },
46
+ enableSettingResult: {
47
+ type: "boolean",
48
+ defaultValue: true
49
+ },
46
50
  /**
47
51
  * The value determines whether the Else section is displayed in a Text Rule when the control is used with S/4 HANA 17.05 (Cloud) or 17.09 (On Premise) and higher (On Premise).
48
52
  */
@@ -78,6 +82,10 @@ sap.ui.define([
78
82
  return this._handlePropertySetter("enableSettings", bValue);
79
83
  },
80
84
 
85
+ setEnableSettingResult: function(bValue){
86
+ return this._handlePropertySetter("enableSettingResult", bValue);
87
+ },
88
+
81
89
  setEnableElse: function(bValue){
82
90
  return this._handlePropertySetter("enableElse", bValue);
83
91
  },
@@ -42,7 +42,7 @@ sap.ui.define([
42
42
  * @extends Control
43
43
  *
44
44
  * @author SAP SE
45
- * @version 1.91.1
45
+ * @version 1.95.0
46
46
  *
47
47
  * @constructor
48
48
  * @private
@@ -62,7 +62,11 @@ sap.ui.define([
62
62
  newTextRule: {
63
63
  type: "boolean",
64
64
  defaultValue: false
65
- }
65
+ },
66
+ enableSettingResult: {
67
+ type: "boolean",
68
+ defaultValue: true
69
+ }
66
70
  },
67
71
  aggregations: {
68
72
  mainLayout: {
@@ -284,6 +288,7 @@ sap.ui.define([
284
288
  text: "{settingModel>label}"
285
289
  })
286
290
  },
291
+ enabled: this.getProperty("enableSettingResult"),
287
292
  selectedKey: "{/ResultDataObjectId}",
288
293
  tooltip: this.oBundle.getText("chooseResultTooltip"),
289
294
  change: function (oEvent) {
@@ -197,11 +197,15 @@ sap.ui.define(["sap/rules/ui/ast/util/AstUtil", "sap/rules/ui/ast/provider/Terms
197
197
  }
198
198
  };
199
199
 
200
- /* returns all the dataObjects */
200
+ /* returns the nested DO */
201
201
  TermsBuilder.prototype._getNestedDataObject = function (id) {
202
202
  for (var doIterator = 0; doIterator < this._nestedDataObjects.length; doIterator++) {
203
203
  if (id === this._nestedDataObjects[doIterator].Id) {
204
- return this._nestedDataObjects[doIterator];
204
+ var nestedDO = this._nestedDataObjects[doIterator];
205
+ if(nestedDO.DataObjectReference && nestedDO.DataObjectReference.TargetDataObjectId){
206
+ return this._getNestedDataObject(nestedDO.DataObjectReference.TargetDataObjectId);
207
+ }
208
+ return nestedDO;
205
209
  }
206
210
  }
207
211
  };
@@ -248,7 +252,16 @@ sap.ui.define(["sap/rules/ui/ast/util/AstUtil", "sap/rules/ui/ast/provider/Terms
248
252
  dataObject = _dataObjects[doIterator];
249
253
  if(dataObject.Id === term.ResultDataObjectId) {
250
254
  var doVisited = [];
255
+ //check if DO reference
256
+ var referencedDO = null;
257
+ if(dataObject.DataObjectReference && dataObject.DataObjectReference.TargetDataObjectId){
258
+ referencedDO = this._getNestedDataObject(dataObject.DataObjectReference.TargetDataObjectId);
259
+ }
260
+
251
261
  attributes = dataObject.Attributes;
262
+ if(referencedDO){
263
+ attributes = referencedDO.Attributes;
264
+ }
252
265
  for (var attrIterator = 0; attrIterator < attributes.length; attrIterator++) {
253
266
  attribute = attributes[attrIterator];
254
267
  //if label is undefined then name will be used for label map
@@ -265,6 +278,9 @@ sap.ui.define(["sap/rules/ui/ast/util/AstUtil", "sap/rules/ui/ast/provider/Terms
265
278
  }
266
279
 
267
280
  associations = dataObject.Associations;
281
+ if(referencedDO){
282
+ associations = referencedDO.Associations;
283
+ }
268
284
  for (var assocIterator = 0; assocIterator < associations.length; assocIterator++) {
269
285
  association = associations[assocIterator];
270
286
  doVisited.push(dataObject.Id);
@@ -277,6 +293,9 @@ sap.ui.define(["sap/rules/ui/ast/util/AstUtil", "sap/rules/ui/ast/provider/Terms
277
293
  if(dataObject && dataObject.References) {
278
294
  references = dataObject.References;
279
295
  }
296
+ if(referencedDO){
297
+ references = referencedDO.References;
298
+ }
280
299
  for (var refIterator = 0; refIterator < references.length; refIterator++) {
281
300
  reference = references[refIterator];
282
301
  doVisited.push(dataObject.Id);
@@ -337,8 +356,17 @@ sap.ui.define(["sap/rules/ui/ast/util/AstUtil", "sap/rules/ui/ast/provider/Terms
337
356
  this.termsProviderInstance.addToTermsIdMap(dataObject.Id, term);
338
357
  this.termsProviderInstance.addToTermsNameMap(dataObject.Name, term);
339
358
  this.termsProviderInstance.addToTermsLabelMap(doLabel, term);
359
+
360
+ //check if DO reference
361
+ var referencedDO = null;
362
+ if(dataObject.DataObjectReference && dataObject.DataObjectReference.TargetDataObjectId){
363
+ referencedDO = this._getNestedDataObject(dataObject.DataObjectReference.TargetDataObjectId);
364
+ }
340
365
 
341
366
  attributes = dataObject.Attributes;
367
+ if(referencedDO){
368
+ attributes = referencedDO.Attributes;
369
+ }
342
370
  for (var attrIterator = 0; attrIterator < attributes.length; attrIterator++) {
343
371
  attribute = attributes[attrIterator];
344
372
 
@@ -357,6 +385,9 @@ sap.ui.define(["sap/rules/ui/ast/util/AstUtil", "sap/rules/ui/ast/provider/Terms
357
385
 
358
386
  var doVisited = [];
359
387
  associations = dataObject.Associations;
388
+ if(referencedDO){
389
+ associations = referencedDO.Associations;
390
+ }
360
391
  for (var assocIterator = 0; assocIterator < associations.length; assocIterator++) {
361
392
  association = associations[assocIterator];
362
393
  doVisited.push(dataObject.Id);
@@ -369,6 +400,9 @@ sap.ui.define(["sap/rules/ui/ast/util/AstUtil", "sap/rules/ui/ast/provider/Terms
369
400
  if(dataObject && dataObject.References) {
370
401
  references = dataObject.References;
371
402
  }
403
+ if(referencedDO){
404
+ references = referencedDO.References;
405
+ }
372
406
  for (var refIterator = 0; refIterator < references.length; refIterator++) {
373
407
  reference = references[refIterator];
374
408
  doVisited.push(dataObject.Id);