@openui5/sap.ui.mdc 1.99.0 → 1.100.1

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

@@ -0,0 +1,136 @@
+
+/*
+ * ! 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([
+    "sap/m/p13n/QueryPanel", "sap/m/VBox", "sap/m/Text", "sap/ui/layout/Grid", "sap/ui/layout/GridData", "sap/m/Button", "sap/m/ComboBox", 'sap/base/util/merge'
+
+], function (QueryPanel, VBox, Text, Grid, GridData, Button, ComboBox, merge) {
+    "use strict";
+
+    var FilterPanel = QueryPanel.extend("sap.ui.mdc.p13n.panels.FilterPanel", {
+        metadata: {
+            properties: {
+                itemFactory: {
+                    type: "function"
+                }
+            }
+        },
+        renderer: {}
+    });
+    FilterPanel.prototype.PRESENCE_ATTRIBUTE = "active";
+
+    FilterPanel.prototype._createQueryRowGrid = function(oItem) {
+        var oSelect = oItem.name ? new VBox({
+            items:[
+                new Text({
+                    text: oItem.label
+                }).addStyleClass("sapUiTinyMarginTop").addStyleClass("sapUiTinyMarginBegin")
+            ]
+        }) : this._createKeySelect(oItem.name);
+
+
+        var oAddButton;
+        if (!oItem.name) {
+            oAddButton = new Button({
+                text: "Add",
+                press: this._addPressed.bind(this),
+                enabled: false
+            });
+            oAddButton.setLayoutData(new GridData({
+                indent: "XL7 L7 M7 S7",
+                span: "XL1 L1 M1 S1"
+            }));
+        }
+
+        return new Grid({
+            containerQuery: true,
+            defaultSpan: "XL4 L4 M4 S4",
+            content: [
+                oSelect, oItem.name ? this._createFactoryControl(oItem) : oAddButton
+            ]
+        }).addStyleClass("sapUiTinyMargin");
+    };
+
+	FilterPanel.prototype._createKeySelect = function (sKey) {
+
+        var oKeySelect = new ComboBox({
+			width: "100%",
+			items: this._getAvailableItems(),
+			placeholder: "Select Filter",
+			selectionChange: this._selectKey.bind(this)
+		});
+
+        return oKeySelect;
+	};
+
+	FilterPanel.prototype._getAvailableItems = function (sKey) {
+        var aItems = QueryPanel.prototype._getAvailableItems.apply(this, arguments);
+        aItems.shift();
+        return aItems;
+	};
+
+    FilterPanel.prototype._createRemoveButton = function (bVisible) {
+        var oRemoveBtn = QueryPanel.prototype._createRemoveButton.apply(this, arguments);
+        oRemoveBtn.setLayoutData(new GridData({
+            span: "XL1 L1 M1 S1"
+        }));
+        return oRemoveBtn;
+    };
+
+    FilterPanel.prototype._addPressed = function(oEvt) {
+        this._selectKey();
+    };
+
+    FilterPanel.prototype._selectKey = function(oEvt) {
+        var oQueryRowGrid, sKey;
+        if (oEvt) {
+            this._oEvt = merge({}, oEvt);
+            oQueryRowGrid = oEvt.oSource.getParent();
+            sKey = oEvt.oSource.getSelectedKey();
+            oQueryRowGrid.getContent()[1].setEnabled(!!sKey);
+        } else if (this._oEvt) {
+            oEvt = this._oEvt;
+            oQueryRowGrid = oEvt.oSource.getParent();
+            sKey = oEvt.oSource.getSelectedKey();
+
+            if (sKey) {
+                QueryPanel.prototype._selectKey.call(this, oEvt);
+
+                var sText = sKey ? oEvt.getParameter("selectedItem").getText() : "";
+
+                var oSelect = oQueryRowGrid.getContent()[0];
+                oQueryRowGrid.removeContent(oSelect);
+                var oAddBtn = oQueryRowGrid.getContent()[0];
+                oQueryRowGrid.removeContent(oAddBtn);
+
+                // var sKey = oSelect._key;
+                var oFieldBox = new VBox({
+                    items:[
+                        new Text({
+                            text: sText
+                        }).addStyleClass("sapUiTinyMarginTop").addStyleClass("sapUiTinyMarginBegin")
+                    ]
+                });
+                oFieldBox._key = sKey;
+
+                oQueryRowGrid.insertContent(oFieldBox,0);
+                var oFilterField = this._createFactoryControl({name: sKey});
+                oQueryRowGrid.insertContent(oFilterField, 1);
+            }
+            delete this._oEvt;
+        }
+    };
+
+    FilterPanel.prototype._createFactoryControl = function(oItem) {
+        var oField = this.getItemFactory().call(this, oItem);
+        oField.setLayoutData(new GridData({
+            span: "XL7 L7 M7 S7"
+        }));
+        return oField;
+	};
+
+    return FilterPanel;
+});

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/BaseController.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.1
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc

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

@@ -96,11 +96,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(){
@@ -121,8 +125,8 @@ sap.ui.define([
     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 +143,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);
         });

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", {

package/src/sap/ui/mdc/table/CreationRow.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * {@link sap.ui.mdc.table.Column#getCreationTemplate creationTemplate} aggregation of the {@link sap.ui.mdc.table.Column}.
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.1
 	 * @constructor
 	 * @experimental
 	 * @private