@openui5/sap.ui.mdc 1.96.2 → 1.97.0

package/test/sap/ui/mdc/testutils/opa/p13n/Actions.js

@@ -456,7 +456,7 @@ sap.ui.define([
 
 	var iPersonalizeListViewItems = function(oP13nDialog, aItems) {
 		this.waitFor({
-			controlType: oP13nDialog.getContent()[0].getView("columns") ? "sap.ui.mdc.p13n.panels.ListView" : "sap.m.p13n.SelectionPanel",
+			controlType: oP13nDialog.getContent()[0].getView("columns") && oP13nDialog.getContent()[0].getView("columns").getContent().isA("sap.ui.mdc.p13n.panels.ListView") ? "sap.ui.mdc.p13n.panels.ListView" : "sap.m.p13n.SelectionPanel",
 			matchers: new Ancestor(oP13nDialog, false),
 			success: function(aListViews) {
 				var oListView = aListViews[0];
@@ -627,10 +627,14 @@ sap.ui.define([
 						this.waitFor({
 							controlType: "sap.ui.mdc.p13n.panels.ChartItemPanelNew",
 							matchers: new Ancestor(oP13nDialog, false),
-							success: function() {
-								// Setup chart type
+							success: function(aItemPanels) {
+								//This is done in 3 steps
+								//1. Remove current selection
+								//2. Add items in order
+								//3. Select correct roles
+
 								var aItemsToRemoveIds = [];
-								var aItemsAlreadyPresent = [];
+								var oItemPanel = aItemPanels[0];
 
 								this.waitFor({
 
@@ -639,125 +643,127 @@ sap.ui.define([
 										new Ancestor(oP13nDialog, false)
 									],
 									actions: function(oColumnListItem) {
-										this.waitFor({
-											controlType: "sap.m.ComboBox",
-											matchers: new Ancestor(oColumnListItem),
-											success: function(aComboBoxes) {
-												var oComboBox = aComboBoxes[0];
-												var oItem = aItems.find(function(oItem) {
-													return oComboBox.getSelectedKey() === oItem.key;
-												});
-												var bItemIsPresent = !!oItem;
-
-												//Remove if not selected
-												if (!bItemIsPresent) {
-
-													//Template has only one cell (no role & remove)
-													var  bTemplate = oColumnListItem.getCells().length === 1;
-
-													if (!bTemplate){
-														this.waitFor({
-															controlType: "sap.m.Button",
-															matchers: new Ancestor(oColumnListItem, false),
-															actions: function(oBtn) {
-																aItemsToRemoveIds.push(oBtn.getId());
-															}
-														});
-													}
-												} else {
-													aItemsAlreadyPresent.push(oComboBox.getSelectedKey());
-												}
-											}
-										});
-									}.bind(this),
-									success: function() {
-
-										aItemsToRemoveIds.forEach(function(oBtnId){
+										//Step 1.1: Find all remove buttons
+										var  bTemplate = oColumnListItem.getCells().length === 1;
 
+										if (!bTemplate){
 											this.waitFor({
-
 												controlType: "sap.m.Button",
 												matchers: [
-													new Ancestor(oP13nDialog, false),
+													new Ancestor(oColumnListItem),
 													new Properties({
-														id: oBtnId
+														icon: "sap-icon://decline"
 													})
 												],
 												success: function(aBtns) {
-													new Press().executeOn(aBtns[0]);
+													var oButton = aBtns[0];
+													aItemsToRemoveIds.push(oButton.getId());
 												}
 											});
+										}
+									}.bind(this),
+									success: function() {
 
-										}.bind(this));
+										var iClickOnChartP13nRemoveButton = function(sCurrentBtnId, oP13nDialog, aBtnIds, fnFollowUpFunction, aFollowUpParams){
+											this.waitFor({
+
+												controlType: "sap.m.Button",
+												id: sCurrentBtnId,
+												matchers: [
+													new Ancestor(oP13nDialog, false)
+												],
+												success: function(oBtn) {
+													new Press().executeOn(oBtn);
 
-										var aItemsToAdd = aItems.filter(function(oItem){return aItemsAlreadyPresent.indexOf(oItem.key) === -1;});
+													var iIdx = aBtnIds.indexOf(sCurrentBtnId);
 
-										aItemsToAdd.forEach(function(oItem) {
+													if (iIdx === aBtnIds.length - 1){
+														fnFollowUpFunction.apply(this, aFollowUpParams);
+													} else {
+														iClickOnChartP13nRemoveButton.call(this, aBtnIds[iIdx + 1], oP13nDialog, aBtnIds, fnFollowUpFunction, aFollowUpParams);
+													}
+												}
+											});
+										};
 
-											if (oItem.kind) {
+										var fnAddAllItems = function(oCurrentItem, aItems, fnFollowUp){
+											if (oCurrentItem.kind) {
 												this.waitFor({
 													controlType: "sap.m.ComboBox",
-													matchers: [
-														new Ancestor(oP13nDialog, false),
-														new Properties({
-															id: "p13nPanel-templateComboBox-" + oItem.kind
-														})
-													],
+													id: "p13nPanel-templateComboBox-" + oCurrentItem.kind,
+													matchers: new Ancestor(oP13nDialog, false),
 													actions: function(oComboBox) {
-														iChangeComboBoxSelection.call(this, oComboBox, oItem.key);
-													}.bind(this)
+														iChangeComboBoxSelection.call(this, oComboBox, oCurrentItem.key);
+													}.bind(this),
+													success: function(){
+														var iIdx = aItems.indexOf(oCurrentItem);
+
+														if (iIdx === aItems.length - 1){
+															fnFollowUp.call(this);
+														} else {
+															fnAddAllItems.call(this, aItems[iIdx + 1], aItems, fnFollowUp);
+														}
+													}
 												});
 											} else {
-												Log.error("P13nChartPersonalizationOPA: No kind field given for " + oItem.key + ". Ignoring the field!");
+												Log.error("P13nChartPersonalizationOPA: No kind field given for " + oCurrentItem.key + ". Ignoring the field!");
 											}
+										};
 
+										var fnAssignRoles = function(){
+											this.waitFor({
 
-										}.bind(this));
-
-										//Make sure every new item has the correct role
-										this.waitFor({
-
-											controlType: "sap.m.ColumnListItem",
-											matchers: [
-												new Ancestor(oP13nDialog, false)
-											],
-											actions: function(oColumnListItem) {
-												this.waitFor({
-													controlType: "sap.m.ComboBox",
-													matchers: new Ancestor(oColumnListItem),
-													success: function(aComboBoxes) {
-														var oComboBox = aComboBoxes[0];
-														var oItem = aItems.find(function(oItem) {
-															return oComboBox.getSelectedKey() === oItem.key;
-														});
-														var bItemIsPresent = !!oItem;
+												controlType: "sap.m.ColumnListItem",
+												matchers: [
+													new Ancestor(oP13nDialog, false)
+												],
+												actions: function(oColumnListItem) {
+													this.waitFor({
+														controlType: "sap.m.ComboBox",
+														matchers: new Ancestor(oColumnListItem),
+														success: function(aComboBoxes) {
+															var oComboBox = aComboBoxes[0];
+															var oItem = aItems.find(function(oItem) {
+																return oComboBox.getSelectedKey() === oItem.key;
+															});
+															var bItemIsPresent = !!oItem;
 
-														if (bItemIsPresent) {
+															if (bItemIsPresent) {
 
-															var bMobile = oColumnListItem.getTable().getParent().getParent()._bMobileMode;
-															if (bMobile && oColumnListItem.getCells()[0].getItems[1].getVisible() == false) {
-																return;
-															}
+																//Ignore templates / items with no role select (due to chart type)
+																var bMobile = oItemPanel._bMobileMode;
+																if (bMobile && oColumnListItem.getCells()[0].getItems[1].getVisible() == false) {
+																	return;
+																}
 
 															if (!bMobile && !oColumnListItem.getCells()[1].getVisible()) {
-																return;
+																	return;
+																}
+
+																//Select correct role if selected
+																this.waitFor({
+																	controlType: "sap.m.Select",
+																	matchers: new Ancestor(oColumnListItem),
+																	actions: function(oSelect) {
+																		iChangeSelectSelection.call(this, oSelect, oItem.role);
+																	}.bind(this)
+																});
 															}
+														}.bind(this)
+													});
+												}.bind(this),
+												success: function() {
+													iPressTheOKButtonOnTheDialog.call(this, oP13nDialog);
+												}
+											});
+										};
 
-															//Select correct role if selected
-															this.waitFor({
-																controlType: "sap.m.Select",
-																matchers: new Ancestor(oColumnListItem),
-																actions: function(oSelect) {
-																	iChangeSelectSelection.call(this, oSelect, oItem.role);
-																}.bind(this)
-															});
-														}
-													}.bind(this)
-												});
-											}.bind(this)
-										});
 
-										iPressTheOKButtonOnTheDialog.call(this, oP13nDialog);
+										if (aItemsToRemoveIds.length != 0){
+											iClickOnChartP13nRemoveButton.call(this, aItemsToRemoveIds[0], oP13nDialog, aItemsToRemoveIds, fnAddAllItems, [aItems[0], aItems, fnAssignRoles]);
+										} else {
+											fnAddAllItems.call(this, aItems[0], aItems, fnAssignRoles);
+										}
 									}
 								});
 							}
@@ -972,7 +978,7 @@ sap.ui.define([
 			return iPersonalize.call(this, oControl, Util.texts.group, {
 				success: function(oP13nDialog) {
 					this.waitFor({
-						controlType: (oP13nDialog.getContent()[0].getView("group") ? "sap.ui.mdc.p13n.panels.GroupPanel" : "sap.m.p13n.GroupPanel"),
+						controlType: oP13nDialog.getContent()[0].getView("group") && oP13nDialog.getContent()[0].getView("group").getContent().isA("sap.ui.mdc.p13n.panels.GroupPanel") ? "sap.ui.mdc.p13n.panels.GroupPanel" : "sap.m.p13n.GroupPanel",
 						matchers: new Ancestor(oP13nDialog, false),
 						success: function(aGroupPanels) {
 							var oGroupPanel = aGroupPanels[0];
@@ -1014,7 +1020,7 @@ sap.ui.define([
 			return iPersonalize.call(this, oControl, Util.texts.sort, {
 				success: function(oP13nDialog) {
 					this.waitFor({
-						controlType: oP13nDialog.getContent()[0].getView("sort") ? "sap.ui.mdc.p13n.panels.SortQueryPanel" : "sap.m.p13n.SortPanel",
+						controlType: oP13nDialog.getContent()[0].getView("sort") && oP13nDialog.getContent()[0].getView("sort").getContent().isA("sap.ui.mdc.p13n.panels.SortQueryPanel") ? "sap.ui.mdc.p13n.panels.SortQueryPanel" : "sap.m.p13n.SortPanel",
 						matchers: new Ancestor(oP13nDialog, false),
 						success: function(aSortPanels) {
 							var oSortPanel = aSortPanels[0];

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

@@ -1,111 +0,0 @@
-/*
- * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
- */
-sap.ui.define([
-    "./QueryPanel", "sap/m/HBox", "sap/m/CheckBox", "sap/ui/layout/Grid"
-], function (QueryPanel, HBox, CheckBox, Grid) {
-    "use strict";
-
-    /**
-     * Constructor for a new GroupPanel. The GroupPanel can be used
-     * to personalize groupings for a control by using a group specific QueryPanel
-     * implementation.
-     *
-     * @class
-     * @extends sap.ui.mdc.p13n.panels.QueryPanel
-     *
-     * @author SAP SE
-     * @version 1.96.2
-     *
-     * @private
-     * @ui5-restricted sap.ui.mdc
-     * @experimental
-     * @since 1.90
-     * @alias sap.ui.mdc.p13n.panels.GroupPanel
-     */
-    var GroupPanel = QueryPanel.extend("sap.ui.mdc.p13n.panels.GroupPanel", {
-        metadata: {
-            properties: {
-                enableShowField: {
-                    type: "boolean",
-                    defaultValue: false
-                }
-            }
-        },
-        renderer: {}
-    });
-
-    GroupPanel.prototype._createQueryRowGrid = function(oItem) {
-        var sKey = oItem.name;
-        var oSelect = this._createKeySelect(sKey);
-
-        var oGrid = new Grid({
-            containerQuery: true,
-            defaultSpan: this.getEnableShowField() ? "XL4 L4 M4 S4" : "XL6 L6 M6 S6",
-            content: [
-                oSelect
-            ]
-        }).addStyleClass("sapUiTinyMargin");
-
-        if (this.getEnableShowField()){
-            var oCheckBox = this._createCheckBox(oItem);
-            oGrid.addContent(oCheckBox);
-        }
-
-        return oGrid;
-    };
-
-    GroupPanel.prototype._createCheckBox = function(oItem) {
-        var sKey = oItem.name;
-        var oCheckBox = new HBox({
-            alignItems: "Center",
-            items: [
-                new CheckBox({
-                    enabled: sKey ? true : false,
-                    selected: oItem.hasOwnProperty("showIfGrouped") ? oItem.showIfGrouped : true,
-                    select: function(oEvt) {
-                        var oPanel = oEvt.getSource().getParent().getParent().getParent().getParent().getParent().getParent();
-                        var sKey = oEvt.oSource.getParent().getParent().getContent()[0].getSelectedItem().getKey();
-                        this._changeShowIfGrouped(sKey, oEvt.getParameter("selected"));
-                        oPanel.fireChange({
-                            reason: "change",
-                            item: {
-                                name: sKey,
-                                grouped: true,
-                                showIfGrouped: oEvt.getParameter("selected")
-                            }
-                        });
-                    }.bind(this),
-                    text: this.getResourceText("group.PERSONALIZATION_GROUP_CHECKBOX")
-                })
-            ]
-        });
-
-        return oCheckBox;
-    };
-
-    GroupPanel.prototype._changeShowIfGrouped = function (sKey, bShow) {
-        var aItems = this.getP13nModel().getProperty("/items").filter(function (oItem) {
-            return oItem.name === sKey;
-        });
-
-        aItems[0].showIfGrouped = bShow;
-
-        this.fireChange({
-            reason: "change",
-            item: aItems[0]
-        });
-    };
-
-    GroupPanel.prototype._selectKey = function(oEvt) {
-        QueryPanel.prototype._selectKey.apply(this, arguments);
-        //Enable CheckBox
-        var oListItem = oEvt.getSource().getParent().getParent();
-        var sNewKey = oEvt.getParameter("selectedItem").getKey();
-        oListItem.getContent()[0].getContent()[1].getItems()[0].setEnabled(sNewKey !== this.NONE_KEY);
-    };
-
-    return GroupPanel;
-});

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

@@ -1,322 +0,0 @@
-/*
- * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
- */
-sap.ui.define([
-    "sap/ui/layout/Grid", "./BasePanel", "sap/ui/core/Item", "sap/m/CustomListItem", "sap/m/Select", "sap/m/List", "sap/m/HBox", "sap/m/library", "sap/m/Button"
-], function (Grid, BasePanel, Item, CustomListItem, Select, List, HBox, mLibrary, Button) {
-    "use strict";
-
-    /**
-     * Constructor for a new QueryPanel. The QueryPanel can be used
-     * to show personalization content by selecting a key from a dropdown
-     * to create new key specific personalizations which can be reordered
-     * and deleted by the user.
-     *
-     * @class
-     * @extends sap.ui.mdc.p13n.panels.BasePanel
-     *
-     * @author SAP SE
-     * @version 1.96.2
-     *
-     * @private
-     * @ui5-restricted sap.ui.mdc
-     * @experimental
-     * @since 1.90
-     * @alias sap.ui.mdc.p13n.panels.QueryPanel
-     */
-    var QueryPanel = BasePanel.extend("sap.ui.mdc.p13n.panels.QueryPanel", {
-        metadata: {
-            library: "sap.ui.mdc",
-            properties: {
-                queryLimit: {
-                    type: "int",
-                    defaultValue: -1 //unlimited queries
-                }
-            }
-        },
-        renderer: {}
-    });
-
-    // shortcut for sap.m.ListType
-	var ListItemType = mLibrary.ListType;
-
-    // shortcut for sap.m.FlexJustifyContent
-	var FlexJustifyContent = mLibrary.FlexJustifyContent;
-
-    // shortcut for sap.m.ButtonType
-	var ButtonType = mLibrary.ButtonType;
-
-    QueryPanel.prototype.NONE_KEY = "$_none";
-
-    QueryPanel.prototype.init = function () {
-        BasePanel.prototype.init.apply(this, arguments);
-        this.setEnableReorder(true);
-        this.addStyleClass("sapUiMDCP13nQueryPanel");
-    };
-
-    QueryPanel.prototype.setP13nModel = function (oModel) {
-        BasePanel.prototype.setP13nModel.apply(this, arguments);
-
-        this._oListControl.removeAllItems();
-
-        //Add rows for grouped items
-        oModel.getProperty("/items").forEach(function (oItem) {
-            if (oItem[this._getPresenceAttribute()]) {
-                this._addQueryRow(oItem);
-            }
-        }.bind(this));
-
-        this._addQueryRow();
-    };
-
-    QueryPanel.prototype._moveTableItem = function (oItem, iNewIndex) {
-        this._oListControl.removeItem(oItem);
-        this._oListControl.insertItem(oItem, iNewIndex);
-
-        this._updateEnableOfMoveButtons(oItem, false);
-
-        this.fireChange({
-            reason: "Move",
-            item: this._getModelEntryForRow(oItem)
-        });
-    };
-
-    QueryPanel.prototype._updateEnableOfMoveButtons = function(oTableItem, bFocus) {
-        BasePanel.prototype._updateEnableOfMoveButtons.apply(this, arguments);
-
-        //The last item is always the "$_none" field, check if its the item before, if yes do not allow to reorder it below
-        if (this._oListControl.getItems().indexOf(oTableItem) === (this._oListControl.getItems().length - 2)) {
-            this._getMoveDownButton().setEnabled(false);
-        }
-    };
-
-    QueryPanel.prototype._createInnerListControl = function () {
-        return new List(this.getId() + "-innerP13nList", {
-            itemPress: [this._onItemPressed, this],
-            dragDropConfig: this._getDragDropConfig()
-        });
-    };
-
-    QueryPanel.prototype._getModelEntryForRow = function(oRow) {
-        var sKey = oRow.getContent()[0].getContent()[0]._key;
-        var oField = this.getP13nModel().getProperty("/items").find(function (o) {
-            return o.name == sKey;
-        });
-        return oField;
-    };
-
-    QueryPanel.prototype._getAvailableItems = function (sKey) {
-        var aItems = this.getP13nModel().getProperty("/items");
-
-        var aAvailableItems = [new Item({
-            key: this.NONE_KEY,
-            text: this.getResourceText("sort.PERSONALIZATION_DIALOG_OPTION_NONE"),
-            enabled: !sKey
-        })];
-
-        aItems.forEach(function (oNonPresent, iIndex) {
-            aAvailableItems.push(new Item({
-                key: oNonPresent.name,
-                tooltip: oNonPresent.tooltip,
-                text: oNonPresent.label,
-                enabled: {
-                    path: this.P13N_MODEL + ">/items/" + iIndex + "/" + this._getPresenceAttribute(),
-                    formatter: function(bQueried) {
-                        return !bQueried; //Only enable the selection in case there is not yet a query present
-                    }
-                }
-            }));
-        }.bind(this));
-
-        return aAvailableItems;
-    };
-
-    QueryPanel.prototype._getMoveDownButton = function() {
-        var oMoveBtn = BasePanel.prototype._getMoveDownButton.apply(this, arguments);
-        oMoveBtn.setIcon("sap-icon://navigation-down-arrow");
-		return oMoveBtn;
-	};
-
-    QueryPanel.prototype._getMoveUpButton = function() {
-        var oMoveBtn = BasePanel.prototype._getMoveUpButton.apply(this, arguments);
-        oMoveBtn.setIcon("sap-icon://navigation-up-arrow");
-		return oMoveBtn;
-	};
-
-    QueryPanel.prototype.getP13nState = function () {
-        var aItems = [];
-        this._oListControl.getItems().forEach(function (oItem) {
-
-            var sKey = oItem.getContent()[0].getContent()[0]._key;
-            if (sKey) {
-                var oField = this.getP13nModel().getProperty("/items").find(function (o) {
-                    return o.name == sKey;
-                });
-                aItems.push(Object.assign({}, oField));
-            }
-
-        }.bind(this));
-        return aItems;
-    };
-
-    QueryPanel.prototype._addQueryRow = function (oItem) {
-
-        if (this.getQueryLimit() > -1 && this.getQueryLimit() === this._oListControl.getItems().length) {
-            return;
-        }
-
-        oItem = oItem ? oItem : {name: null, descending: null};
-
-        var oQueryRowGrid = this._createQueryRowGrid(oItem);
-
-        var oRow = new CustomListItem({
-            type: ListItemType.Active,
-            content: [
-                oQueryRowGrid
-            ]
-        });
-
-        //We only need 'move' buttons if:
-        // 1) Reordering is enabled
-        // 2) At least 2 queries can be made
-        if (this.getEnableReorder() && (this.getQueryLimit() === -1 || this.getQueryLimit() > 1)){
-            this._addHover(oRow);
-        }
-
-        oRow.getContent()[0].getContent()[0]._key = oItem.name;
-
-        this._oListControl.addItem(oRow);
-
-        var bShowRemoveBtn = !!oItem.name;
-        var oRemoveButton = this._createRemoveButton(bShowRemoveBtn);
-        oRow.getContent()[0].addContent(oRemoveButton);
-
-        return oRow;
-    };
-
-    QueryPanel.prototype._createQueryRowGrid = function(oItem) {
-        var oSelect = this._createKeySelect(oItem.name);
-        return new Grid({
-            containerQuery: true,
-            defaultSpan: "XL6 L6 M6 S6",
-            content: [
-                oSelect
-            ]
-        }).addStyleClass("sapUiTinyMargin");
-    };
-
-    QueryPanel.prototype._handleActivated = function(oHoveredItem) {
-        var oQueryRow = oHoveredItem.getContent()[0];
-        if (oQueryRow) {
-            var iItemLength = oQueryRow.getContent().length - 1;
-            var oButtonBox = oHoveredItem.getContent()[0].getContent()[iItemLength];
-
-            //Only add the buttons if 1) an hovered item is provided 2) the buttons are not already there
-            if (oHoveredItem && oButtonBox.getItems().length < 2) {
-                oButtonBox.insertItem(this._getMoveUpButton(), 0);
-                oButtonBox.insertItem(this._getMoveDownButton(), 1);
-                this._updateEnableOfMoveButtons(oHoveredItem, false);
-            }
-        }
-    };
-
-    QueryPanel.prototype._createKeySelect = function (sKey) {
-        var oKeySelect = new Select({
-            width: "14rem",
-            items: this._getAvailableItems(sKey),
-            selectedKey: sKey,
-            change: this._selectKey.bind(this)
-        });
-
-        return oKeySelect;
-    };
-
-    QueryPanel.prototype._selectKey = function(oEvt) {
-
-        var oListItem = oEvt.getSource().getParent().getParent();
-
-        var bIsLastRow = this._oListControl.getItems().length - 1 == this._oListControl.getItems().indexOf(oListItem);
-        var sNewKey = oEvt.getParameter("selectedItem").getKey();
-        var sOldKey = oEvt.getSource()._key;
-
-        var oBtnContainer = oListItem.getContent()[0].getContent()[oListItem.getContent()[0].getContent().length - 1];
-        //var oRemoveBtn = oBtnContainer.getItems()[oBtnContainer.getItems().length - 1];
-
-        oBtnContainer.setVisible(sNewKey !== this.NONE_KEY);
-
-        //Remove previous sorter
-        if (sOldKey) {
-            this._updatePresence(sOldKey, false);
-        }
-        //store old key
-        oEvt.getSource()._key = sNewKey;
-
-        //add new sorter
-        this._updatePresence(sNewKey, true);
-
-        //Add a new row in case the last "empty" row has been configured
-        if (sNewKey !== this.NONE_KEY && bIsLastRow) {
-            this._addQueryRow();
-            var oSelect = oEvt.getSource();
-            var oNoneItem = oSelect.getItemByKey(this.NONE_KEY);
-            oNoneItem.setEnabled(false);
-        }
-    };
-
-    QueryPanel.prototype._createRemoveButton = function (bVisible) {
-        var oRemoveBox = new HBox({
-            justifyContent: FlexJustifyContent.End,
-            width: "100%",
-            visible: bVisible,
-            items: [
-                new Button({
-                    type: ButtonType.Transparent,
-                    icon: "sap-icon://decline",
-                    press: function (oEvt) {
-                        var oRow = oEvt.getSource().getParent().getParent().getParent();
-                        this._oListControl.removeItem(oRow);
-                        this._updatePresence(oRow.getContent()[0].getContent()[0]._key, false);
-                        if (this._oListControl.getItems().length === 0) {
-                            this._addQueryRow();
-                        } else {
-                            //In case an item has been removed, focus the Select control of the new 'none' row
-                            var iLastIndex = this._oListControl.getItems().length - 1;
-                            this._oListControl.getItems()[iLastIndex].getContent()[0].getContent()[0].focus();
-                        }
-                    }.bind(this)
-                })
-            ]
-        });
-
-        return oRemoveBox;
-    };
-
-    QueryPanel.prototype._moveSelectedItem = function(){
-        this._oSelectedItem = this._getMoveUpButton().getParent().getParent().getParent();
-        BasePanel.prototype._moveSelectedItem.apply(this, arguments);
-    };
-
-
-    QueryPanel.prototype._updatePresence = function (sKey, bAdd, sOldKey) {
-        var aItems = this.getP13nModel().getProperty("/items");
-        var aRelevant = aItems.filter(function (oItem) {
-            return oItem.name === sKey;
-        });
-
-        if (aRelevant[0]) {
-            aRelevant[0][this._getPresenceAttribute()] = bAdd;
-        }
-
-        this.getP13nModel().setProperty("/items", aItems);
-
-        this.fireChange({
-            reason: bAdd ? "Add" : "Remove",
-            item: aRelevant[0]
-        });
-    };
-
-    return QueryPanel;
-
-});