@openui5/sap.ui.mdc 1.98.0 → 1.101.0

package/src/sap/ui/mdc/p13n/panels/GroupView.js

@@ -4,7 +4,7 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-    "./BasePanel",
+    "sap/m/p13n/BasePanel",
 	"sap/m/Label",
 	"sap/base/util/deepEqual",
 	"sap/m/CustomListItem",
@@ -15,8 +15,9 @@ sap.ui.define([
 	"sap/ui/core/Icon",
 	"sap/ui/core/library",
 	"sap/m/HBox",
-	"sap/m/library"
-], function(BasePanel, Label, deepEqual, CustomListItem, List, Panel, Toolbar,Text, Icon, coreLibrary, HBox, mLibrary) {
+	"sap/m/library",
+	"sap/base/util/merge"
+], function(BasePanel, Label, deepEqual, CustomListItem, List, Panel, Toolbar,Text, Icon, coreLibrary, HBox, mLibrary, merge) {
 	"use strict";
 
 
@@ -35,7 +36,7 @@ sap.ui.define([
 	 * @param {string} [sId] ID for the new control, generated automatically if no ID is given
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class The GroupView is a list based view to personalize selection and filter values of a Control that allows certain filter capabilities.
-	 * @extends sap.ui.mdc.p13n.panels.BasePanel
+	 * @extends sap.m.p13n.BasePanel
 	 * @author SAP SE
 	 * @private
 	 * @experimental
@@ -45,7 +46,12 @@ sap.ui.define([
 	 */
 	var GroupView = BasePanel.extend("sap.ui.mdc.p13n.panels.GroupView", {
 		metadata: {
-			library: "sap.ui.mdc"
+			library: "sap.ui.mdc",
+			properties: {
+				itemFactory: {
+					type: "function"
+				}
+			}
 		},
 		renderer: {
 			apiVersion: 2
@@ -64,8 +70,8 @@ sap.ui.define([
 				//Do not read the whole content
 				//Announce tet 'Filter Group' + <grouplabel>, e.g. "Filter Group Basic"
 				formatter: function(sGroupLabel) {
-					return this.getResourceText("p13nDialog.FILTER_GROUP_DESCRIPTION", sGroupLabel);
-				}.bind(this)
+					return sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc").getText("p13nDialog.FILTER_GROUP_DESCRIPTION", sGroupLabel);
+				}
 			},
 			content: [
 				this._createGroupPanelTemplate()
@@ -77,11 +83,12 @@ sap.ui.define([
 
 		this._aInitializedLists = [];
 
-		this.setTemplate(oGroupPanelTemplate);
+		this._setTemplate(oGroupPanelTemplate);
+		oGroupPanelTemplate.setType("Inactive");
 		this._setMoveButtonVisibility(true);
 	};
 
-	GroupView.prototype.getShowFactory = function() {
+	GroupView.prototype._getShowFactory = function() {
 		return this._bShowFactory;
 	};
 
@@ -116,9 +123,9 @@ sap.ui.define([
 				var oSource = oEvt.getSource();
 				var oInnerList = oSource.getContent()[0];
 				this._addInitializedList(oInnerList);
-				if (this.getShowFactory()){
+				if (this._getShowFactory()){
 					this._addFactoryControl(oInnerList);
-					this.filterWithoutDestroy(this._aCurrentFilters);// --> check if there is already an existing Filter
+					this.filterContent(this._aCurrentFilters);// --> check if there is already an existing Filter
 				}
 
 			}.bind(this),
@@ -144,16 +151,18 @@ sap.ui.define([
 	GroupView.prototype._createGroupListTemplate = function() {
 		var oList = new List({
 			keyboardMode: ListKeyboardMode.Navigation,
-			selectionChange: function(oBindingInfo) {
-				var sPath = oBindingInfo.getParameter("listItem").getBindingContext(this.P13N_MODEL).sPath;
-				var oItem = this.getP13nModel().getProperty(sPath);
+			selectionChange: function(oEvent) {
+				var sPath = oEvent.getParameter("listItem").getBindingContext(this.P13N_MODEL).sPath;
+				var oItem = this._getP13nModel().getProperty(sPath);
 				var oP13nModel = this.getModel(this.P13N_MODEL);
 				//TODO: remove 'selected' condition enhance
 				if (oP13nModel && oItem) {
 					oP13nModel.setProperty(sPath + "/selected", oItem.visible);
 				}
+				var sSpecialChangeReason = this._checkSpecialChangeReason(oEvent.getParameter("selectAll"), oEvent.getParameter("listItems"));
+
 				this.fireChange({
-					reason: oItem.visible ? "Add" : "Remove",
+					reason: sSpecialChangeReason || (oItem.visible ? this.CHANGE_REASON_ADD : this.CHANGE_REASON_REMOVE),
 					item: oItem
 				});
 			}.bind(this),
@@ -245,7 +254,7 @@ sap.ui.define([
 					size: "0.5rem",
 					color: IconColor.Neutral,
 					visible: {
-						path: this.P13N_MODEL + ">isFiltered",
+						path: this.P13N_MODEL + ">active",
 						formatter: function(bIsFiltered) {
 							if (bIsFiltered){
 								return true;
@@ -273,7 +282,7 @@ sap.ui.define([
 		oList.getItems().forEach(function(oItem){
 
 			var sPath = oItem.getBindingContextPath();
-			var sKey = this.getP13nModel().getProperty(sPath).name;
+			var sKey = this._getP13nModel().getProperty(sPath).name;
 
 			fnItemCallback.call(this, oItem, sKey);
 		}.bind(this));
@@ -332,7 +341,7 @@ sap.ui.define([
 		return aSelectedItems;
 	};
 
-	GroupView.prototype.filterWithoutDestroy = function(aFilter) {
+	GroupView.prototype.filterContent = function(aFilter) {
 		if (!this._bInitialized || deepEqual(aFilter, this._aCurrentFilters)) {
 			return;
 		}
@@ -348,7 +357,7 @@ sap.ui.define([
 				this._togglePanelVisibility(oPanel);
 			}
 
-			if (this.getShowFactory() && aInitializedGroups.indexOf(oInnerList.getId()) > -1) {
+			if (this._getShowFactory() && aInitializedGroups.indexOf(oInnerList.getId()) > -1) {
 				this._addFactoryControl(oInnerList);
 			}
 		}.bind(this));
@@ -382,7 +391,7 @@ sap.ui.define([
 		this._oListControl.getItems().forEach(function(oOuterItem){
 			var oPanel = oOuterItem.getContent()[0];
 			var sBindingPath = oPanel.getBindingContext(this.P13N_MODEL).sPath;
-			var oItem = this.getP13nModel().getProperty(sBindingPath);
+			var oItem = this._getP13nModel().getProperty(sBindingPath);
 			if (oItem.group === sGroup) {
 				oPanel.setExpanded(bExpand);
 			}
@@ -396,14 +405,18 @@ sap.ui.define([
 		if (oContext){
 			var sPanelBindingContextPath = oContext.sPath;
 
-			var oItem = this.getP13nModel().getProperty(sPanelBindingContextPath);
+			var oItem = this._getP13nModel().getProperty(sPanelBindingContextPath);
 			oItem.groupVisible = oInnerList.getVisibleItems().length < 1 ? false : true;
 
-			this.getP13nModel().setProperty(sPanelBindingContextPath, oItem);
+			this._getP13nModel().setProperty(sPanelBindingContextPath, oItem);
 		}
 
 	};
 
+	GroupView.prototype.getItems = function() {
+		return this._oListControl.getItems();
+	};
+
 	GroupView.prototype._checkFirstGroup = function() {
 
 		//One time operation for the first panel in the group view
@@ -429,32 +442,44 @@ sap.ui.define([
 
 		this._oListControl.getInfoToolbar().addContent(new Text({
 			width: "75%",
-			text: this.getResourceText("p13nDialog.LIST_VIEW_COLUMN")
+			text: sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc").getText("p13nDialog.LIST_VIEW_COLUMN")
 		}).addStyleClass("firstColumnPadding"));
 
 		if (!this._bShowFactory) {
 			this._oListControl.getInfoToolbar().addContent(new Text({
 				textAlign: "Center",
 				width: "25%",
-				text: this.getResourceText("p13nDialog.LIST_VIEW_ACTIVE")
+				text: sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc").getText("p13nDialog.LIST_VIEW_ACTIVE")
 			}).addStyleClass("firstColumnPadding"));
 		}
 
     };
 
-	GroupView.prototype.setP13nModel = function(oModel) {
-		this.setModel(oModel, this.P13N_MODEL);
-		this._bindListItems();
+	GroupView.prototype.setP13nData = function(aP13nData) {
+		this._getP13nModel().setProperty("/itemsGrouped", aP13nData);
+		if (!this._bInitialized) {
+			this._bindListItems();
+		}
 		this._checkFirstGroup();
 		this._checkAllPanels();
 	};
 
+	GroupView.prototype.getP13nData = function (bOnlyActive) {
+		var aItems = this._getP13nModel().getProperty("/itemsGrouped");
+		if (bOnlyActive) {
+			aItems = aItems.filter(function(oItem){
+				return oItem[this.PRESENCE_ATTRIBUTE];
+			}.bind(this));
+		}
+		return aItems;
+	};
+
     GroupView.prototype._bindListItems = function () {
         this._oListControl.bindItems(Object.assign({
 			path: this.P13N_MODEL + ">/itemsGrouped",
 			templateShareable: false,
 			key: "group",
-			template: this.getTemplate().clone()
+			template: this.getAggregation("_template").clone()
 		}));
 	};
 

package/src/sap/ui/mdc/p13n/panels/LinkSelectionPanel.js

@@ -7,14 +7,15 @@
 sap.ui.define([
     "sap/m/p13n/SelectionPanel",
     "sap/m/ColumnListItem",
-	"sap/m/HBox",
-	"sap/m/VBox",
+    "sap/m/HBox",
+    "sap/m/VBox",
     "sap/m/Link",
     "sap/m/Text",
     "sap/ui/core/Icon",
     "sap/m/library",
-    "sap/m/MessageBox"
-], function (SelectionPanel, ColumnListItem, HBox, VBox, Link, Text, Icon, mLibrary, MessageBox) {
+    "sap/m/OverflowToolbar",
+    "sap/ui/model/Filter"
+], function (SelectionPanel, ColumnListItem, HBox, VBox, Link, Text, Icon, mLibrary, OverflowToolbar, Filter) {
     "use strict";
 
     // shortcut for sap.m.ListType
@@ -40,25 +41,49 @@ sap.ui.define([
 			selected: "{" + this.P13N_MODEL + ">" + this.PRESENCE_ATTRIBUTE + "}",
 			type: ListType.Active,
 			cells: [
-				new VBox({
-					items: [
-						new Link({
-							tooltip: "{" + this.P13N_MODEL + ">tooltip}",
-							text: "{" + this.P13N_MODEL + ">text}",
-                            href: "{" + this.P13N_MODEL + ">href}",
-                            target: "{" + this.P13N_MODEL + ">target}",
-                            press: this._onLinkPressed.bind(this)
-						}),
-                        new Text({
-                            text: "{" + this.P13N_MODEL + ">description}",
-                            visible: "{= ${" + this.P13N_MODEL + ">description} ? true:false}"
+                new HBox({
+                    items: [
+                        new VBox({
+                            items: [
+                                new Link({
+                                    tooltip: "{" + this.P13N_MODEL + ">tooltip}",
+                                    text: "{" + this.P13N_MODEL + ">text}",
+                                    href: "{" + this.P13N_MODEL + ">href}",
+                                    target: "{" + this.P13N_MODEL + ">target}",
+                                    press: this._onLinkPressed.bind(this)
+                                }),
+                                new Text({
+                                    text: "{" + this.P13N_MODEL + ">description}",
+                                    visible: "{= ${" + this.P13N_MODEL + ">description} ? true:false}"
+                                })
+                            ]
                         })
-					]
-				})
+                    ]
+                })
 			]
 		});
 	};
 
+    LinkSelectionPanel.prototype.setShowHeader = function(bShowHeader) {
+		if (bShowHeader){
+			this._oListControl.setHeaderToolbar(new OverflowToolbar({
+				content: [
+					this._getSearchField()
+				]
+			}));
+		}
+		this.setProperty("showHeader", bShowHeader);
+		return this;
+	};
+
+    LinkSelectionPanel.prototype._getSearchField = function() {
+		var oSearchField = SelectionPanel.prototype._getSearchField.apply(this, arguments);
+
+		oSearchField.getLayoutData().setMaxWidth(undefined);
+
+		return oSearchField;
+	};
+
     LinkSelectionPanel.prototype._onLinkPressed = function(oEvent) {
         this.fireLinkPressed(oEvent);
     };
@@ -67,6 +92,17 @@ sap.ui.define([
         this._oListControl.setMultiSelectMode(sMultiSelectMode);
     };
 
+    LinkSelectionPanel.prototype._filterList = function(bShowSelected, sSarch) {
+		var oSearchFilter = [], oSelectedFilter = [];
+		if (bShowSelected) {
+			oSelectedFilter = new Filter(this.PRESENCE_ATTRIBUTE, "EQ", true);
+		}
+		if (sSarch) {
+			oSearchFilter = new Filter("text", "Contains", sSarch);
+		}
+		this._oListControl.getBinding("items").filter(new Filter([].concat(oSelectedFilter, oSearchFilter), true));
+	};
+
     return LinkSelectionPanel;
 
 });

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

@@ -27,14 +27,11 @@ sap.ui.define([
             showHeader: true
         });
         oSelectionPanel.setEnableReorder(false);
-        oSelectionPanel.setPanelColumns([oResourceBundle.getText("actiontoolbar.RTA_COLUMN_HEADER"), new Column({
-            width: "25%",
-            hAlign: "Center",
-            vAlign: "Middle"
-        })]);
-        var oAdaptationModel = this._getP13nModel(oPropertyHelper);
-        oSelectionPanel.setP13nModel(oAdaptationModel);
+        oSelectionPanel.setFieldColumn(oResourceBundle.getText("actiontoolbar.RTA_COLUMN_HEADER"));
 
+        var oAdaptationData = this.mixInfoAndState(oPropertyHelper);
+        oSelectionPanel.setP13nData(oAdaptationData.items);
+        this._oPanel = oSelectionPanel;
         return Promise.resolve(oSelectionPanel);
     };
 

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

@@ -53,7 +53,7 @@ sap.ui.define([
 
         return this.getAdaptationControl().retrieveInbuiltFilter().then(function(oAdaptationFilterBar){
             var oAdaptationModel = this._getP13nModel(oPropertyHelper);
-            oAdaptationFilterBar.setP13nModel(oAdaptationModel);
+            oAdaptationFilterBar.setP13nData(oAdaptationModel.oData);
             oAdaptationFilterBar.setLiveMode(false);
             return oAdaptationFilterBar.createFilterFields().then(function(){
                 return oAdaptationFilterBar;
@@ -79,7 +79,6 @@ sap.ui.define([
             var aExistingFilters = mExistingFilters[oProperty.name];
             oItem.visible = oExistingProperty ? true : false;
             oItem.visibleInDialog = true;
-            oItem.selected = oItem.visible;
             oItem.position = oExistingProperty ? oExistingProperty.position : -1;
             oItem.isFiltered = aExistingFilters && aExistingFilters.length > 0 ? true : false;
             oItem.required = oProperty.required;

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

@@ -10,8 +10,8 @@ sap.ui.define([
 
     var AggregateController = BaseController.extend("sap.ui.mdc.p13n.subcontroller.AggregateController");
 
-    AggregateController.prototype.getCurrentState = function () {
-        return this.getAdaptationControl().getCurrentState().aggregations;
+    AggregateController.prototype.getStateKey = function () {
+        return "aggregations";
     };
 
     AggregateController.prototype.sanityCheck = function(change) {

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

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -128,9 +128,13 @@ sap.ui.define([
     };
 
     BaseController.prototype.getCurrentState = function(){
-        return this._oAdaptationControl.getCurrentState().items;
+        return this._oAdaptationControl.getCurrentState()[this.getStateKey()];
     };
 
+	BaseController.prototype.getStateKey = function(){
+		return "items";
+	};
+
     BaseController.prototype.getDelta = function(mPropertyBag) {
         var sPresenceAttribute = this._getPresenceAttribute(mPropertyBag.externalAppliance);
         var aNewStatePrepared;
@@ -395,6 +399,30 @@ sap.ui.define([
         return this._oAdaptationModel;
     };
 
+    BaseController.prototype.changesToState = function(aChanges) {
+
+        var aState = [];
+
+        aChanges.forEach(function(oChange){
+            var oStateDiffContent = merge({}, oChange.changeSpecificData.content);
+            var iIndex = oStateDiffContent.index;
+            delete oStateDiffContent.index;
+
+            //set the position attribute in case to an explicit move
+            if (oChange.changeSpecificData.changeType === this.getChangeOperations()["move"]) {
+                oStateDiffContent.position = iIndex;
+            }
+
+            //set the presence attribute to false in case of an explicit remove
+            if (oChange.changeSpecificData.changeType === this.getChangeOperations()["remove"]) {
+                oStateDiffContent[this._getPresenceAttribute()] = false;
+            }
+
+            aState.push(oStateDiffContent);
+        }.bind(this));
+
+        return aState;
+    };
 
     BaseController.prototype.destroy = function() {
 		BaseObject.prototype.destroy.apply(this, arguments);

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

@@ -0,0 +1,46 @@
+/*
+ * ! OpenUI5
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	'./BaseController'
+], function (BaseController) {
+	"use strict";
+
+    var ChartTypeController = BaseController.extend("sap.ui.mdc.p13n.subcontroller.ChartTypeController", {
+        constructor: function() {
+			BaseController.apply(this, arguments);
+			this._bResetEnabled = true;
+		}
+    });
+
+    ChartTypeController.prototype.getCurrentState = function() {
+		return {properties: {chartType: this.getAdaptationControl().getChartType()}};
+	};
+
+    ChartTypeController.prototype.getStateKey = function() {
+		return "supplementaryConfig";
+	};
+
+    ChartTypeController.prototype.getDelta = function(mPropertyBag) {
+
+        var sType = mPropertyBag.changedState.type ? mPropertyBag.changedState.type : mPropertyBag.changedState.properties.chartType;
+
+        var oConditionChange = {
+            selectorElement: mPropertyBag.control,
+            changeSpecificData: {
+                changeType: "setChartType",
+                content: {
+                    chartType: sType
+                }
+            }
+        };
+
+        return [oConditionChange];
+	};
+
+	return ChartTypeController;
+
+});

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() {
@@ -28,9 +27,15 @@ sap.ui.define([
             afterClose: function(oEvt) {
                 var oDialog = oEvt.getSource();
                 if (oDialog) {
-                    oDialog.removeAllContent();
-                    oDialog.destroy();
+                    var oDialogContent = oDialog.getContent()[0];
+                    if (oDialogContent.isA("sap.m.p13n.Container")) {
+                        oDialogContent.removeView("Filter");
+                    } else {
+                        oDialog.removeAllContent();
+                    }
                 }
+
+                oDialog.destroy();
             }
         };
     };
@@ -90,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(){
@@ -105,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];
             }
         });
@@ -133,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);
         });
@@ -146,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;
 
 });