@sapui5/sap.suite.ui.generic.template 1.96.11 → 1.96.12

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 (46) hide show
  1. package/package.json +1 -1
  2. package/src/sap/suite/ui/generic/template/.library +1 -1
  3. package/src/sap/suite/ui/generic/template/ObjectPage/controller/ControllerImplementation.js +1 -0
  4. package/src/sap/suite/ui/generic/template/changeHandler/AddFilterItem.js +1 -1
  5. package/src/sap/suite/ui/generic/template/changeHandler/AddFooterActionButton.js +1 -1
  6. package/src/sap/suite/ui/generic/template/changeHandler/AddGroup.js +1 -1
  7. package/src/sap/suite/ui/generic/template/changeHandler/AddGroupElement.js +1 -1
  8. package/src/sap/suite/ui/generic/template/changeHandler/AddHeaderActionButton.js +1 -1
  9. package/src/sap/suite/ui/generic/template/changeHandler/AddHeaderFacet.js +1 -1
  10. package/src/sap/suite/ui/generic/template/changeHandler/AddSection.js +1 -1
  11. package/src/sap/suite/ui/generic/template/changeHandler/AddSubSection.js +1 -1
  12. package/src/sap/suite/ui/generic/template/changeHandler/AddTableColumn.js +1 -1
  13. package/src/sap/suite/ui/generic/template/changeHandler/AddToolbarActionButton.js +1 -1
  14. package/src/sap/suite/ui/generic/template/changeHandler/MoveFilterItems.js +1 -1
  15. package/src/sap/suite/ui/generic/template/changeHandler/MoveGroup.js +1 -1
  16. package/src/sap/suite/ui/generic/template/changeHandler/MoveGroupElement.js +1 -1
  17. package/src/sap/suite/ui/generic/template/changeHandler/MoveHeaderAndFooterActionButton.js +1 -1
  18. package/src/sap/suite/ui/generic/template/changeHandler/MoveHeaderFacet.js +1 -1
  19. package/src/sap/suite/ui/generic/template/changeHandler/MoveSection.js +1 -1
  20. package/src/sap/suite/ui/generic/template/changeHandler/MoveSubSection.js +1 -1
  21. package/src/sap/suite/ui/generic/template/changeHandler/MoveTableColumns.js +1 -1
  22. package/src/sap/suite/ui/generic/template/changeHandler/MoveToolbarActionButtons.js +1 -1
  23. package/src/sap/suite/ui/generic/template/changeHandler/RemoveFilterItem.js +1 -1
  24. package/src/sap/suite/ui/generic/template/changeHandler/RemoveGroup.js +1 -1
  25. package/src/sap/suite/ui/generic/template/changeHandler/RemoveGroupElement.js +1 -1
  26. package/src/sap/suite/ui/generic/template/changeHandler/RemoveHeaderAndFooterActionButton.js +1 -1
  27. package/src/sap/suite/ui/generic/template/changeHandler/RemoveHeaderFacet.js +1 -1
  28. package/src/sap/suite/ui/generic/template/changeHandler/RemoveSection.js +1 -1
  29. package/src/sap/suite/ui/generic/template/changeHandler/RemoveSubSection.js +1 -1
  30. package/src/sap/suite/ui/generic/template/changeHandler/RemoveTableColumn.js +1 -1
  31. package/src/sap/suite/ui/generic/template/changeHandler/RemoveToolbarActionButton.js +1 -1
  32. package/src/sap/suite/ui/generic/template/changeHandler/RevealFilterItem.js +1 -1
  33. package/src/sap/suite/ui/generic/template/changeHandler/RevealHeaderFacet.js +1 -1
  34. package/src/sap/suite/ui/generic/template/changeHandler/RevealTableColumn.js +1 -1
  35. package/src/sap/suite/ui/generic/template/changeHandler/RevealToolbarActionButton.js +1 -1
  36. package/src/sap/suite/ui/generic/template/changeHandler/generic/AddElement.js +1 -1
  37. package/src/sap/suite/ui/generic/template/changeHandler/generic/MoveElements.js +1 -1
  38. package/src/sap/suite/ui/generic/template/changeHandler/generic/RemoveElement.js +1 -1
  39. package/src/sap/suite/ui/generic/template/changeHandler/generic/RevealElement.js +1 -1
  40. package/src/sap/suite/ui/generic/template/changeHandler/util/AnnotationPropertyCommand.js +1 -1
  41. package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartChartWrapper.js +24 -25
  42. package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartTableWrapper.js +28 -28
  43. package/src/sap/suite/ui/generic/template/lib/navigation/NavigationController.js +1 -1
  44. package/src/sap/suite/ui/generic/template/lib/presentationControl/SmartTableHandler.js +22 -11
  45. package/src/sap/suite/ui/generic/template/library.js +1 -1
  46. package/src/sap/suite/ui/generic/template/listTemplates/listUtils.js +2 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sapui5/sap.suite.ui.generic.template",
3
- "version": "1.96.11",
3
+ "version": "1.96.12",
4
4
  "description": "SAPUI5 Library sap.suite.ui.generic.template",
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-2015 SAP SE. All rights reserved
9
9
  </copyright>
10
- <version>1.96.11</version>
10
+ <version>1.96.12</version>
11
11
 
12
12
  <documentation>Library with generic Suite UI templates.</documentation>
13
13
 
@@ -1755,6 +1755,7 @@ sap.ui.define([
1755
1755
  * - hiding table columns dynamically using deactivate columns (see applyHeaderContextToSmartTablesDynamicColumnHide) when OP is bound and header data available
1756
1756
  * - this causes SmartTable to rebind (in some cases - probably when columns hidden before now are not hidden anymore)
1757
1757
  * - workaround to take beforeRebindTable event as indicator for state change, as no specific event is provided when user changes personalization (see SmartTableWrapper)
1758
+ * Update: In the meantime, specific event (UiStateChange) is provided and used, however, this event is also triggered when deactivating columns programmatically
1758
1759
  * - subSection waiting for state being applied before restoring binding to avoid table using variant management to load data before correct variant is applied
1759
1760
  *
1760
1761
  * Cannot be handled generically by state preserver
@@ -30,7 +30,7 @@ sap.ui.define([
30
30
  *
31
31
  * @alias sap.suite.ui.generic.template.changeHandler.AddFilterItem
32
32
  * @author SAP SE
33
- * @version 1.96.11
33
+ * @version 1.96.12
34
34
  * @experimental
35
35
  */
36
36
  var AddFilterItem = {};
@@ -17,7 +17,7 @@ sap.ui.define([
17
17
  *
18
18
  * @alias sap.suite.ui.generic.template.changeHandler.AddFooterActionButton
19
19
  * @author SAP SE
20
- * @version 1.96.11
20
+ * @version 1.96.12
21
21
  * @experimental
22
22
  */
23
23
  var AddFooterActionButton = {};
@@ -14,7 +14,7 @@ sap.ui.define([
14
14
  *
15
15
  * @alias sap.suite.ui.generic.template.changeHandler.AddGroup
16
16
  * @author SAP SE
17
- * @version 1.96.11
17
+ * @version 1.96.12
18
18
  * @experimental
19
19
  */
20
20
  var AddGroup = {};
@@ -15,7 +15,7 @@ sap.ui.define([
15
15
  * Change handler for adding a group element in a SmartForm group.
16
16
  *
17
17
  * @author SAP SE
18
- * @version 1.96.11
18
+ * @version 1.96.12
19
19
  * @experimental
20
20
  */
21
21
  var DATAFIELD = "com.sap.vocabularies.UI.v1.DataField";
@@ -17,7 +17,7 @@ sap.ui.define([
17
17
  *
18
18
  * @alias sap.suite.ui.generic.template.changeHandler.AddHeaderActionButton
19
19
  * @author SAP SE
20
- * @version 1.96.11
20
+ * @version 1.96.12
21
21
  * @experimental
22
22
  */
23
23
  var AddHeaderActionButton = {};
@@ -21,7 +21,7 @@ sap.ui.define([
21
21
  *
22
22
  * @alias sap.suite.ui.generic.template.changeHandler.AddHeaderFacet
23
23
  * @author SAP SE
24
- * @version 1.96.11
24
+ * @version 1.96.12
25
25
  * @experimental
26
26
  */
27
27
  var AddHeaderFacet = {};
@@ -14,7 +14,7 @@ sap.ui.define([
14
14
  *
15
15
  * @alias sap.suite.ui.generic.template.changeHandler.AddSection **
16
16
  * @author SAP SE
17
- * @version 1.96.11
17
+ * @version 1.96.12
18
18
  * @experimental
19
19
  */
20
20
  var AddSection = {};
@@ -18,7 +18,7 @@ sap.ui.define([
18
18
  *
19
19
  * @alias sap.suite.ui.generic.template.changeHandler.Add SubSection **
20
20
  * @author SAP SE
21
- * @version 1.96.11
21
+ * @version 1.96.12
22
22
  * @experimental
23
23
  */
24
24
  var AddSubSection = {};
@@ -19,7 +19,7 @@ sap.ui.define([
19
19
  *
20
20
  * @alias sap.suite.ui.generic.template.changeHandler.AddTableColumn
21
21
  * @author SAP SE
22
- * @version 1.96.11
22
+ * @version 1.96.12
23
23
  * @experimental
24
24
  */
25
25
  var AddTableColumn = {};
@@ -17,7 +17,7 @@ sap.ui.define([
17
17
  *
18
18
  * @alias sap.suite.ui.generic.template.changeHandler.AddToolbarActionButton
19
19
  * @author SAP SE
20
- * @version 1.96.11
20
+ * @version 1.96.12
21
21
  * @experimental
22
22
  */
23
23
  var AddToolbarActionButton = {};
@@ -19,7 +19,7 @@ sap.ui.define([
19
19
  *
20
20
  * @alias sap.suite.ui.generic.template.changeHandler.MoveFilterItem
21
21
  * @author SAP SE
22
- * @version 1.96.11
22
+ * @version 1.96.12
23
23
  * @experimental
24
24
  */
25
25
  var MoveFilterItems = {};
@@ -21,7 +21,7 @@ sap.ui.define([
21
21
  *
22
22
  * @alias sap.suite.ui.generic.template.changeHandler.MoveGroup
23
23
  * @author SAP SE
24
- * @version 1.96.11
24
+ * @version 1.96.12
25
25
  * @experimental
26
26
  */
27
27
  var MoveGroup = {},
@@ -15,7 +15,7 @@ sap.ui.define([
15
15
  * Change handler for moving a form group element.
16
16
  *
17
17
  * @author SAP SE
18
- * @version 1.96.11
18
+ * @version 1.96.12
19
19
  * @experimental
20
20
  */
21
21
  var MoveGroupElement = {};
@@ -20,7 +20,7 @@ sap.ui.define([
20
20
  *
21
21
  * @alias sap.suite.ui.generic.template.changeHandler.MoveHeaderAndFooterActionButton
22
22
  * @author SAP SE
23
- * @version 1.96.11
23
+ * @version 1.96.12
24
24
  * @experimental
25
25
  */
26
26
  var MoveHeaderAndFooterActionButton = {};
@@ -19,7 +19,7 @@ sap.ui.define([
19
19
  *
20
20
  * @alias sap.suite.ui.generic.template.changeHandler.MoveHeaderFacet
21
21
  * @author SAP SE
22
- * @version 1.96.11
22
+ * @version 1.96.12
23
23
  * @experimental
24
24
  */
25
25
  var MoveHeaderFacet = {},
@@ -21,7 +21,7 @@ sap.ui.define([
21
21
  *
22
22
  * @alias sap.suite.ui.generic.template.changeHandler.MoveGroup
23
23
  * @author SAP SE
24
- * @version 1.96.11
24
+ * @version 1.96.12
25
25
  * @experimental
26
26
  */
27
27
  var MoveSection = {};
@@ -21,7 +21,7 @@ sap.ui.define([
21
21
  *
22
22
  * @alias sap.suite.ui.generic.template.changeHandler.MoveSubSection
23
23
  * @author SAP SE
24
- * @version 1.96.11
24
+ * @version 1.96.12
25
25
  * @experimental
26
26
  */
27
27
  var MoveSubSection = {},
@@ -21,7 +21,7 @@ sap.ui.define([
21
21
  *
22
22
  * @alias sap.suite.ui.generic.template.changeHandler.MoveTableColumns
23
23
  * @author SAP SE
24
- * @version 1.96.11
24
+ * @version 1.96.12
25
25
  * @experimental
26
26
  */
27
27
  var MoveTableColumns = {};
@@ -21,7 +21,7 @@ sap.ui.define([
21
21
  *
22
22
  * @alias sap.suite.ui.generic.template.changeHandler.MoveToolbarActionButtons
23
23
  * @author SAP SE
24
- * @version 1.96.11
24
+ * @version 1.96.12
25
25
  * @experimental
26
26
  */
27
27
  var MoveToolbarActionButtons = {};
@@ -17,7 +17,7 @@ sap.ui.define([
17
17
  *
18
18
  * @alias sap.suite.ui.generic.template.changeHandler.RemoveFilterItem
19
19
  * @author SAP SE
20
- * @version 1.96.11
20
+ * @version 1.96.12
21
21
  */
22
22
 
23
23
  var RemoveFilterItem = {};
@@ -19,7 +19,7 @@ sap.ui.define([
19
19
  *
20
20
  * @alias sap.suite.ui.generic.template.changeHandler.RemoveGroup
21
21
  * @author SAP SE
22
- * @version 1.96.11
22
+ * @version 1.96.12
23
23
  * @experimental
24
24
  */
25
25
  var RemoveGroup = {};
@@ -13,7 +13,7 @@ sap.ui.define([
13
13
  * Change handler for removing a form group element.
14
14
  *
15
15
  * @author SAP SE
16
- * @version 1.96.11
16
+ * @version 1.96.12
17
17
  * @experimental
18
18
  */
19
19
  var FIELDGROUP = "com.sap.vocabularies.UI.v1.FieldGroup";
@@ -15,7 +15,7 @@ sap.ui.define([
15
15
  *
16
16
  * @alias sap.suite.ui.generic.template.changeHandler.RemoveHeaderAndFooterActionButton
17
17
  * @author SAP SE
18
- * @version 1.96.11
18
+ * @version 1.96.12
19
19
  * @experimental
20
20
  */
21
21
  var RemoveHeaderAndFooterActionButton = {};
@@ -17,7 +17,7 @@ sap.ui.define([
17
17
  *
18
18
  * @alias sap.suite.ui.generic.template.changeHandler.RemoveHeaderFacet **
19
19
  * @author SAP SE
20
- * @version 1.96.11
20
+ * @version 1.96.12
21
21
  * @experimental
22
22
  */
23
23
  var RemoveHeaderFacet = {};
@@ -17,7 +17,7 @@ sap.ui.define([
17
17
  *
18
18
  * @alias sap.suite.ui.generic.template.changeHandler.RemoveSection **
19
19
  * @author SAP SE
20
- * @version 1.96.11
20
+ * @version 1.96.12
21
21
  * @experimental
22
22
  */
23
23
  var RemoveSection = {};
@@ -18,7 +18,7 @@ sap.ui.define([
18
18
  *
19
19
  * @alias sap.suite.ui.generic.template.changeHandler.RemoveSection **
20
20
  * @author SAP SE
21
- * @version 1.96.11
21
+ * @version 1.96.12
22
22
  * @experimental
23
23
  */
24
24
  var RemoveSubSection = {};
@@ -15,7 +15,7 @@ sap.ui.define([
15
15
  *
16
16
  * @alias sap.suite.ui.generic.template.changeHandler.RemoveTableColumn
17
17
  * @author SAP SE
18
- * @version 1.96.11
18
+ * @version 1.96.12
19
19
  */
20
20
 
21
21
  var RemoveTableColumn = {};
@@ -15,7 +15,7 @@ sap.ui.define([
15
15
  *
16
16
  * @alias sap.suite.ui.generic.template.changeHandler.RemoveToolbarActionButton
17
17
  * @author SAP SE
18
- * @version 1.96.11
18
+ * @version 1.96.12
19
19
  * @experimental
20
20
  */
21
21
 
@@ -19,7 +19,7 @@ sap.ui.define([
19
19
  *
20
20
  * @alias sap.suite.ui.generic.template.changeHandler.RevealFilterItem
21
21
  * @author SAP SE
22
- * @version 1.96.11
22
+ * @version 1.96.12
23
23
  * @experimental
24
24
  */
25
25
  var RevealFilterItem = {};
@@ -19,7 +19,7 @@ sap.ui.define([
19
19
  *
20
20
  * @alias sap.suite.ui.generic.template.changeHandler.RevealHeaderFacet
21
21
  * @author SAP SE
22
- * @version 1.96.11
22
+ * @version 1.96.12
23
23
  * @experimental
24
24
  */
25
25
  var RevealHeaderFacet = {};
@@ -16,7 +16,7 @@ sap.ui.define([
16
16
  *
17
17
  * @alias sap.suite.ui.generic.template.changeHandler.RevealTableColumn
18
18
  * @author SAP SE
19
- * @version 1.96.11
19
+ * @version 1.96.12
20
20
  * @experimental
21
21
  */
22
22
  var RevealTableColumn = {};
@@ -19,7 +19,7 @@ sap.ui.define([
19
19
  *
20
20
  * @alias sap.suite.ui.generic.template.changeHandler.RevealToolbarActionButton
21
21
  * @author SAP SE
22
- * @version 1.96.11
22
+ * @version 1.96.12
23
23
  * @experimental
24
24
  */
25
25
 
@@ -20,7 +20,7 @@ sap.ui.define([
20
20
  *
21
21
  * @alias sap.suite.ui.generic.template.changeHandler.AddElement
22
22
  * @author SAP SE
23
- * @version 1.96.11
23
+ * @version 1.96.12
24
24
  * @experimental
25
25
  */
26
26
  var AddElement = {};
@@ -19,7 +19,7 @@ sap.ui.define([
19
19
  *
20
20
  * @alias sap.suite.ui.generic.template.changeHandler.MoveElements
21
21
  * @author SAP SE
22
- * @version 1.96.11
22
+ * @version 1.96.12
23
23
  */
24
24
 
25
25
  var MoveElements = {},
@@ -19,7 +19,7 @@ sap.ui.define([
19
19
  *
20
20
  * @alias sap.suite.ui.generic.template.changeHandler.RemoveElement
21
21
  * @author SAP SE
22
- * @version 1.96.11
22
+ * @version 1.96.12
23
23
  */
24
24
 
25
25
  var RemoveElement = {};
@@ -20,7 +20,7 @@ sap.ui.define([
20
20
  *
21
21
  * @alias sap.suite.ui.generic.template.changeHandler.RevealElements
22
22
  * @author SAP SE
23
- * @version 1.96.11
23
+ * @version 1.96.12
24
24
  * @experimental
25
25
  */
26
26
  var RevealElement = {};
@@ -30,7 +30,7 @@ sap.ui.define([
30
30
  * @class
31
31
  * @extends sap.ui.rta.command.FlexCommand
32
32
  * @author SAP SE
33
- * @version 1.96.11
33
+ * @version 1.96.12
34
34
  * @constructor
35
35
  * @private
36
36
  * @alias sap.suite.ui.generic.template.changeHandler.util.AnnotationPropertyCommand
@@ -1,9 +1,9 @@
1
1
  sap.ui.define([
2
- "sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartTableChartCommon"
3
- ], function(SmartTableChartCommon) {
2
+ "sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartTableChartCommon"
3
+ ], function(SmartTableChartCommon) {
4
4
  "use strict";
5
5
  function SmartChartWrapper(oWrappedControl) {
6
- // (private) instance attributes
6
+ // (private) instance attributes
7
7
  // control to be wrapped
8
8
  var oControl = oWrappedControl;
9
9
  // controlling initialization state of wrapped control
@@ -12,46 +12,45 @@ sap.ui.define([
12
12
 
13
13
  // preliminary put here to simplify change - todo: decide whether to get this information once in initialize or whenever it's needed
14
14
  var bUseVariantManagement;
15
- //private methods
16
- function fnGetState() {
17
- if (!bReady) {
15
+ //private methods
16
+ function fnGetState() {
17
+ if (!bReady) {
18
18
  return oPreliminaryState;
19
19
  }
20
- var oControlState = SmartTableChartCommon.getState(oControl, bUseVariantManagement);
21
- //Add Table specific logic here as and when required
22
- return oControlState;
23
- }
20
+ var oControlState = SmartTableChartCommon.getState(oControl, bUseVariantManagement);
21
+ //Add Table specific logic here as and when required
22
+ return oControlState;
23
+ }
24
24
 
25
- function fnSetState(oState) {
26
- if (!bReady) {
25
+ function fnSetState(oState) {
26
+ if (!bReady) {
27
27
  // SmartTable/SmartChart is not ready to set a state - keep it in local memory
28
28
  // if multiple states are set before, the last one wins
29
29
  oPreliminaryState = oState;
30
30
  return;
31
31
  }
32
- SmartTableChartCommon.setState(oControl, bUseVariantManagement, oState);
32
+ SmartTableChartCommon.setState(oControl, bUseVariantManagement, oState);
33
33
  //Add Table specific logic here as and when required
34
- }
35
- //Initialization
36
- SmartTableChartCommon.initialize(oControl).then(function(){
34
+ }
35
+ //Initialization
36
+ SmartTableChartCommon.initialize(oControl).then(function(){
37
37
  bReady = true;
38
38
  bUseVariantManagement = oControl.getUseVariantManagement();
39
39
  if (oPreliminaryState) {
40
40
  fnSetState(oPreliminaryState);
41
41
  }
42
42
  });
43
- //TODO: using beforeRebind is not correct, but assumed to work in most cases.
44
- //Should be replaced with corrected events (personalizationChanged) as soon as provided by SmartTable/SmartChart."
45
- function fnAttachStateChanged(fnHandler) {
46
- oControl.attachBeforeRebindChart(fnHandler);
43
+
44
+ function fnAttachStateChanged(fnHandler) {
45
+ oControl.attachUiStateChange(fnHandler);
47
46
  }
48
47
 
49
- return {
48
+ return {
50
49
  getState: fnGetState,
51
- setState: fnSetState,
52
- attachStateChanged: fnAttachStateChanged
50
+ setState: fnSetState,
51
+ attachStateChanged: fnAttachStateChanged
53
52
  };
54
- }
53
+ }
55
54
 
56
- return SmartChartWrapper;
55
+ return SmartChartWrapper;
57
56
  });
@@ -1,9 +1,9 @@
1
1
  sap.ui.define([
2
- "sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartTableChartCommon"
3
- ], function(SmartTableChartCommon) {
2
+ "sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartTableChartCommon"
3
+ ], function(SmartTableChartCommon) {
4
4
  "use strict";
5
- function SmartTableWrapper(oWrappedControl) {
6
- // (private) instance attributes
5
+ function SmartTableWrapper(oWrappedControl) {
6
+ // (private) instance attributes
7
7
  // control to be wrapped
8
8
  var oControl = oWrappedControl;
9
9
  // controlling initialization state of wrapped control
@@ -12,44 +12,44 @@ sap.ui.define([
12
12
 
13
13
  // preliminary put here to simplify change - todo: decide whether to get this information once in initialize or whenever it's needed
14
14
  var bUseVariantManagement;
15
- //private methods
16
- function fnGetState() {
17
- if (!bReady) {
15
+ //private methods
16
+ function fnGetState() {
17
+ if (!bReady) {
18
18
  return oPreliminaryState;
19
19
  }
20
- var oControlState = SmartTableChartCommon.getState(oControl, bUseVariantManagement);//fnCommonGetState();
21
- //Add Table specific logic here as and when required
22
- return oControlState;
23
- }
20
+ var oControlState = SmartTableChartCommon.getState(oControl, bUseVariantManagement);//fnCommonGetState();
21
+ //Add Table specific logic here as and when required
22
+ return oControlState;
23
+ }
24
24
 
25
- function fnSetState(oState) {
26
- if (!bReady) {
25
+ function fnSetState(oState) {
26
+ if (!bReady) {
27
27
  // SmartTable/SmartChart is not ready to set a state - keep it in local memory
28
28
  // if multiple states are set before, the last one wins
29
29
  oPreliminaryState = oState;
30
30
  return;
31
31
  }
32
- SmartTableChartCommon.setState(oControl, bUseVariantManagement, oState);
33
- //Add Table specific logic here as and when required
34
- }
35
- //Initialization
36
- SmartTableChartCommon.initialize(oControl).then(function(){
32
+ SmartTableChartCommon.setState(oControl, bUseVariantManagement, oState);
33
+ //Add Table specific logic here as and when required
34
+ }
35
+ //Initialization
36
+ SmartTableChartCommon.initialize(oControl).then(function(){
37
37
  bReady = true;
38
- bUseVariantManagement = oControl.getUseVariantManagement();
38
+ bUseVariantManagement = oControl.getUseVariantManagement();
39
39
  if (oPreliminaryState) {
40
40
  fnSetState(oPreliminaryState);
41
41
  }
42
42
  });
43
- //TODO: using beforeRebind is not correct, but assumed to work in most cases.
44
- //Should be replaced with corrected events (personalizationChanged) as soon as provided by SmartTable/SmartChart."
45
- function fnAttachStateChanged(fnHandler) {
46
- oControl.attachBeforeRebindTable(fnHandler);
43
+
44
+ function fnAttachStateChanged(fnHandler) {
45
+ oControl.attachUiStateChange(fnHandler);
47
46
  }
48
- return {
47
+
48
+ return {
49
49
  getState: fnGetState,
50
- setState: fnSetState,
51
- attachStateChanged: fnAttachStateChanged
50
+ setState: fnSetState,
51
+ attachStateChanged: fnAttachStateChanged
52
52
  };
53
- }
54
- return SmartTableWrapper;
53
+ }
54
+ return SmartTableWrapper;
55
55
  });
@@ -2697,7 +2697,7 @@ sap.ui.define(["sap/ui/base/Object",
2697
2697
  * @param {sap.suite.ui.generic.template.lib.AppComponent} oAppComponent The AppComponent instance
2698
2698
  * @public
2699
2699
  * @extends sap.ui.base.Object
2700
- * @version 1.96.11
2700
+ * @version 1.96.12
2701
2701
  * @since 1.30.0
2702
2702
  * @alias sap.suite.ui.generic.template.lib.NavigationController
2703
2703
  */
@@ -125,17 +125,28 @@ sap.ui.define([
125
125
  oSmartTable.rebindTable();
126
126
  }
127
127
 
128
- function fnApplyNavigationSortOrder(aNavigationSortOrder) {
129
- var oUiState = oSmartTable.getUiState();
130
- var oPresentationVariant = oUiState.getPresentationVariant();
131
- if (!oPresentationVariant.SortOrder) {
132
- oPresentationVariant.SortOrder = getTemplateSortOrder();
133
- }
134
- oPresentationVariant.SortOrder = oPresentationVariant.SortOrder.concat(aNavigationSortOrder);
135
-
136
- oUiState.setPresentationVariant(oPresentationVariant);
137
- oSmartTable.setUiState(oUiState);
138
- }
128
+ function fnApplyNavigationSortOrder(aNavigationSortOrders) {
129
+ var oOwnerComponent = oController.getOwnerComponent();
130
+ var oMetaModel = oOwnerComponent.getModel().getMetaModel();
131
+ var aNonSortableProperties = [];
132
+ var oSortRestrictions = oMetaModel.getODataEntitySet(oOwnerComponent.getEntitySet())["Org.OData.Capabilities.V1.SortRestrictions"];
133
+ if (oSortRestrictions && oSortRestrictions.NonSortableProperties) {
134
+ aNonSortableProperties = oSortRestrictions.NonSortableProperties.map(function(oProperty) {
135
+ return oProperty.PropertyPath;
136
+ });
137
+ }
138
+ var aRelevantSortOrders = aNavigationSortOrders.filter(function(oProperty) {
139
+ return !aNonSortableProperties.includes(oProperty.Property);
140
+ });
141
+ var oUiState = oSmartTable.getUiState();
142
+ var oPresentationVariant = oUiState.getPresentationVariant();
143
+ if (!oPresentationVariant.SortOrder) {
144
+ oPresentationVariant.SortOrder = getTemplateSortOrder();
145
+ }
146
+ oPresentationVariant.SortOrder = oPresentationVariant.SortOrder.concat(aRelevantSortOrders);
147
+ oUiState.setPresentationVariant(oPresentationVariant);
148
+ oSmartTable.setUiState(oUiState);
149
+ }
139
150
 
140
151
  function fnScrollToSelectedItemAsPerChildContext(sCurrentChildContext) {
141
152
  var oInnerTable = oSmartTable.getTable();
@@ -37,7 +37,7 @@ sap.ui.define(['sap/ui/core/library','sap/fe/placeholder/library'
37
37
  interfaces: [],
38
38
  controls: [],
39
39
  elements: [],
40
- version: "1.96.11",
40
+ version: "1.96.12",
41
41
  extensions: {
42
42
  //Configuration used for rule loading of Support Assistant
43
43
  "sap.ui.support": {
@@ -71,6 +71,7 @@ sap.ui.define(["sap/ui/core/library",
71
71
  // copy selection options
72
72
  aVariantOptions = oVariant.getSelectOptionsPropertyNames();
73
73
  aVariantOptions.forEach(function (sProperty) {
74
+ oMergedVariant.removeParameter(sProperty);
74
75
  oMergedVariant.removeSelectOption(sProperty);
75
76
  oMergedVariant.massAddSelectOption(sProperty, oVariant.getSelectOption(sProperty));
76
77
  });
@@ -78,6 +79,7 @@ sap.ui.define(["sap/ui/core/library",
78
79
  aVariantParameters = oVariant.getParameterNames();
79
80
  aVariantParameters.forEach(function (sParam) {
80
81
  oMergedVariant.removeParameter(sParam);
82
+ oMergedVariant.removeSelectOption(sParam);
81
83
  oMergedVariant.addParameter(sParam, oVariant.getParameter(sParam));
82
84
  });
83
85
  });