@openui5/sap.ui.mdc 1.97.1 → 1.100.0

package/src/sap/ui/mdc/p13n/modification/ModificationHandler.js

@@ -123,7 +123,10 @@ sap.ui.define([
 			.then(function(oRetrievedXConfig) {
 				oXConfig = oRetrievedXConfig;
 				if (oXConfig) {
-					return oModifier.getProperty(oXConfig, "value");
+					return oModifier.getProperty(oXConfig, "value")
+					.then(function(sConfig){
+						return merge({}, JSON.parse(sConfig.replace(/\\/g, '')));
+					});
 				}
 				return {
 					aggregations: {}
@@ -160,16 +163,20 @@ sap.ui.define([
 
 				var oAppComponent = mPropertyBag ? mPropertyBag.appComponent : undefined;
 
-				if (!oControl._bHasXConfig) {
-					oControl._bHasXConfig = true;
-					return oModifier.createAndAddCustomData(oControl, "xConfig", oConfig, oAppComponent)
-					.then(function() {
-						return oConfig;
+				var pDelete = Promise.resolve();
+				if (oXConfig && oControl.isA) {
+					pDelete = oModifier.removeAggregation(oControl, "customData", oXConfig)
+					.then(function(){
+						return oModifier.destroy(oXConfig);
 					});
-				} else {
-					oModifier.setProperty(oXConfig, "value", oConfig);
-					return oConfig;
 				}
+
+				return pDelete.then(function(){
+					return oModifier.createAndAddCustomData(oControl, "xConfig", JSON.stringify(oConfig), oAppComponent)
+					.then(function(){
+						return merge({}, oConfig);
+					});
+				});
 			});
 	};
 
@@ -200,8 +207,8 @@ sap.ui.define([
 				.then(function(oAggregationConfig) {
 					if (oAggregationConfig) {
 						return oModifier.getProperty(oAggregationConfig, "value")
-							.then(function(oValue) {
-								return merge({}, oValue);
+							.then(function(sValue) {
+								return merge({}, JSON.parse(sValue.replace(/\\/g, '')));
 							});
 					}
 					return null;
@@ -243,7 +250,7 @@ sap.ui.define([
 		oAggregationConfig = fnGetAggregationSync(oControl, "customData").find(function(oCustomData){
 			return fnGetPropertySync(oCustomData, "key") == "xConfig";
 		});
-		oConfig = oAggregationConfig ? merge({}, fnGetPropertySync(oAggregationConfig, "value")) : null;
+		oConfig = oAggregationConfig ? merge({}, JSON.parse(fnGetPropertySync(oAggregationConfig, "value").replace(/\\/g, ''))) : null;
 		return oConfig;
 	};
 

package/src/sap/ui/mdc/p13n/modules/DefaultProviderRegistry.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc

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

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-    "./ListView",
+    "sap/m/p13n/SelectionPanel",
     "sap/ui/model/Sorter"
-], function(ListView, Sorter) {
+], function(SelectionPanel, Sorter) {
 	"use strict";
 
     /**
@@ -15,7 +15,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
-	 * @extends sap.ui.mdc.p13n.panels.ListView
+	 * @extends sap.m.p13n.SelectionPanel
 	 * @author SAP SE
 	 * @constructor The ActionToolbarPanel is a list based view to personalize selection and ordering of a Control aggregation.
 	 * @private
@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @alias sap.ui.mdc.p13n.panels.ActionToolbarPanel
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
-	var ActionToolbarPanel = ListView.extend("sap.ui.mdc.p13n.panels.ActionToolbarPanel", {
+	var ActionToolbarPanel = SelectionPanel.extend("sap.ui.mdc.p13n.panels.ActionToolbarPanel", {
 		metadata: {
             library: "sap.ui.mdc"
         },
@@ -34,7 +34,7 @@ sap.ui.define([
     });
 
     ActionToolbarPanel.prototype._bindListItems = function(mBindingInfo) {
-        var oTemplate = this.getTemplate();
+        var oTemplate = this.getAggregation("_template");
 		if (oTemplate) {
             var fnGetAlignment = function(oContext) {
                 return oContext.getProperty("alignment");
@@ -49,7 +49,7 @@ sap.ui.define([
                 sorter: oSorter,
 				key: "name",
 				templateShareable: false,
-				template: this.getTemplate().clone()
+				template: this.getAggregation("_template").clone()
 			}, mBindingInfo));
 		}
     };

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

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-    "sap/ui/mdc/ui/Container",
-    "sap/ui/mdc/ui/ContainerItem",
-    "./ListView",
+    "sap/m/p13n/AbstractContainer",
+    "sap/m/p13n/AbstractContainerItem",
+    "sap/m/p13n/SelectionPanel",
     "./GroupView",
     "sap/ui/model/Filter",
     "sap/m/Button",
@@ -18,9 +18,9 @@ sap.ui.define([
     "sap/m/SearchField",
     "sap/m/OverflowToolbarLayoutData",
     "sap/ui/core/Item",
-    "sap/base/util/UriParameters",
-    "sap/m/library"
-], function(Container, ContainerItem, ListView, GroupView, Filter, Button, Bar, ToolbarSpacer, Select, SegmentedButton, SegmentedButtonItem, SearchField, OverflowToolbarLayoutData, Item, SAPUriParameters, mLibrary) {
+    "sap/m/library",
+    "sap/ui/model/json/JSONModel"
+], function(AbstractContainer, AbstractContainerItem, SelectionPanel, GroupView, Filter, Button, Bar, ToolbarSpacer, Select, SegmentedButton, SegmentedButtonItem, SearchField, OverflowToolbarLayoutData, Item, mLibrary, JSONModel) {
     "use strict";
 
     // shortcut for sap.m.BarDesign
@@ -32,7 +32,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 AdaptFiltersPanel is meant to provide a container for different filter personalization views.
-	 * @extends sap.ui.mdc.ui.Container
+	 * @extends sap.m.p13n.AbstractContainer
 	 * @author SAP SE
 	 * @private
 	 * @experimental
@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @alias sap.ui.mdc.p13n.panels.AdaptFiltersPanel
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
-	var AdaptFiltersPanel = Container.extend("sap.ui.mdc.p13n.panels.AdaptFiltersPanel", {
+	var AdaptFiltersPanel = AbstractContainer.extend("sap.ui.mdc.p13n.panels.AdaptFiltersPanel", {
 		metadata: {
             library: "sap.ui.mdc",
             properties: {
@@ -70,17 +70,26 @@ sap.ui.define([
 
     AdaptFiltersPanel.prototype.applySettings = function(mSettings) {
 
-        this.addView(new ContainerItem({
+        this.addView(new AbstractContainerItem({
             key: this.LIST_KEY,
-            content: new ListView(this.getId() + "-listView")
+            content: new SelectionPanel(this.getId() + "-listView", {
+                activeColumn: this._getResourceText("p13nDialog.LIST_VIEW_ACTIVE"),
+                change: function(oEvt) {
+                    this.getP13nModel().setProperty("/items", oEvt.getSource().getP13nData());
+                }.bind(this)
+            })
         }));
 
-        this.addView(new ContainerItem({
+        this.addView(new AbstractContainerItem({
             key: this.GROUP_KEY,
-            content: new GroupView(this.getId() + "-groupView", {})
+            content: new GroupView(this.getId() + "-groupView", {
+                change: function(oEvt) {
+                    this.getP13nModel().setProperty("/itemsGrouped", oEvt.getSource().getP13nData());
+                }.bind(this)
+            })
         }));
 
-        Container.prototype.applySettings.apply(this, arguments);
+        AbstractContainer.prototype.applySettings.apply(this, arguments);
 
         this.getView(this.LIST_KEY).getContent().setEnableReorder(this.getEnableReorder());
 
@@ -142,7 +151,7 @@ sap.ui.define([
 
         var sSwitchId = sKey;
 
-        Container.prototype.switchView.call(this, sSwitchId);
+        AbstractContainer.prototype.switchView.call(this, sSwitchId);
 
         //Only allow show/hide non custom view
         this._getShowHideBtn().setVisible(!this._isCustomView());
@@ -151,7 +160,7 @@ sap.ui.define([
 
         //Factory logic should only be executed for non custom panels
         if (!this._isCustomView(sKey)){
-            this.showFactory(this.getCurrentViewContent().getShowFactory());
+            this.showFactory(this.getCurrentViewContent()._getShowFactory());
         }
 
         //execute filtering
@@ -217,7 +226,7 @@ sap.ui.define([
             }.bind(this));
         }
 
-		this.addView(new ContainerItem({
+		this.addView(new AbstractContainerItem({
             key: sKey,
             content: oContent.addStyleClass("sapUiMDCPanelPadding")
         }));
@@ -261,13 +270,21 @@ sap.ui.define([
      */
     AdaptFiltersPanel.prototype.setP13nModel = function(oModel) {
         this.setModel(oModel, this.P13N_MODEL);
-		this.getViews().forEach(function(oContainerItem){
-            var oP13nPanel = oContainerItem.getContent();
-			oP13nPanel.setP13nModel(oModel);
-		});
+        this.getView(this.LIST_KEY).getContent().setP13nData(oModel.getProperty("/items"));
+        this.getView(this.GROUP_KEY).getContent().setP13nData(oModel.getProperty("/itemsGrouped"));
         this._filterByModeAndSearch();
     };
 
+    AdaptFiltersPanel.prototype.setP13nData = function(oP13nData) {
+        var oP13nModel = this.getP13nModel();
+        if (!oP13nModel) {
+            this.setP13nModel(new JSONModel(oP13nData));
+        } else {
+            this.getView(this.LIST_KEY).getContent().setP13nData(oP13nModel.getProperty("/items"));
+            this.getView(this.GROUP_KEY).getContent().setP13nData(oP13nModel.getProperty("/itemsGrouped"));
+        }
+    };
+
     /**
      * Restores the default ui state of the <code>AdaptFiltersPanel</code>.
      */
@@ -295,7 +312,7 @@ sap.ui.define([
         if (!this._oShowHideBtn) {
             this._oShowHideBtn = new Button({
                 press: function(oEvt) {
-                    this.showFactory(!this.getCurrentViewContent().getShowFactory());
+                    this.showFactory(!this.getCurrentViewContent()._getShowFactory());
                     var oBtn = oEvt.oSource;
                     var sNewText = oBtn.getText() === sShowText ? sHideText : sShowText;
                     oBtn.setText(sNewText);
@@ -303,7 +320,7 @@ sap.ui.define([
             });
         }
 
-        this._oShowHideBtn.setText(!this._isCustomView() && this.getCurrentViewContent().getShowFactory() ? sHideText : sShowText);
+        this._oShowHideBtn.setText(!this._isCustomView() && this.getCurrentViewContent()._getShowFactory() ? sHideText : sShowText);
         return this._oShowHideBtn;
     };
 
@@ -381,7 +398,7 @@ sap.ui.define([
                 ],
                 selectionChange: function(oEvt) {
                     if (this.getCurrentViewKey() === this.LIST_KEY) {
-                        this.getCurrentViewContent().removeMoveButtons();
+                        this.getCurrentViewContent()._removeMoveButtons();
                     }
                     var sKey = oEvt.getParameter("item").getKey();
                     this.switchView(sKey);
@@ -410,11 +427,16 @@ sap.ui.define([
         //Update value - necessary due to view switch
         this._getSearchField().setValue(this._sSearchString);
 
-        this.getCurrentViewContent().filterWithoutDestroy(aFilters);
+        this.getCurrentViewContent().filterContent(aFilters);
 
         return aFilters;
     };
 
+
+    AdaptFiltersPanel.prototype._getResourceText = function(sKey) {
+        return sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc").getText(sKey);
+    };
+
     //TODO: Renable with refactoring
     /*
     function matchTermToSearchRegex(term){
@@ -446,14 +468,14 @@ sap.ui.define([
                 vFilterMode = new Filter("visible", "EQ", true);
                 break;
             case "active":
-                vFilterMode = new Filter("isFiltered", "EQ", true);
+                vFilterMode = new Filter("active", "EQ", true);
                 break;
             case "mandatory":
                 vFilterMode = new Filter("required", "EQ", true);
                 break;
             case "visibleactive":
                 vFilterMode = new Filter([
-                    new Filter("isFiltered", "EQ", true),
+                    new Filter("active", "EQ", true),
                     new Filter("visible", "EQ", true)
                 ], true);
                 break;
@@ -467,7 +489,7 @@ sap.ui.define([
     };
 
     AdaptFiltersPanel.prototype.exit = function() {
-        Container.prototype.exit.apply(this, arguments);
+        AbstractContainer.prototype.exit.apply(this, arguments);
         this._sModeKey = null;
         this._sSearchString = null;
     };