@openui5/sap.ui.mdc 1.103.0 → 1.105.0

package/src/sap/ui/mdc/odata/v4/vizChart/ChartDelegate.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
@@ -11,20 +11,19 @@ sap.ui.define([
     "sap/m/library",
     "sap/m/Text",
     "sap/ui/mdc/library",
-    "sap/ui/mdc/odata/v4/ODataMetaModelUtil",
     "sap/base/Log",
     'sap/ui/mdc/util/FilterUtil',
     'sap/ui/mdc/odata/v4/util/DelegateUtil',
     "sap/ui/mdc/chart/ChartTypeButton",
     "sap/ui/mdc/chart/Item",
     "sap/ui/model/Sorter",
-    "sap/m/VBox",
+    "sap/ui/mdc/chart/ChartImplementationContainer",
     "sap/ui/base/ManagedObjectObserver",
     "sap/ui/core/ResizeHandler",
     "sap/ui/mdc/p13n/panels/ChartItemPanel",
     "sap/m/MessageStrip",
     "../TypeUtil",
-    "../FilterBarDelegate",
+    "sap/ui/mdc/FilterBarDelegate",
     "sap/ui/model/Filter",
     "sap/ui/mdc/odata/v4/ChartPropertyHelper",
     "sap/ui/thirdparty/jquery"
@@ -35,14 +34,13 @@ sap.ui.define([
     mobileLibrary,
     Text,
     MDCLib,
-    ODataMetaModelUtil,
     Log,
     FilterUtil,
     DelegateUtil,
     ChartTypeButton,
     MDCChartItem,
     Sorter,
-    VBox,
+    ChartImplementationContainer,
     ManagedObjectObserver,
     ResizeHandler,
     ChartItemPanel,
@@ -66,9 +64,6 @@ sap.ui.define([
      */
     var ChartDelegate = Object.assign({}, V4ChartDelegate);
 
-	var FlexJustifyContent = mobileLibrary.FlexJustifyContent;
-	var FlexAlignItems = mobileLibrary.FlexAlignItems;
-
     var mStateMap = new window.WeakMap();
     //var ChartLibrary;
     var Chart;
@@ -85,7 +80,9 @@ sap.ui.define([
             return mStateMap.get(oMDCChart);
         }
 
-        Log.info("Couldn't get state for " + oMDCChart.getId());
+        if (oMDCChart){
+            Log.info("Couldn't get state for " + oMDCChart.getId());
+        }
     };
 
     ChartDelegate._setState = function(oMDCChart, oState) {
@@ -140,13 +137,15 @@ sap.ui.define([
 
     ChartDelegate._deleteState = function(oMDCChart) {
 
-        if (this._getState(oMDCChart).vizTooltip) {
-            this._getState(oMDCChart).vizTooltip.destroy();
-        }
+        if (this._getState(oMDCChart)){
+            if (this._getState(oMDCChart).vizTooltip) {
+                this._getState(oMDCChart).vizTooltip.destroy();
+            }
 
-        if (this._getState(oMDCChart).observer) {
-            this._getState(oMDCChart).observer.disconnect();
-            this._getState(oMDCChart).observer = null;
+            if (this._getState(oMDCChart).observer) {
+                this._getState(oMDCChart).observer.disconnect();
+                this._getState(oMDCChart).observer = null;
+            }
         }
 
         return mStateMap.delete(oMDCChart);
@@ -159,7 +158,9 @@ sap.ui.define([
             return mStateMap.get(oMDCChart).innerChart;
         }
 
-        Log.info("Couldn't get state for " + oMDCChart.getId());
+        if (oMDCChart){
+            Log.info("Couldn't get state for " + oMDCChart.getId());
+        }
 
         return undefined;
 
@@ -178,7 +179,9 @@ sap.ui.define([
             return mStateMap.get(oMDCChart).innerStructure;
         }
 
-        Log.info("Couldn't get state for " + oMDCChart.getId());
+        if (oMDCChart){
+            Log.info("Couldn't get state for " + oMDCChart.getId());
+        }
 
         return undefined;
     };
@@ -196,7 +199,9 @@ sap.ui.define([
             return mStateMap.get(oMDCChart).bindingInfo;
         }
 
-        Log.info("Couldn't get state for " + oMDCChart.getId());
+        if (oMDCChart){
+            Log.info("Couldn't get state for " + oMDCChart.getId());
+        }
 
         return undefined;
     };
@@ -254,7 +259,11 @@ sap.ui.define([
      * @ui5-restricted Fiori Elements, sap.ui.mdc
      */
     ChartDelegate.zoomIn = function (oMDCChart, iValue) {
-        this._getChart(oMDCChart).zoom({direction: "in"});
+        var oInnerChart = this._getChart(oMDCChart);
+
+        if (oInnerChart) {
+            oInnerChart.zoom({direction: "in"});
+        }
     };
 
     /**
@@ -267,7 +276,11 @@ sap.ui.define([
      * @ui5-restricted Fiori Elements, sap.ui.mdc
      */
     ChartDelegate.zoomOut = function (oMDCChart, iValue) {
-        this._getChart(oMDCChart).zoom({direction: "out"});
+        var oInnerChart = this._getChart(oMDCChart);
+
+        if (oInnerChart) {
+            oInnerChart.zoom({direction: "out"});
+        }
     };
 
 
@@ -683,18 +696,16 @@ sap.ui.define([
 
             this._loadChart().then(function (aModules) {
 
-                var sVBoxHeight = this._calculateInnerChartHeight(oMDCChart);
+                this._setInnerStructure(oMDCChart, new ChartImplementationContainer(oMDCChart.getId() + "--implementationContainer", {}));
 
-                this._setInnerStructure(oMDCChart, new VBox({
-                    justifyContent: "Center",
-				    alignItems: "Center",
-                    height: sVBoxHeight,
-                    width: "100%"
-                }));
                 var oText = new Text();
                 oText.setText(oMDCChart.getNoDataText());
 
-                this._getInnerStructure(oMDCChart).addItem(oText);
+                oMDCChart.addStyleClass("sapUiMDCChartTempTextOuter");
+                this._getInnerStructure(oMDCChart).addStyleClass("sapUiMDCChartTempText");
+                this._getInnerStructure(oMDCChart).setContent(oText);
+
+                //oMDCChart.addStyleClass("sapUiMDCChartGrid");
 
                 this._setUpChartObserver(oMDCChart);
 
@@ -866,16 +877,17 @@ sap.ui.define([
         return this._addCriticality(oItem).then(function(){
             this._getState(oItem.getParent()).aInSettings.push(oItem.getName());
 
-            if (oItem.getType === "aggregatable") {
+            if (oItem.getType() === "aggregatable") {
 
                 //Uses excact MDC CHart Item name
                 this._getPropertyInfosByName(oItem.getName(), oItem.getParent()).then(function (oPropertyInfo) {
-                    for (var j = 0; j < this._getAdditionalColoringMeasuresForItem(oPropertyInfo); j++) {
+                    this._getAdditionalColoringMeasuresForItem(oPropertyInfo).forEach(function(oMeasure){
 
-                        if (this._getState(oItem.getParent()).aColMeasures.indexOf(this._getAdditionalColoringMeasuresForItem(oPropertyInfo)[j]) == -1) {
-                            this._getState(oItem.getParent()).aColMeasures.push(this._getAdditionalColoringMeasuresForItem(oPropertyInfo)[j]);
+                        if (this._getState(oItem.getParent()).aColMeasures && this._getState(oItem.getParent()).aColMeasures.indexOf(oMeasure) == -1) {
+                            this._getState(oItem.getParent()).aColMeasures.push(oMeasure);
                         }
-                    }
+                    }.bind(this));
+
                 }.bind(this));
             }
         }.bind(this));
@@ -1253,6 +1265,7 @@ sap.ui.define([
             this._setChart(oMDCChart, new Chart({
                 id: oMDCChart.getId() + "--innerChart",
                 chartType: "column",
+                height: "100%",
                 width: "100%",
                 isAnalytical: true//,
             }));
@@ -1264,14 +1277,9 @@ sap.ui.define([
             //Initialize empty; will get filled later on
             this._getState(oMDCChart).inResultDimensions = [];
 
-            if (oMDCChart.getHeight()){
-                this._getChart(oMDCChart).setHeight(this._calculateInnerChartHeight(oMDCChart));
-            }
-
-            //Set height correctly again if chart changes
-            ResizeHandler.register(oMDCChart, function(){
-                this.adjustChartHeight(oMDCChart);
-            }.bind(this));
+            this._getInnerStructure(oMDCChart).removeStyleClass("sapUiMDCChartTempText");
+            oMDCChart.removeStyleClass("sapUiMDCChartTempTextOuter");
+            oMDCChart.addStyleClass("sapUiMDCChartGrid");
 
             var oState = this._getState(oMDCChart);
             oState.aColMeasures = [];
@@ -1289,10 +1297,10 @@ sap.ui.define([
                     }
                 }.bind(this));
 
-                this._getInnerStructure(oMDCChart).removeAllItems();
-                this._getInnerStructure(oMDCChart).setJustifyContent(FlexJustifyContent.Start);
-                this._getInnerStructure(oMDCChart).setAlignItems(FlexAlignItems.Stretch);
-                this._getInnerStructure(oMDCChart).addItem(this._getChart(oMDCChart));
+                //this._getInnerStructure(oMDCChart).removeAllContent();
+                //this._getInnerStructure(oMDCChart).setJustifyContent(FlexJustifyContent.Start);
+                //this._getInnerStructure(oMDCChart).setAlignItems(FlexAlignItems.Stretch);
+                this._getInnerStructure(oMDCChart).setContent(this._getChart(oMDCChart));
 
                 oState.dataLoadedCallback = fnCallbackDataLoaded;
 
@@ -1331,61 +1339,20 @@ sap.ui.define([
     };
 
     /**
-     * Calculates the height of the inner chart in accoredance with the outer container.
-     * @param {sap.ui.mdc.Chart} oMDCChart Reference to the MDC chart
-     * @returns {string} New height for the chart
-     * @experimental
-     * @private
-     * @ui5-restricted Fiori Elements, sap.ui.mdc
-     */
-    ChartDelegate._calculateInnerChartHeight = function(oMDCChart) {
-        var iTotalHeight = jQuery(oMDCChart.getDomRef()).height();
-        var iToolbarHeight = 0;
-        var oToolbar = oMDCChart.getAggregation("_toolbar");
-        var iBreadcrumbsHeight = 0;
-        var oBreadcrumbs = oMDCChart.getAggregation("_breadcrumbs");
-
-        if (oToolbar){
-            iToolbarHeight = jQuery(oToolbar.getDomRef()).outerHeight(true);
-        }
-
-        if (oBreadcrumbs){
-            iBreadcrumbsHeight = jQuery(oBreadcrumbs.getDomRef()).outerHeight(true);
-        }
-
-        var iSubHeight = iBreadcrumbsHeight + iToolbarHeight;
-
-        if (!iTotalHeight){
-            return "480px";
-        }
-
-        return iTotalHeight - iSubHeight +  "px";
-    };
-
-    /**
-     * Adjusts the chart height to changed content strucutre, if needed.
+     * Requests a toolbar update once the inner chart is ready.
      * @param {sap.ui.mdc.Chart} oMDCChart Reference to the MDC chart
      * @experimental
      * @private
      * @ui5-restricted Fiori Elements, sap.ui.mdc
      */
-    ChartDelegate.adjustChartHeight = function(oMDCChart){
-        if (oMDCChart.getHeight() && this._getChart(oMDCChart)){
-            var sHeight = this._calculateInnerChartHeight(oMDCChart);
+    ChartDelegate.requestToolbarUpdate = function(oMDCChart) {
 
-            this._getInnerStructure(oMDCChart).setHeight(sHeight);
-            this._getChart(oMDCChart).setHeight(sHeight);
+        //Workaround as the sap.chart.Chart doesn't call renderComplete when no dimensions/measures are set up
+        if (oMDCChart.getItems().length === 0) {
+            oMDCChart._updateToolbar();
+            return;
         }
-    };
 
-    /**
-     * Requests a toolbar update once the inner chart is ready.
-     * @param {sap.ui.mdc.Chart} oMDCChart Reference to the MDC chart
-     * @experimental
-     * @private
-     * @ui5-restricted Fiori Elements, sap.ui.mdc
-     */
-    ChartDelegate.requestToolbarUpdate = function(oMDCChart) {
         this._getState(oMDCChart).toolbarUpdateRequested = true;
     };
 
@@ -1813,141 +1780,6 @@ sap.ui.define([
         });
     };
 
-    /**
-     * Returns the relevant property infos based on the metadata used with the MDC chart instance.
-     *
-     * @param {sap.ui.mdc.Chart} oMDCChart Reference to the MDC chart
-     * @returns {array} Array of the property infos to be used within MDC chart
-     * @experimental
-     * @private
-     * @ui5-restricted Fiori Elements, sap.ui.mdc
-     */
-    ChartDelegate.fetchProperties = function (oMDCChart) {
-
-        var oModel = this._getModel(oMDCChart);
-        var pCreatePropertyInfos;
-
-        if (!oModel) {
-            pCreatePropertyInfos = new Promise(function (resolve) {
-                oMDCChart.attachModelContextChange({
-                    resolver: resolve
-                }, onModelContextChange, this);
-            }.bind(this)).then(function (oModel) {
-                return this._createPropertyInfos(oMDCChart.getDelegate().payload, oModel);
-            }.bind(this));
-        } else {
-            pCreatePropertyInfos = this._createPropertyInfos(oMDCChart.getDelegate().payload, oModel);
-        }
-
-        return pCreatePropertyInfos.then(function (aProperties) {
-            if (oMDCChart.data) {
-                oMDCChart.data("$mdcChartPropertyInfo", aProperties);
-            }
-            return aProperties;
-        });
-    };
-
-    function onModelContextChange(oEvent, oData) {
-        var oMDCChart = oEvent.getSource();
-        var oModel = this._getModel(oMDCChart);
-
-        if (oModel) {
-            oMDCChart.detachModelContextChange(onModelContextChange);
-            oData.resolver(oModel);
-        }
-    }
-
-    ChartDelegate._createPropertyInfos = function (oDelegatePayload, oModel) {
-        //var oMetadataInfo = oMDCChart.getDelegate().payload;
-        var aProperties = [];
-        var sEntitySetPath = "/" + oDelegatePayload.collectionName;
-        var oMetaModel = oModel.getMetaModel();
-
-        return Promise.all([
-            oMetaModel.requestObject(sEntitySetPath + "/"), oMetaModel.requestObject(sEntitySetPath + "@")
-        ]).then(function (aResults) {
-            var oEntityType = aResults[0], mEntitySetAnnotations = aResults[1];
-            var oSortRestrictions = mEntitySetAnnotations["@Org.OData.Capabilities.V1.SortRestrictions"] || {};
-            var oSortRestrictionsInfo = ODataMetaModelUtil.getSortRestrictionsInfo(oSortRestrictions);
-            var oFilterRestrictions = mEntitySetAnnotations["@Org.OData.Capabilities.V1.FilterRestrictions"];
-            var oFilterRestrictionsInfo = ODataMetaModelUtil.getFilterRestrictionsInfo(oFilterRestrictions);
-
-            for (var sKey in oEntityType) {
-                var oObj = oEntityType[sKey];
-
-                if (oObj && oObj.$kind === "Property") {
-                    // ignore (as for now) all complex properties
-                    // not clear if they might be nesting (complex in complex)
-                    // not clear how they are represented in non-filterable annotation
-                    // etc.
-                    if (oObj.$isCollection) {
-                        //Log.warning("Complex property with type " + oObj.$Type + " has been ignored");
-                        continue;
-                    }
-
-                    var oPropertyAnnotations = oMetaModel.getObject(sEntitySetPath + "/" + sKey + "@");
-
-                    //TODO: Check what we want to do with properties neither aggregatable nor groupable
-                    //Right now: skip them, since we can't create a chart from it
-                    if (!oPropertyAnnotations["@Org.OData.Aggregation.V1.Aggregatable"] && !oPropertyAnnotations["@Org.OData.Aggregation.V1.Groupable"]) {
-                        continue;
-                    }
-
-                    if (oPropertyAnnotations["@Org.OData.Aggregation.V1.Aggregatable"]){
-                        aProperties = aProperties.concat(this._createPropertyInfosForAggregatable(sKey, oPropertyAnnotations, oObj, oFilterRestrictionsInfo, oSortRestrictionsInfo));
-                    }
-
-                    if (oPropertyAnnotations["@Org.OData.Aggregation.V1.Groupable"]) {
-
-                        aProperties.push({
-                            name: sKey,
-                            propertyPath: sKey,
-                            label: oPropertyAnnotations["@com.sap.vocabularies.Common.v1.Label"] || sKey,
-                            sortable: oSortRestrictionsInfo[sKey] ? oSortRestrictionsInfo[sKey].sortable : true,
-                            filterable: oFilterRestrictionsInfo[sKey] ? oFilterRestrictionsInfo[sKey].filterable : true,
-                            groupable: true,
-                            aggregatable: false,
-                            maxConditions: ODataMetaModelUtil.isMultiValueFilterExpression(oFilterRestrictionsInfo.propertyInfo[sKey]) ? -1 : 1,
-                            sortKey: sKey,
-                            dataType: oObj.$Type,
-                            //formatOptions: null,
-                            //constraints: {},
-                            role: MDCLib.ChartItemRoleType.category, //standard, normally this should be interpreted from UI.Chart annotation
-                            criticality: null ,//To be implemented by FE
-                            textProperty: oPropertyAnnotations["@com.sap.vocabularies.Common.v1.Text"] ? oPropertyAnnotations["@com.sap.vocabularies.Common.v1.Text"].$Path  : null //To be implemented by FE
-                            //textFormatter: string-> can be used to provide a custom formatter for the textProperty
-                        });
-                    }
-                }
-            }
-            return aProperties;
-        }.bind(this));
-    };
-
-    ChartDelegate._createPropertyInfosForAggregatable = function(sKey, oPropertyAnnotations, oObj, oFilterRestrictionsInfo, oSortRestrictionsInfo) {
-        var aProperties = [];
-
-        if (oPropertyAnnotations["@Org.OData.Aggregation.V1.SupportedAggregationMethods"]){
-            oPropertyAnnotations["@Org.OData.Aggregation.V1.SupportedAggregationMethods"].forEach(function(sAggregationMethod){
-                aProperties.push({
-                    name: sAggregationMethod + sKey,
-                    propertyPath: sKey,
-                    label: oPropertyAnnotations["@com.sap.vocabularies.Common.v1.Label"] + " (" + sAggregationMethod + ")" || sKey + " (" + sAggregationMethod + ")" ,
-                    sortable: oSortRestrictionsInfo[sKey] ? oSortRestrictionsInfo[sKey].sortable : true,
-                    filterable: oFilterRestrictionsInfo[sKey] ? oFilterRestrictionsInfo[sKey].filterable : true,
-                    groupable: false,
-                    aggregatable: oPropertyAnnotations["@Org.OData.Aggregation.V1.Aggregatable"],
-                    aggregationMethod: sAggregationMethod,
-                    maxConditions: ODataMetaModelUtil.isMultiValueFilterExpression(oFilterRestrictionsInfo.propertyInfo[sKey]) ? -1 : 1,
-                    dataType: oObj.$Type,
-                    datapoint: null //To be implemented by FE
-                });
-            });
-        }
-
-        return aProperties;
-    };
-
     //Gets internal property infos by excact property name
     ChartDelegate._getPropertyInfosByName = function(sName, oMDCChart){
         return oMDCChart._getPropertyByNameAsync(sName);

package/src/sap/ui/mdc/p13n/AdaptationProvider.js

@@ -1,8 +1,8 @@
-/*
-* ! OpenUI5
+/*!
+ * 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/ui/base/Object"
 ], function(BaseObject) {

package/src/sap/ui/mdc/p13n/Engine.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
@@ -41,7 +41,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.p13n.AdaptationProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc

package/src/sap/ui/mdc/p13n/FlexUtil.js

@@ -1,8 +1,8 @@
-/*
-* ! OpenUI5
+/*!
+ * 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/base/util/merge', 'sap/base/util/deepEqual','sap/ui/mdc/condition/FilterOperatorUtil', 'sap/base/Log'
 ], function (merge, deepEqual, FilterOperatorUtil, Log) {
@@ -96,7 +96,7 @@ sap.ui.define([
 
 			for (var sFieldPath in mNewConditionState) {
 				var bValidProperty = FlexUtil._hasProperty(aPropertyInfo, sFieldPath);
-				if (!bValidProperty) {
+				if (!bValidProperty && oAdaptationControl.isA("sap.ui.mdc.Control") && oAdaptationControl.isPropertyHelperFinal()) {
 					Log.warning("property '" + sFieldPath + "' not supported");
 					continue;
 				}

package/src/sap/ui/mdc/p13n/P13nBuilder.js

@@ -1,8 +1,8 @@
-/*
-* ! OpenUI5
+/*!
+ * 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([
 	"./PropertyHelper",
     "sap/m/Button",
@@ -10,8 +10,9 @@ sap.ui.define([
     "sap/m/Title",
     "sap/base/util/merge",
     "sap/m/MessageBox",
-    "sap/ui/Device"
-], function(P13nPropertyHelper, Button, Bar, Title, merge, MessageBox, Device) {
+    "sap/ui/Device",
+    "sap/ui/fl/write/api/FieldExtensibility"
+], function(P13nPropertyHelper, Button, Bar, Title, merge, MessageBox, Device, FieldExtensibility) {
     "use strict";
 
     var oRB = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
@@ -207,6 +208,7 @@ sap.ui.define([
 			oPropertyHelper.getProperties().forEach(function(oProperty) {
 
                 var mItem = {};
+                mItem.name = oProperty.name;
 
                 if (bEnhance) {
                     var bIsValid = fnEnhace(mItem, oProperty);
@@ -215,7 +217,6 @@ sap.ui.define([
                     }
                 }
 
-                mItem.name = oProperty.name;
                 mItem.label = oProperty.label || oProperty.name;
                 mItem.tooltip = oProperty.tooltip;
 
@@ -310,6 +311,80 @@ sap.ui.define([
                 mMap[oProp.name].position = iIndex;
                 return mMap;
             }, {});
+        },
+
+        /**
+         *
+         * @param {object} oDialog AdaptFiltersDialog
+         *
+         * @returns {Promise} Promise resolving in the Dialog instance
+         */
+        addRTACustomFieldButton: function (oDialog) {
+
+            var bExtensibilityEnabled = false,
+                oDialogParent = oDialog.getParent();
+
+            return sap.ui.getCore().loadLibrary('sap.ui.rta', {
+                async: true
+            }).then(function() {
+                return new Promise(function(resolve) {
+                    sap.ui.require([
+                        "sap/ui/rta/Utils"
+                    ], function(rtaUtils) {
+                        var oHandleExtensibility = Promise.all([
+                            rtaUtils.isServiceUpToDate(oDialogParent),
+                            FieldExtensibility.isExtensibilityEnabled(oDialogParent)
+                        ]);
+
+                        return oHandleExtensibility.then(function (aResult) {
+                            bExtensibilityEnabled = !!aResult[1];
+                        })
+                            .then(function() {
+                                var oCustomHeader = oDialog.getCustomHeader(),
+                                    sId = oDialogParent && oDialogParent.getId ? oDialogParent.getId() : undefined,
+                                    oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
+
+                                if (!oCustomHeader) {
+                                    var oBar = new Bar({
+                                        contentLeft: [
+                                            new Title({
+                                                text: oDialog.getTitle()
+                                            })
+                                        ]
+                                    });
+                                    oDialog.setCustomHeader(oBar);
+                                    oCustomHeader = oDialog.getCustomHeader();
+                                }
+
+                                if (bExtensibilityEnabled) {
+                                    oCustomHeader.addContentRight(new Button( sId + "-addCustomField", {
+                                        icon: "sap-icon://add",
+                                        enabled: bExtensibilityEnabled,
+                                        tooltip: oResourceBundle.getText("p13nDialog.rtaAddTooltip"),
+                                        press: function (oEvt) {
+                                            var sRtaStyleClassName = rtaUtils.getRtaStyleClassName(),
+                                                oAdaptDialog =  oEvt.getSource().getParent().getParent(),
+                                                oControl = oAdaptDialog.getParent();
+
+                                            FieldExtensibility.onControlSelected(oControl).then(function (oRetVal) {
+                                                FieldExtensibility.getExtensionData().then(function (oExtensibilityInfo) {
+                                                    FieldExtensibility.onTriggerCreateExtensionData(oExtensibilityInfo, sRtaStyleClassName);
+                                                    oAdaptDialog.close(); // close as if there is newly created custom field, next time user tries to open it - it checks for service outdated and shows correct information
+                                                });
+                                            });
+
+                                        }
+                                    }));
+
+                                    oDialog.setCustomHeader(oCustomHeader);
+                                    resolve(oDialog);
+                                }
+
+                            });
+
+                    });
+                });
+            });
         }
 
     };

package/src/sap/ui/mdc/p13n/PersistenceProvider.js

@@ -83,7 +83,7 @@ sap.ui.define([
 				oVM.setModel(oModel, Utils.VARIANT_MODEL_NAME);
 			});
 			this._oWrapper = new VerticalLayout(this.getId() + "--accWrapper", {
-				visible: false,
+				visible: true,
 				content: [
 					oVM
 				]
@@ -101,6 +101,28 @@ sap.ui.define([
 		return this;
 	};
 
+	PersistenceProvider.prototype.addFor = function (sControlId) {
+		this.addAssociation("for", sControlId);
+
+		var oVM = sap.ui.getCore().byId(this.getId() + "--vm");
+		if (this.getMode() === mode.Transient && oVM) {
+			oVM.addFor(sControlId);
+		}
+
+		return this;
+	};
+
+	PersistenceProvider.prototype.removeFor = function (sControlId) {
+		this.removeAssociation("for", sControlId);
+
+		var oVM = sap.ui.getCore().byId(this.getId() + "--vm");
+		if (this.getMode() === mode.Transient && oVM) {
+			oVM.removeFor(sControlId);
+		}
+
+		return this;
+	};
+
 	/**
 	 * Set the mode for the <code>PersistenceProvider</code>.
 	 *
@@ -109,13 +131,13 @@ sap.ui.define([
 	 * @ui5-restricted sap.fe
 	 * @MDC_PUBLIC_CANDIDATE
 	 */
-	PersistenceProvider.prototype.setMode = function (bValue) {
+	PersistenceProvider.prototype.setMode = function (sValue) {
 
-		if (this._bmodeLocked && bValue !== this.getMode()) {
+		if (this._bmodeLocked && sValue !== this.getMode()) {
 			throw new Error("mode is a final property.");
 		}
 
-		this.setProperty("mode", bValue);
+		this.setProperty("mode", sValue);
 
 		return this;
 	};