@sapui5/sap.ushell 1.125.0 → 1.126.1

package/src/main/js/sap/ushell/services/UserDefaultParameters.js

@@ -7,7 +7,7 @@
  *               This service should be accessed by the application
  *               via the CrossApplicationNavigation service.
  *
- * @version 1.125.0
+ * @version 1.126.1
  */
 sap.ui.define([
     "sap/base/Log",
@@ -27,13 +27,13 @@ sap.ui.define([
     isEmptyObject,
     EventProvider,
     jQuery,
-    oUtils,
+    ushellUtils,
     Container
 ) {
     "use strict";
 
-    var sEventNameValueStored = "valueStored";
-    var aStoreMembers = ["value", "noEdit", "noStore", "extendedValue", "alwaysAskPlugin"];
+    const sEventNameValueStored = "valueStored";
+    const aStoreMembers = ["value", "noEdit", "noStore", "extendedValue", "alwaysAskPlugin"];
     /**
      * @alias sap.ushell.services.UserDefaultParameters
      * @class
@@ -67,8 +67,7 @@ sap.ui.define([
         // persistence.
         this._oWasParameterPersisted = {};
 
-        var that = this;
-        var oStoreValueEventProvider = new EventProvider();
+        const oStoreValueEventProvider = new EventProvider();
 
         /**
          * Obtain an integer representing the priority of the plugin
@@ -80,7 +79,7 @@ sap.ui.define([
          * @private
          */
         function getPrio (oPlugin) {
-            var val = (typeof oPlugin.getComponentData === "function" && oPlugin.getComponentData() && oPlugin.getComponentData().config && oPlugin.getComponentData().config["sap-priority"]) || 0;
+            const val = (typeof oPlugin.getComponentData === "function" && oPlugin.getComponentData() && oPlugin.getComponentData().config && oPlugin.getComponentData().config["sap-priority"]) || 0;
             if (typeof val !== "number" || isNaN(val)) {
                 return 0;
             }
@@ -100,9 +99,9 @@ sap.ui.define([
          * @since 1.32.0
          */
         this._insertPluginOrdered = function (aPlugins, oPlugin) {
-            var prioPlugin = getPrio(oPlugin);
-            for (var i = 0; (i < aPlugins.length) && oPlugin; ++i) {
-                var prioNth = getPrio(aPlugins[i]);
+            const prioPlugin = getPrio(oPlugin);
+            for (let i = 0; (i < aPlugins.length) && oPlugin; ++i) {
+                const prioNth = getPrio(aPlugins[i]);
                 if (oPlugin && (prioPlugin > prioNth)) {
                     aPlugins.splice(i, 0, oPlugin); // insert at index i;
                     oPlugin = undefined;
@@ -140,32 +139,23 @@ sap.ui.define([
          *
          * @private
          */
-        this._getUserDefaultValueFromPlugin = function (oPlugin, sParameterName, oSystemContext, oValue) {
-            var oResult;
+        this._getUserDefaultValueFromPlugin = async function (oPlugin, sParameterName, oSystemContext, oValue) {
             if (typeof oPlugin.getUserDefault === "function") {
-                oResult = new Promise(function (resolve, reject) {
-                    oPlugin.getUserDefault(sParameterName, oValue, oSystemContext)
-                        .done(function (oNewValue) {
-                            var oResolveValue = oNewValue || oValue;
-
-                            var sPluginName = this._getComponentNameOfPlugin(oPlugin);
-                            Log.debug(
-                                "[UserDefaults] Fetched \"" + sParameterName + "\" for SystemContext=" + oSystemContext.id + " from Plugin=" + sPluginName,
-                                JSON.stringify(oResolveValue, null, 2)
-                            );
-
-                            resolve(oResolveValue);
-                        }.bind(this))
-                        .fail(function () {
-                            Log.error("invocation of getUserDefault(\"" + sParameterName + "\") for plugin " + that._getComponentNameOfPlugin(oPlugin) + " rejected.", null,
+                try {
+                    const oResult = await ushellUtils.promisify(oPlugin.getUserDefault(sParameterName, oValue, oSystemContext));
+                    const oResolveValue = oResult || oValue;
+
+                    const sPluginName = this._getComponentNameOfPlugin(oPlugin);
+                    Log.debug(`[UserDefaults] Fetched "${sParameterName}" for SystemContext="${oSystemContext.id}" from Plugin="${sPluginName}"`, JSON.stringify(oResolveValue, null, 2));
+
+                    return oResolveValue;
+                } catch {
+                    Log.error(`invocation of getUserDefault("${ sParameterName }") for plugin ${ this._getComponentNameOfPlugin(oPlugin) } rejected.`, null,
                                 "sap.ushell.services.UserDefaultParameters");
-                            resolve(oValue);
-                        });
-                }.bind(this));
-            } else {
-                oResult = Promise.resolve(oValue);
+                }
             }
-            return oResult;
+
+            return oValue;
         };
 
         /**
@@ -188,26 +178,22 @@ sap.ui.define([
          * @since 1.32.0
          * @private
          */
-        this._iterateOverPluginsToGetDefaultValue = function (sParameterName, oStartValue, oSystemContext) {
+        this._iterateOverPluginsToGetDefaultValue = async function (sParameterName, oStartValue, oSystemContext) {
             // Main promise chain construction: a plugin will only be called once the previous one's promise has resolved
             // so that we have access to the value returned by that promise.
-            return new Promise(function (resolve, reject) {
-                Container.getServiceAsync("PluginManager").then(function (oPluginManagerService) {
-                    oPluginManagerService.loadPlugins("UserDefaults")
-                        .done(function () {
-                            var oPluginPromiseChain = this._aPlugins.reduce(function (oChain, oPlugin) {
-                                var oExtendedChain = oChain.then(this._getUserDefaultValueFromPlugin.bind(this, oPlugin, sParameterName, oSystemContext /*oValue - resolved value*/));
-                                return oExtendedChain;
-                            }.bind(this), Promise.resolve(oStartValue));
-
-                            oPluginPromiseChain.then(resolve);
-                        }.bind(this))
-                        .fail(function () {
-                            Log.error("Cannot get value for " + sParameterName + ". One or more plugins could not be loaded.");
-                            reject("Initialization of plugins failed");
-                        });
-                }.bind(this));
-            }.bind(this));
+            const PluginManager = await Container.getServiceAsync("PluginManager");
+
+            try {
+                await ushellUtils.promisify(PluginManager.loadPlugins("UserDefaults"));
+            } catch {
+                Log.error(`Cannot get value for ${ sParameterName }. One or more plugins could not be loaded.`);
+                return Promise.reject("Initialization of plugins failed");
+            }
+
+            return this._aPlugins.reduce(async (oPromise, oPlugin) =>{
+                const oPreviousValue = await oPromise;
+                return this._getUserDefaultValueFromPlugin(oPlugin, sParameterName, oSystemContext, oPreviousValue);
+            }, Promise.resolve(oStartValue));
         };
 
         this._getStoreDate = function () {
@@ -227,25 +213,20 @@ sap.ui.define([
          * @since 1.32.0
          * @private
          */
-        this._storeValue = function (sParameterName, oValueObject, bFromEditor, oSystemContext) {
+        this._storeValue = async function (sParameterName, oValueObject, bFromEditor, oSystemContext) {
             if (bFromEditor && oValueObject.extendedValue) {
-                return Container.getServiceAsync("ClientSideTargetResolution")
-                    .then(function (oClientSideTargetResolutionService) {
-                        return new Promise(function (resolve) {
-                            oClientSideTargetResolutionService.getUserDefaultParameterNames(oSystemContext)
-                                .done(function (oParametersAndExtendedParameters) {
-                                    var oExtractedArrays = this._extractKeyArrays(oParametersAndExtendedParameters);
-                                    var bRemoveExtendedValue = oExtractedArrays.extended.indexOf(sParameterName) < 0;
-
-                                    this._saveParameterValue(sParameterName, oValueObject, bFromEditor, bRemoveExtendedValue, oSystemContext)
-                                        .then(resolve);
-                                }.bind(this))
-                                .fail(function () {
-                                    this._saveParameterValue(sParameterName, oValueObject, bFromEditor, false, oSystemContext)
-                                        .then(resolve);
-                                }.bind(this));
-                        }.bind(this));
-                    }.bind(this));
+                try {
+                    const ClientSideTargetResolution = await Container.getServiceAsync("ClientSideTargetResolution");
+                    const oDeferred = ClientSideTargetResolution.getUserDefaultParameterNames(oSystemContext);
+                    const oParametersAndExtendedParameters = await ushellUtils.promisify(oDeferred);
+
+                    const oExtractedArrays = this._extractKeyArrays(oParametersAndExtendedParameters);
+                    const bRemoveExtendedValue = oExtractedArrays.extended.indexOf(sParameterName) < 0;
+
+                    return this._saveParameterValue(sParameterName, oValueObject, bFromEditor, bRemoveExtendedValue, oSystemContext);
+                } catch {
+                    Log.error(`Cannot save value for ${ sParameterName }. One or more plugins could not be loaded.`);
+                }
             }
 
             return this._saveParameterValue(sParameterName, oValueObject, bFromEditor, false, oSystemContext);
@@ -265,7 +246,7 @@ sap.ui.define([
          * @since 1.79.0
          * @private
          */
-        this._saveParameterValue = function (sParameterName, oValueObject, bFromEditor, bRemoveExtendedValue, oSystemContext) {
+        this._saveParameterValue = async function (sParameterName, oValueObject, bFromEditor, bRemoveExtendedValue, oSystemContext) {
             if (bRemoveExtendedValue) {
                 oValueObject.extendedValue = undefined;
             }
@@ -278,24 +259,21 @@ sap.ui.define([
                 }, oValueObject._shellData);
             }
 
-            return Container.getServiceAsync("UserDefaultParameterPersistence")
-                .then(function (oUserDefaultParameterPersistenceService) {
-                    return new Promise(function (resolve) {
-                        oUserDefaultParameterPersistenceService
-                            .saveParameterValue(sParameterName, oValueObject, oSystemContext)
-                            .always(function () {
-                                var oStoreValue = {
-                                    parameterName: sParameterName,
-                                    parameterValue: deepClone(oValueObject || {}),
-                                    systemContext: oSystemContext
-                                };
-
-                                oStoreValueEventProvider.fireEvent(sEventNameValueStored, oStoreValue);
-
-                                resolve(sParameterName);
-                            });
-                    });
-                });
+            try {
+                const UserDefaultParameterPersistence = await Container.getServiceAsync("UserDefaultParameterPersistence");
+                const oDeferred = UserDefaultParameterPersistence.saveParameterValue(sParameterName, oValueObject, oSystemContext);
+                await ushellUtils.promisify(oDeferred);
+            } catch { /* always resolve */ }
+
+            const oStoreValue = {
+                parameterName: sParameterName,
+                parameterValue: deepClone(oValueObject || {}),
+                systemContext: oSystemContext
+            };
+
+            oStoreValueEventProvider.fireEvent(sEventNameValueStored, oStoreValue);
+
+            return sParameterName;
         };
 
         /**
@@ -313,15 +291,11 @@ sap.ui.define([
          * @since 1.32.0
          * @private
          */
-        this._getPersistedValue = function (sParameterName, oSystemContext) {
-            return new Promise(function (resolve, reject) {
-                Container.getServiceAsync("UserDefaultParameterPersistence")
-                    .then(function (oUserDefaultParameterPersistenceService) {
-                        oUserDefaultParameterPersistenceService.loadParameterValue(sParameterName, oSystemContext)
-                            .done(resolve)
-                            .fail(reject);
-                    });
-            });
+        this._getPersistedValue = async function (sParameterName, oSystemContext) {
+            const UserDefaultParameterPersistence = await Container.getServiceAsync("UserDefaultParameterPersistence");
+            const oDeferred = UserDefaultParameterPersistence.loadParameterValue(sParameterName, oSystemContext);
+
+            return ushellUtils.promisify(oDeferred);
         };
 
         /**
@@ -350,7 +324,7 @@ sap.ui.define([
          *   differs.
          */
         this._haveSameMembersValue = function (oObject1, oObject2, aMembersToCheck) {
-            return aMembersToCheck.every(function (sRelevantMember) {
+            return aMembersToCheck.every((sRelevantMember) => {
                 return oObject1[sRelevantMember] === oObject2[sRelevantMember]
                     || deepEqual(oObject1[sRelevantMember], oObject2[sRelevantMember]);
             });
@@ -379,24 +353,23 @@ sap.ui.define([
          */
         this._getUserDefaultParameterNames = function (systemContext) {
             if (!this._oUserDefaultParametersNames[systemContext.id]) {
-                this._oUserDefaultParametersNames[systemContext.id] = new Promise(function (resolve) {
-                    Container.getServiceAsync("ClientSideTargetResolution")
-                        .then(function (ClientSideTargetResolutionService) {
-                            ClientSideTargetResolutionService.getUserDefaultParameterNames(systemContext)
-                                .done(function (oParametersAndExtendedParameters) {
-                                    var oExtractedArrays = this._extractKeyArrays(oParametersAndExtendedParameters);
-                                    var aExtendedParameterNames = oExtractedArrays.extended;
-                                    var aAllParameterNames = oExtractedArrays.allParameters;
-                                    var oMetadataObject = this._arrayToObject(aAllParameterNames);
-
-                                    resolve({
-                                        aAllParameterNames: aAllParameterNames,
-                                        aExtendedParameterNames: aExtendedParameterNames,
-                                        oMetadataObject: oMetadataObject
-                                    });
-                                }.bind(this));
-                        }.bind(this));
-                }.bind(this));
+                this._oUserDefaultParametersNames[systemContext.id] = new Promise(async (resolve) => {
+                    const ClientSideTargetResolution = await Container.getServiceAsync("ClientSideTargetResolution");
+
+                    const oDeferred = ClientSideTargetResolution.getUserDefaultParameterNames(systemContext);
+                    const oParametersAndExtendedParameters = await ushellUtils.promisify(oDeferred);
+
+                    const oExtractedArrays = this._extractKeyArrays(oParametersAndExtendedParameters);
+                    const aExtendedParameterNames = oExtractedArrays.extended;
+                    const aAllParameterNames = oExtractedArrays.allParameters;
+                    const oMetadataObject = this._arrayToObject(aAllParameterNames);
+
+                    resolve({
+                        aAllParameterNames: aAllParameterNames,
+                        aExtendedParameterNames: aExtendedParameterNames,
+                        oMetadataObject: oMetadataObject
+                    });
+                });
             }
 
             return this._oUserDefaultParametersNames[systemContext.id];
@@ -404,9 +377,9 @@ sap.ui.define([
 
         this._isRelevantParameter = function (sParamName, oSystemContext) {
             return this._getUserDefaultParameterNames(oSystemContext)
-                .then(function (oResult) {
+                .then((oResult) => {
                     if (!oResult.aAllParameterNames || oResult.aAllParameterNames.indexOf(sParamName) === -1) {
-                        throw new Error("The given parameter \"" + sParamName + "\" is not part of the list of parameters for the given system context.");
+                        throw new Error(`The given parameter "${ sParamName }" is not part of the list of parameters for the given system context.`);
                     }
                 });
         };
@@ -416,41 +389,36 @@ sap.ui.define([
          * maintainable for the end user or not.
          *
          * @param {object} systemContext The system context object.
-         * @returns {Promise<boolean|undefined>}
+         * @returns {Promise<boolean>}
          *      A promise that is resolved with a boolean value
          *      which has the value <code>true</code> if user default parameters are
          *      maintainable, and <code>false</code> if not.
          *      The promise will always be resolved.
          *      Note: In case an error occurs, the promise is resolved with <code>undefined</code>.
          */
-        this.hasRelevantMaintainableParameters = function (systemContext) {
-            var bHasRelevantParameters = false;
-            var aGetValuePromises = [];
-
-            return new Promise(function (resolve) {
-                this._getUserDefaultParameterNames(systemContext)
-                    .then(function (oParameterNames) {
-                        if (!isEmptyObject(oParameterNames) && oParameterNames.aAllParameterNames) {
-                            oParameterNames.aAllParameterNames.forEach(function (sParameterName) {
-                                var oGetValuePromise = this.getValue(sParameterName, systemContext);
-                                aGetValuePromises.push(oGetValuePromise);
-                                oGetValuePromise.done(function (oValue) {
-                                    if (oValue && !oValue.hasOwnProperty("noEdit")) {
-                                        bHasRelevantParameters = true;
-                                    }
-                                });
-                            }.bind(this));
-
-                            jQuery.when.apply(undefined, aGetValuePromises).done(function () {
-                                resolve(bHasRelevantParameters);
-                            }).fail(function () {
-                                resolve();
-                            });
-                        } else {
-                            resolve();
-                        }
-                    }.bind(this));
-            }.bind(this));
+        this.hasRelevantMaintainableParameters = async function (systemContext) {
+            try {
+                const oParameterNames = await this._getUserDefaultParameterNames(systemContext);
+
+                if (!isEmptyObject(oParameterNames) && oParameterNames.aAllParameterNames) {
+                    const aHasRelevantParameters = await Promise.all(oParameterNames.aAllParameterNames.map(async (sParameterName) => {
+                        try {
+                            const oValue = await ushellUtils.promisify(this.getValue(sParameterName, systemContext));
+
+                            if (oValue && !oValue.hasOwnProperty("noEdit")) {
+                                return true;
+                            }
+                        } catch { /* always provide a value */ }
+
+                        return false;
+                    }));
+
+                    return aHasRelevantParameters.some((bHasRelevantParameters) => bHasRelevantParameters);
+                }
+            } catch { /* always resolve */ }
+
+
+            return false;
         };
 
         /**
@@ -473,28 +441,28 @@ sap.ui.define([
             // c2) if value was altered, including set to undefined,
             //    [not on critical path] update value in remote persistence
             //    (potentially deleting value if set to undefined!)
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
             this._isRelevantParameter(sParameterName, oSystemContext)
                 // no relevant parameter -> no value
                 // This is handled at the end of the chain, as all "then" will
                 // be ignored in case of a rejection in _isRelevantParameter
-                .then(function () {
+                .then(() => {
                     return this._getPersistedValue(sParameterName, oSystemContext)
-                        .then(function (oPersistedValue) {
+                        .then((oPersistedValue) => {
                             this._oWasParameterPersisted[sParameterName] = true;
 
                             return oPersistedValue || {};
-                        }.bind(this))
+                        })
                         // If the server call fails, this ensures that the plugins get called.
-                        .catch(function () {
+                        .catch(() => {
                             return { value: undefined };
                         });
-                }.bind(this))
-                .then(function (oPersistedValue) {
-                    var oValueClone = deepClone(oPersistedValue);
+                })
+                .then((oPersistedValue) => {
+                    const oValueClone = deepClone(oPersistedValue);
 
-                    var bAskValueToPlugins =
+                    const bAskValueToPlugins =
                         (!oPersistedValue._shellData && this._valueIsEmpty(oPersistedValue)) // _shellData is added by the shell when the parameter is stored
                         || oPersistedValue.noStore // i.e., don't use the stored value
                         || oPersistedValue.alwaysAskPlugin;
@@ -505,22 +473,22 @@ sap.ui.define([
                     }
 
                     return this._iterateOverPluginsToGetDefaultValue(sParameterName, oPersistedValue, oSystemContext)
-                        .then(function (oNewValue) {
+                        .then((oNewValue) => {
                             if (!this._oWasParameterPersisted[sParameterName] || !this._haveSameMembersValue(oValueClone, oNewValue, aStoreMembers)) {
                                 // avoid multiple calls result in storing a parameter, as we fire and forget via _storeValue below.
                                 this._oWasParameterPersisted[sParameterName] = true;
 
                                 this._storeValue(sParameterName, oNewValue, false, oSystemContext)
-                                    .then(function () {
+                                    .then(() => {
                                         oDeferred.resolve(oNewValue);
                                     });
                             } else {
                                 oDeferred.resolve(oNewValue);
                             }
-                        }.bind(this))
+                        })
                         .catch(oDeferred.reject);
-                }.bind(this))
-                .catch(function () {
+                })
+                .catch(() => {
                     oDeferred.resolve({ value: undefined });
                 });
 
@@ -533,33 +501,23 @@ sap.ui.define([
          * @param {object} oParameters The map the new parameters are to be added to
          * @param {string[]} aParameterNames A list containing the new parameter names
          * @param {object} oSystemContext The system context object
-         * @returns {jQuery.Promise} Resolves the amended parameter map.
+         * @returns {Promise<object>} Resolves the amended parameter map.
          *
          * @private
          */
-        this._addParameterValuesToParameters = function (oParameters, aParameterNames, oSystemContext) {
-            var oDeferred = new jQuery.Deferred();
-            var aPromises = [];
-
-            aParameterNames.forEach(function (sParameterName) {
-                var oGetValuePromise = this.getValue(sParameterName, oSystemContext);
-                aPromises.push(oGetValuePromise);
-
-                oGetValuePromise.done(function (oValueObject) {
-                    oParameters[sParameterName].valueObject = oValueObject;
-                });
-            }.bind(this));
+        this._addParameterValuesToParameters = async function (oParameters, aParameterNames, oSystemContext) {
+            await Promise.all(aParameterNames.map(async (sParameterName) => {
+                const oValueObject = await ushellUtils.promisify(this.getValue(sParameterName, oSystemContext));
 
-            jQuery.when.apply(jQuery, aPromises)
-                .done(oDeferred.resolve.bind(oDeferred, oParameters))
-                .fail(oDeferred.reject.bind(oDeferred, oParameters));
+                oParameters[sParameterName].valueObject = oValueObject;
+            }));
 
-            return oDeferred.promise();
+            return oParameters;
         };
 
         this._arrayToObject = function (aParameterNames) {
-            var oRes = {};
-            aParameterNames.forEach(function (sParameterName) {
+            const oRes = {};
+            aParameterNames.forEach((sParameterName) => {
                 oRes[sParameterName] = {};
             });
             return oRes;
@@ -575,7 +533,6 @@ sap.ui.define([
 
         /**
          * given
-         * @param {jQuery.Deferred} oDeferred a jQuery Deferred, which is to be resolved if the execution succeeded
          * @param {string[]} aAllParameterNames all assigned parameter names as array of strings
          * @param {string[]} aExtendedParameterNames the parameter names as array of strings
          * @param {object} oMetadataObject a raw metadata object, not yet amended by plugin data
@@ -583,83 +540,68 @@ sap.ui.define([
          *
          * @private
          */
-        this._getEditorDataAndValue = function (oDeferred, aAllParameterNames, aExtendedParameterNames, oMetadataObject, oSystemContext) {
-            var that = this;
-            var aDeferreds = [];
-            var aResultsOfMetadataPluginCalls = [];
-
-            this._aPlugins.forEach(function (oPlugin) {
+        this._getEditorDataAndValue = async function (aAllParameterNames, aExtendedParameterNames, oMetadataObject, oSystemContext) {
+            const aPluginMetadata = await Promise.all(this._aPlugins.map(async (oPlugin) => {
                 if (typeof oPlugin.getEditorMetadata === "function") {
-                    var oPluginDeferred = new jQuery.Deferred();
-                    aDeferreds.push(oPluginDeferred);
-
                     try {
-                        var iPromisesLength = aDeferreds.length - 1;
-
-                        oPlugin.getEditorMetadata(oMetadataObject, oSystemContext)
-                            .done(function (oResultMetadata) {
-                                aResultsOfMetadataPluginCalls[iPromisesLength] = oResultMetadata;
-                            }).always(oPluginDeferred.resolve)
-                            .fail(function () {
-                                Log.error("EditorMetadata for plugin " + that._getComponentNameOfPlugin(oPlugin) + "cannot be invoked.", null, "sap.ushell.services.UserDefaultParameters");
-                                oPluginDeferred.resolve();
-                            });
-                    } catch (ex) {
-                        Log.error("Error invoking getEditorMetaData on plugin: " + ex + ex.stack, null,
-                            "sap.ushell.services.UserDefaultParameters");
-                        oPluginDeferred.resolve();
+                        const oDeferred = oPlugin.getEditorMetadata(oMetadataObject, oSystemContext);
+                        const oResultMetadata = await ushellUtils.promisify(oDeferred);
+
+                        return oResultMetadata;
+                    } catch (error) {
+                        Log.error(`Error invoking getEditorMetaData on plugin: ${ error }${error.stack}`, null,
+                        "sap.ushell.services.UserDefaultParameters");
+                        return;
                     }
                 }
-            });
-
-            jQuery.when.apply(jQuery, aDeferreds).done(function () {
-                // all metadata present
-                var aParameterNamesWithoutMetadata = [];
-                var oParametersWithMetadata = aResultsOfMetadataPluginCalls.reverse().reduce(function (oPreviousValue, oNthResult) {
-                    aAllParameterNames.forEach(function (sParameterName) {
-                        if (oNthResult[sParameterName] && oNthResult[sParameterName].editorMetadata) {
-                            oPreviousValue[sParameterName].editorMetadata = oNthResult[sParameterName].editorMetadata;
-                        }
-                    });
-                    return oPreviousValue;
-                }, oMetadataObject);
-                aAllParameterNames.forEach(function (sParameterName) {
-                    if (!(oParametersWithMetadata[sParameterName] && oParametersWithMetadata[sParameterName].editorMetadata)) {
-                        aParameterNamesWithoutMetadata.push(sParameterName);
+            }));
+
+            // all metadata present
+            const aParameterNamesWithoutMetadata = [];
+            // apply metadata results on top of the metadata object (start with last plugin result)
+            const oParametersWithMetadata = aPluginMetadata.reverse().reduce((oPreviousValue, oPluginMetadata) => {
+                aAllParameterNames.forEach((sParameterName) => {
+                    if (oPluginMetadata?.[sParameterName]?.editorMetadata) {
+                        oPreviousValue[sParameterName].editorMetadata = oPluginMetadata[sParameterName].editorMetadata;
                     }
                 });
+                return oPreviousValue;
+            }, oMetadataObject);
+            aAllParameterNames.forEach((sParameterName) => {
+                if (!(oParametersWithMetadata[sParameterName] && oParametersWithMetadata[sParameterName].editorMetadata)) {
+                    aParameterNamesWithoutMetadata.push(sParameterName);
+                }
+            });
 
-                // blend in parameters
-                that._addParameterValuesToParameters(oParametersWithMetadata, aAllParameterNames, oSystemContext).done(function (oParameters) {
-                    // create a deep copy
-                    var oParametersDeepCopy = deepExtend({}, oParameters);
-                    // mark extended parameters!
-                    aExtendedParameterNames.forEach(function (sParameterName) {
-                        if (oParametersDeepCopy[sParameterName]) {
-                            oParametersDeepCopy[sParameterName].editorMetadata = oParametersDeepCopy[sParameterName].editorMetadata || {};
-                            oParametersDeepCopy[sParameterName].editorMetadata.extendedUsage = true;
-                        }
-                    });
-                    // remove all noEdit parameters
-                    var aKeys = Object.keys(oParametersDeepCopy).splice(0);
-                    aKeys.forEach(function (sParameterName) {
-                        var idx;
-                        if (oParametersDeepCopy[sParameterName].valueObject &&
-                            oParametersDeepCopy[sParameterName].valueObject.noEdit === true) {
-                            delete oParametersDeepCopy[sParameterName];
-                            // also from the error log list (noEdit parameters w.o. editorMetadata are no cause of concern)
-                            idx = aParameterNamesWithoutMetadata.indexOf(sParameterName);
-                            if (idx >= 0) {
-                                aParameterNamesWithoutMetadata.splice(idx, 1);
-                            }
-                        }
-                    });
-                    if (aParameterNamesWithoutMetadata.length > 0) {
-                        Log.error("The following parameter names have no editor metadata and thus likely no configured plugin:\n\"" + aParameterNamesWithoutMetadata.join("\",\n\"") + "\".");
+            // blend in parameters
+            const oBlendedParameters = await this._addParameterValuesToParameters(oParametersWithMetadata, aAllParameterNames, oSystemContext);
+            // create a deep copy
+            const oParametersDeepCopy = deepExtend({}, oBlendedParameters);
+            // mark extended parameters!
+            aExtendedParameterNames.forEach((sParameterName) => {
+                if (oParametersDeepCopy[sParameterName]) {
+                    oParametersDeepCopy[sParameterName].editorMetadata = oParametersDeepCopy[sParameterName].editorMetadata || {};
+                    oParametersDeepCopy[sParameterName].editorMetadata.extendedUsage = true;
+                }
+            });
+            // remove all noEdit parameters
+            const aKeys = Object.keys(oParametersDeepCopy).splice(0);
+            aKeys.forEach((sParameterName) => {
+                let idx;
+                if (oParametersDeepCopy[sParameterName].valueObject &&
+                    oParametersDeepCopy[sParameterName].valueObject.noEdit === true) {
+                    delete oParametersDeepCopy[sParameterName];
+                    // also from the error log list (noEdit parameters w.o. editorMetadata are no cause of concern)
+                    idx = aParameterNamesWithoutMetadata.indexOf(sParameterName);
+                    if (idx >= 0) {
+                        aParameterNamesWithoutMetadata.splice(idx, 1);
                     }
-                    oDeferred.resolve(oParametersDeepCopy);
-                }).fail(oDeferred.reject.bind(oDeferred));
+                }
             });
+            if (aParameterNamesWithoutMetadata.length > 0) {
+                Log.error(`The following parameter names have no editor metadata and thus likely no configured plugin:\n"${ aParameterNamesWithoutMetadata.join("\",\n\"") }".`);
+            }
+            return oParametersDeepCopy;
         };
 
         /**
@@ -750,30 +692,37 @@ sap.ui.define([
          * undefined if no value could be retrieved.
          */
         this.editorGetParameters = function (oSystemContext) {
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
             Promise.all([
                 Container.getServiceAsync("PluginManager"),
                 this._getUserDefaultParameterNames(oSystemContext)
-            ]).then(function (aResults) {
-                var PluginManagerService = aResults[0];
-                var oParametersAndExtendedParameters = aResults[1];
-
-                if (oParametersAndExtendedParameters.oMetadataObject.length === 0) {
-                    // if array is empty, nothing to display in editor
-                    oDeferred.resolve({});
-                } else {
-                    PluginManagerService.loadPlugins("UserDefaults")
-                        .done(function () {
-                            // eslint-disable-next-line max-len
-                            this._getEditorDataAndValue(oDeferred, oParametersAndExtendedParameters.aAllParameterNames, oParametersAndExtendedParameters.aExtendedParameterNames, oParametersAndExtendedParameters.oMetadataObject, oSystemContext);
-                        }.bind(this))
-                        .fail(function () {
+            ])
+                .then((aResults) => {
+                    const PluginManagerService = aResults[0];
+                    const oParametersAndExtendedParameters = aResults[1];
+
+                    if (oParametersAndExtendedParameters.oMetadataObject.length === 0) {
+                        // if array is empty, nothing to display in editor
+                        return {};
+                    }
+
+                    return ushellUtils.promisify(PluginManagerService.loadPlugins("UserDefaults"))
+                        .catch(() => {
                             Log.error("One or more plugins could not be loaded");
-                            oDeferred.reject("Initialization of plugins failed");
+                            return Promise.reject("Initialization of plugins failed");
+                        })
+                        .then(() => {
+                            const { aAllParameterNames, aExtendedParameterNames, oMetadataObject } = oParametersAndExtendedParameters;
+                            return this._getEditorDataAndValue(aAllParameterNames, aExtendedParameterNames, oMetadataObject, oSystemContext);
                         });
-                }
-            }.bind(this));
+                })
+                .then((oResult) => {
+                    oDeferred.resolve(oResult);
+                })
+                .catch((sErrorMessage) => {
+                    oDeferred.reject(sErrorMessage);
+                });
 
             return oDeferred.promise();
         };
@@ -787,12 +736,12 @@ sap.ui.define([
          * @private
          */
         this._extractKeyArrays = function (oParameters) {
-            var oResult = {
+            const oResult = {
                 simple: oParameters && oParameters.simple && Object.keys(oParameters.simple).sort() || [],
                 extended: oParameters && oParameters.extended && Object.keys(oParameters.extended).sort() || []
             };
 
-            var aOnlyExtendedParameters = oResult.extended.filter(function (sExtendedParameter) {
+            const aOnlyExtendedParameters = oResult.extended.filter((sExtendedParameter) => {
                 return oResult.simple.indexOf(sExtendedParameter) < 0;
             });
 
@@ -815,10 +764,15 @@ sap.ui.define([
          * @private
          */
         this.editorSetValue = function (sParameterName, oValueObject, oSystemContext) {
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
             this._storeValue(sParameterName, oValueObject, true, oSystemContext)
-                .then(oDeferred.resolve);
+                .then(() => {
+                    oDeferred.resolve();
+                })
+                .catch(() => {
+                    oDeferred.resolve();
+                });
 
             return oDeferred.promise();
         };