@sapui5/sap.rules.ui 1.94.0 → 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 (23) hide show
  1. package/package.json +1 -1
  2. package/src/sap/rules/ui/.library +1 -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 +1 -1
  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 +1 -1
  11. package/src/sap/rules/ui/DecisionTableSettings.js +1 -1
  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 +1 -1
  17. package/src/sap/rules/ui/TextRule.js +1 -1
  18. package/src/sap/rules/ui/TextRuleConfiguration.js +1 -1
  19. package/src/sap/rules/ui/TextRuleSettings.js +1 -1
  20. package/src/sap/rules/ui/ast/builder/TermsBuilder.js +36 -2
  21. package/src/sap/rules/ui/ast/parser/bundle.js +2973 -1471
  22. package/src/sap/rules/ui/library.js +1 -1
  23. package/src/sap/rules/ui/type/ExpressionAbs.js +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sapui5/sap.rules.ui",
3
- "version": "1.94.0",
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)",
package/src/sap/rules/ui/.library CHANGED
@@ -7,7 +7,7 @@
7
7
 
8
8
  (c) Copyright 2009-2016 SAP SE. All rights reserved
9
9
  </copyright>
10
- <version>1.94.0</version>
10
+ <version>1.95.0</version>
11
11
 
12
12
  <documentation>UI5 library: sap.rules.ui</documentation>
13
13
 
package/src/sap/rules/ui/AstExpressionBasic.js CHANGED
@@ -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 {
package/src/sap/rules/ui/BindingSpy.js CHANGED
@@ -23,7 +23,7 @@ sap.ui.define([
23
23
  * @extends ManagedObject
24
24
  *
25
25
  * @author SAP SE
26
- * @version 1.94.0
26
+ * @version 1.95.0
27
27
  *
28
28
  * @constructor
29
29
  * @private
package/src/sap/rules/ui/DecisionTable.js CHANGED
@@ -55,7 +55,7 @@ sap.ui.define([
55
55
  * @extends Control
56
56
  *
57
57
  * @author SAP SE
58
- * @version 1.94.0
58
+ * @version 1.95.0
59
59
  *
60
60
  * @constructor
61
61
  * @private
package/src/sap/rules/ui/DecisionTableCell.js CHANGED
@@ -32,7 +32,7 @@ sap.ui.define([
32
32
  * @extends sap.ui.core.Control
33
33
  *
34
34
  * @author SAP SE
35
- * @version 1.94.0
35
+ * @version 1.95.0
36
36
  *
37
37
  * @constructor
38
38
  * @public
package/src/sap/rules/ui/DecisionTableCellAstExpressionBasic.js CHANGED
@@ -24,7 +24,7 @@ sap.ui.define([
24
24
  * @extends sap.rules.ui.AstExpressionBasic
25
25
  *
26
26
  * @author SAP SE
27
- * @version 1.94.0
27
+ * @version 1.95.0
28
28
  *
29
29
  * @constructor
30
30
  * @private
package/src/sap/rules/ui/DecisionTableCellExpressionAdvanced.js CHANGED
@@ -24,7 +24,7 @@ sap.ui.define([
24
24
  * @extends sap.rules.ui.ExpressionAdvanced
25
25
  *
26
26
  * @author SAP SE
27
- * @version 1.94.0
27
+ * @version 1.95.0
28
28
  *
29
29
  * @constructor
30
30
  * @private
package/src/sap/rules/ui/DecisionTableCellExpressionBasic.js CHANGED
@@ -23,7 +23,7 @@ sap.ui.define([
23
23
  * @extends sap.rules.ui.ExpressionBasic
24
24
  *
25
25
  * @author SAP SE
26
- * @version 1.94.0
26
+ * @version 1.95.0
27
27
  *
28
28
  * @constructor
29
29
  * @private
package/src/sap/rules/ui/DecisionTableConfiguration.js CHANGED
@@ -22,7 +22,7 @@ sap.ui.define([
22
22
  * @extends sap.ui.core.Element
23
23
  *
24
24
  * @author SAP SE
25
- * @version 1.94.0
25
+ * @version 1.95.0
26
26
  *
27
27
  * @constructor
28
28
  * @public
package/src/sap/rules/ui/DecisionTableSettings.js CHANGED
@@ -41,7 +41,7 @@ sap.ui.define([
41
41
  * @extends Control
42
42
  *
43
43
  * @author SAP SE
44
- * @version 1.94.0
44
+ * @version 1.95.0
45
45
  *
46
46
  * @constructor
47
47
  * @private
package/src/sap/rules/ui/DecisionTableSettingsOld.js CHANGED
@@ -35,7 +35,7 @@ sap.ui.define([
35
35
  * @extends Control
36
36
  *
37
37
  * @author SAP SE
38
- * @version 1.94.0
38
+ * @version 1.95.0
39
39
  *
40
40
  * @constructor
41
41
  * @private
package/src/sap/rules/ui/ExpressionBase.js CHANGED
@@ -20,7 +20,7 @@ sap.ui.define([
20
20
  * @extends sap.ui.core.Control
21
21
  *
22
22
  * @author SAP SE
23
- * @version 1.94.0
23
+ * @version 1.95.0
24
24
  *
25
25
  * @constructor
26
26
  * @private
package/src/sap/rules/ui/ExpressionBasic.js CHANGED
@@ -23,7 +23,7 @@ sap.ui.define([
23
23
  * @extends Control
24
24
  *
25
25
  * @author SAP SE
26
- * @version 1.94.0
26
+ * @version 1.95.0
27
27
  *
28
28
  * @constructor
29
29
  * @private
package/src/sap/rules/ui/RuleBase.js CHANGED
@@ -22,7 +22,7 @@ sap.ui.define([
22
22
  * @extends Control
23
23
  *
24
24
  * @author SAP SE
25
- * @version 1.94.0
25
+ * @version 1.95.0
26
26
  *
27
27
  * @constructor
28
28
  * @private
package/src/sap/rules/ui/RuleBuilder.js CHANGED
@@ -31,7 +31,7 @@ sap.ui.define([
31
31
  * @extends sap.ui.core.Control
32
32
  *
33
33
  * @author SAP SE
34
- * @version 1.94.0
34
+ * @version 1.95.0
35
35
  *
36
36
  * @constructor
37
37
  * @public
package/src/sap/rules/ui/TextRule.js CHANGED
@@ -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.94.0
47
+ * @version 1.95.0
48
48
  *
49
49
  * @constructor
50
50
  * @private
package/src/sap/rules/ui/TextRuleConfiguration.js CHANGED
@@ -22,7 +22,7 @@ sap.ui.define([
22
22
  * @extends sap.ui.core.Element
23
23
  *
24
24
  * @author SAP SE
25
- * @version 1.94.0
25
+ * @version 1.95.0
26
26
  *
27
27
  * @constructor
28
28
  * @public
package/src/sap/rules/ui/TextRuleSettings.js CHANGED
@@ -42,7 +42,7 @@ sap.ui.define([
42
42
  * @extends Control
43
43
  *
44
44
  * @author SAP SE
45
- * @version 1.94.0
45
+ * @version 1.95.0
46
46
  *
47
47
  * @constructor
48
48
  * @private
package/src/sap/rules/ui/ast/builder/TermsBuilder.js CHANGED
@@ -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);