@openui5/sap.ui.mdc 1.99.1 → 1.102.0

package/src/sap/ui/mdc/p13n/subcontroller/ColumnWidthController.js

@@ -6,24 +6,27 @@
 
 sap.ui.define([
 	"./BaseController",
-	"sap/ui/mdc/p13n/FlexUtil"
-], function (BaseController, FlexUtil) {
+	"sap/ui/mdc/p13n/FlexUtil",
+    'sap/ui/mdc/p13n/modules/xConfigAPI',
+	"sap/base/util/merge"
+], function (BaseController, FlexUtil, xConfigAPI, merge) {
 	"use strict";
 
 	var ColumnWidthController = BaseController.extend("sap.ui.mdc.p13n.subcontroller.ColumnWidthController", {
 		constructor: function() {
 			BaseController.apply(this, arguments);
+			this._bXConfigEnabled = true;
 			this._bResetEnabled = true;
 		}
 	});
 
-	ColumnWidthController.prototype.sanityCheck = function(oChange) {
+	ColumnWidthController.prototype.sanityCheck = function(oState) {
         var aColumnWidth = [];
-		if (oChange.hasOwnProperty("aggregations") && oChange.aggregations.hasOwnProperty("columns")) {
-			Object.keys(oChange.aggregations.columns).forEach(function(sItem) {
+		if (oState && oState.hasOwnProperty("aggregations") && oState.aggregations.hasOwnProperty("columns")) {
+			Object.keys(oState.aggregations.columns).forEach(function(sItem) {
 				var oColumnWidth = {
 					name: sItem,
-					width: oChange.aggregations.columns[sItem].width
+					width: oState.aggregations.columns[sItem].width
 				};
 				aColumnWidth.push(oColumnWidth);
 			});
@@ -35,9 +38,37 @@ sap.ui.define([
 		return this.getAdaptationControl().getCurrentState().xConfig;
 	};
 
+	ColumnWidthController.prototype.getStateKey = function() {
+		return "supplementaryConfig";
+	};
+
+	ColumnWidthController.prototype.changesToState = function(aChanges) {
+
+        var oState;
+		var oControl = aChanges.length && aChanges[0].selectorElement;
+
+        aChanges.forEach(function(oChange){
+			var oChangeContent = merge({}, oChange.changeSpecificData.content);
+			var oXSettings = {
+				name: oChangeContent.name,
+				controlMeta: {
+					aggregation: "columns",
+					property: "width"
+				},
+				value: oChangeContent.value
+			};
+
+			oState = xConfigAPI.createConfigObject(oControl, oXSettings, oState);
+
+        });
+
+        return oState || {};
+    };
+
 	ColumnWidthController.prototype.getDelta = function(mPropertyBag) {
 		mPropertyBag.deltaAttribute = "width";
 		mPropertyBag.operation = "setColumnWidth";
+		mPropertyBag.changedState = mPropertyBag.changedState instanceof Array ? mPropertyBag.changedState : this.sanityCheck(mPropertyBag.changedState);
 		mPropertyBag.existingState = this.sanityCheck(mPropertyBag.existingState);
 		return FlexUtil.getPropertySetterChanges(mPropertyBag);
 	};

package/src/sap/ui/mdc/p13n/subcontroller/FilterController.js

@@ -5,8 +5,8 @@
  */
 
 sap.ui.define([
-	'sap/ui/mdc/condition/FilterOperatorUtil', './BaseController', 'sap/ui/mdc/p13n/P13nBuilder', 'sap/ui/mdc/p13n/FlexUtil', 'sap/base/Log'
-], function (FilterOperatorUtil, BaseController, P13nBuilder, FlexUtil, Log) {
+	'sap/ui/mdc/condition/FilterOperatorUtil', './BaseController', 'sap/ui/mdc/p13n/P13nBuilder', 'sap/ui/mdc/p13n/FlexUtil', 'sap/base/Log', 'sap/base/util/merge'
+], function (FilterOperatorUtil, BaseController, P13nBuilder, FlexUtil, Log, merge) {
 	"use strict";
 
     var FilterController = BaseController.extend("sap.ui.mdc.p13n.subcontroller.FilterController", {
@@ -16,9 +16,8 @@ sap.ui.define([
 		}
     });
 
-    FilterController.prototype.getCurrentState = function() {
-        var oControlState = this.getAdaptationControl().getCurrentState();
-        return oControlState.hasOwnProperty("filter") ? oControlState.filter : {};
+    FilterController.prototype.getStateKey = function() {
+        return "filter";
     };
 
     FilterController.prototype.getUISettings = function() {
@@ -96,11 +95,15 @@ sap.ui.define([
         }
     };
 
+    FilterController.prototype._getPresenceAttribute = function(bexternalAppliance){
+        return "isFiltered";
+    };
+
     FilterController.prototype.getAdaptationUI = function (oPropertyHelper, oWrapper) {
         var oAdaptationModel = this._getP13nModel(oPropertyHelper);
 
         return this.getAdaptationControl().retrieveInbuiltFilter().then(function(oAdaptationFilterBar){
-            oAdaptationFilterBar.setP13nModel(oAdaptationModel);
+            oAdaptationFilterBar.setP13nData(oAdaptationModel.oData);
             oAdaptationFilterBar.setLiveMode(false);
             this._oAdaptationFB = oAdaptationFilterBar;
             return oAdaptationFilterBar.createFilterFields().then(function(){
@@ -111,18 +114,24 @@ sap.ui.define([
 
     FilterController.prototype.update = function(){
         BaseController.prototype.update.apply(this, arguments);
-        this.getAdaptationControl().getInbuiltFilter().createFilterFields();
+        var oAdaptationControl = this.getAdaptationControl();
+        var oInbuiltFilter = oAdaptationControl && oAdaptationControl.getInbuiltFilter();
+
+        if (oInbuiltFilter) {
+            oInbuiltFilter.createFilterFields();
+        }
     };
 
     FilterController.prototype.getDelta = function(mPropertyBag) {
+        mPropertyBag.applyAbsolute = true; //Note: currently the filter appliance is always handled as Snapshot, also via StateUtil!
         return FlexUtil.getConditionDeltaChanges(mPropertyBag);
     };
 
     FilterController.prototype.model2State = function() {
         var oItems = {},
             oFilter = this.getCurrentState();
-        this._oAdaptationModel.getProperty("/items").forEach(function(oItem) {
-            if (oItem.isFiltered && Object.keys(oFilter).includes(oItem.name)) {
+            this._oAdaptationModel.getProperty("/items").forEach(function(oItem) {
+            if (oItem.active && Object.keys(oFilter).includes(oItem.name)) {
                 oItems[oItem.name] = oFilter[oItem.name];
             }
         });
@@ -139,7 +148,7 @@ sap.ui.define([
             var sName = oProperty.name;
 
             var aExistingFilters = mExistingFilters[sName];
-            mItem.isFiltered = aExistingFilters && aExistingFilters.length > 0 ? true : false;
+            mItem.active = aExistingFilters && aExistingFilters.length > 0 ? true : false;
 
             return !(oProperty.filterable === false);
         });
@@ -152,6 +161,19 @@ sap.ui.define([
         return oP13nData;
     };
 
+    FilterController.prototype.changesToState = function(aChanges, mOld, mNew) {
+
+        var mStateDiff = {};
+
+        aChanges.forEach(function(oChange){
+            var oDiffContent = merge({}, oChange.changeSpecificData.content);
+            var sName = oDiffContent.name;
+            mStateDiff[sName] = mNew[sName];
+        });
+
+        return mStateDiff;
+    };
+
 	return FilterController;
 
 });

package/src/sap/ui/mdc/p13n/subcontroller/GroupController.js

@@ -10,8 +10,8 @@ sap.ui.define([
 
     var GroupController = BaseController.extend("sap.ui.mdc.p13n.subcontroller.GroupController");
 
-    GroupController.prototype.getCurrentState = function () {
-        return this.getAdaptationControl().getCurrentState().groupLevels;
+    GroupController.prototype.getStateKey = function () {
+        return "groupLevels";
     };
 
     GroupController.prototype.getUISettings = function () {
@@ -28,8 +28,15 @@ sap.ui.define([
     GroupController.prototype.getAdaptationUI = function(oPropertyHelper){
         var oGroupPanel = new GroupPanel();
         var oAdaptationData = this.mixInfoAndState(oPropertyHelper);
+		var oAdaptationControl = this.getAdaptationControl();
+
+		if (oAdaptationControl.isA("sap.ui.mdc.Table") && oAdaptationControl._getStringType() === "ResponsiveTable") {
+			oGroupPanel.setQueryLimit(1);
+		}
+
         oGroupPanel.setP13nData(oAdaptationData.items);
         this._oPanel = oGroupPanel;
+
         return Promise.resolve(oGroupPanel);
     };
 

package/src/sap/ui/mdc/p13n/subcontroller/LinkPanelController.js

@@ -40,6 +40,7 @@ sap.ui.define([
 
     LinkPanelController.prototype.getAdaptationUI = function(oPropertyHelper) {
         var oSelectionPanel = new SelectionPanel({
+            showHeader: true,
             fieldColumn: oResourceBundle.getText("info.SELECTION_DIALOG_COLUMNHEADER_WITHOUT_COUNT"),
             enableCount: true,
             linkPressed: this._onLinkPressed.bind(this)

package/src/sap/ui/mdc/p13n/subcontroller/SortController.js

@@ -5,8 +5,8 @@
  */
 
 sap.ui.define([
-	'./BaseController', 'sap/ui/mdc/p13n/P13nBuilder', 'sap/ui/mdc/p13n/panels/SortPanel', 'sap/m/p13n/SortPanel'
-], function (BaseController, P13nBuilder, SortPanelOld, SortPanel) {
+	'./BaseController', 'sap/ui/mdc/p13n/P13nBuilder', 'sap/m/p13n/SortPanel'
+], function (BaseController, P13nBuilder, SortPanel) {
 	"use strict";
 
     var SortController = BaseController.extend("sap.ui.mdc.p13n.subcontroller.SortController", {
@@ -16,8 +16,8 @@ sap.ui.define([
 		}
     });
 
-    SortController.prototype.getCurrentState = function() {
-        return this.getAdaptationControl().getCurrentState().sorters;
+    SortController.prototype.getStateKey = function() {
+        return "sorters";
     };
 
     SortController.prototype.getUISettings = function() {