@sapui5/sap.ushell 1.136.3 → 1.138.1

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/XAppStateProcessing.js

@@ -6,7 +6,7 @@
  * Operations in this module are assumed to be executed after the target mapping has been identified (post search).
  *
  * @private
- * @version 1.136.3
+ * @version 1.138.1
  */
 sap.ui.define([
     "sap/ushell/services/ClientSideTargetResolution/Utils",
@@ -16,7 +16,7 @@ sap.ui.define([
     "sap/fe/navigation/SelectionVariant",
     "sap/base/Log",
     "sap/ushell/utils"
-], function (
+], (
     CstrUtils,
     ObjectPath,
     isEmptyObject,
@@ -24,153 +24,68 @@ sap.ui.define([
     SelectionVariant,
     Log,
     ushellUtils
-) {
+) => {
     "use strict";
 
+    function hasExtendedUserDefaults (oResolutionResult) {
+        return oResolutionResult.oNewAppStateMembers && !isEmptyObject(oResolutionResult.oNewAppStateMembers);
+    }
+
     /**
-     * This method modifies a passed Application State if extended User Defaults are to be merged with an AppState or renaming takes place.
-     *
-     * It also *always* takes care of renaming parameters (generating mappedDefaultedParamNames)
-     * Thus it must be invoked in the flow even for targets which do not deal with appstate
-     *
-     * If one or more extended user default values are present, they will be added to a new AppState unless already present
-     *
-     * A new Appstate is created when renaming has to occur or parameters are merged
-     * <note>
-     * If an incoming AppState content is encountered which is not a) undefined or (b) an object,
-     * no new AppState is created and no renaming or default merging takes place.
-     * The original passed AppState is returned unchanged
-     * </note>
-     *
-     * Note that within this function also renaming of default Parameter names takes place
-     * (independent of whether the AppState was tampered with!)
-     *
-     * Technically, we
-     *   a) remove defaulted parameters which are already present
-     *   b) merge the remaining parameters into the appstate
-     *   c) rename the app state, logging collisions
-     *   d) remove effectively not used defaults from defaultParamNames
-     *   e) remap defaultParamNames in case of renameTo
+     * return true iff any of the signature parameters of oMatchingTarget indicate a renaming is happening
      *
-     * The new AppState is mixed it into the resolution result
+     * @param {object} oMatchingTarget a matching target
+     * @returns {boolean} whether a renaming is part of the signature
+     */
+    function hasRenameTo (oMatchingTarget) {
+        return oMatchingTarget.inbound && oMatchingTarget.inbound.signature && oMatchingTarget.inbound.signature.parameters
+            && Object.keys(oMatchingTarget.inbound.signature.parameters).some((sKey) => {
+                return !!(oMatchingTarget.inbound.signature.parameters[sKey].renameTo);
+            });
+    }
+
+    /**
+     * Clean up the unused complex parameter values from the default list
      *
-     * After the invocation, the oMatchingTarget.resolutionResult.oNewAppStateMembers
-     * contains the actually *used* members (members present are deleted from the collection)
-     * Thus all defaultedParameterNames which are thus the following defaultedParameterNames can be a) complex and b) not part of
+     * After the invocation, the oMatchingTarget.resolutionResult.oNewAppStateMembers contains the
+     * actually *used* members (members present are deleted from the collection) Thus all defaultedParameterNames
+     * which are  thus the following defaultedParameterNames can be a) complex and b) not part of
      * oMatchingTarget.resolutionResult.oNewAppStateMembers can be removed, as they were effectively not defaulted
      *
-     * If one or more extended user default values are present, they will be added to a new AppState.
-     * In case there is an existing AppState, it's values will be copied as well.
-     * The new AppState is mixed it into the resolution result.
-     * If no extended user default value is present, the existing AppState is reused.
-     *
-     * @param {object} oMatchingTarget One of the objects returned by {@link #_getMatchingInbounds}.
-     * @param {object} oAppStateService the app state service instance
-     * @returns {Promise<object>} Resolves the mixed resolution result.
+     * @param {object} oMatchingTarget the matching target
      * @private
-     * @since 1.34.0
      */
-    async function mixAppStateIntoResolutionResultAndRename (oMatchingTarget, oAppStateService) {
-        var oNewAppState,
-            oResolutionResult = oMatchingTarget.resolutionResult,
-            oSignature = oMatchingTarget.inbound && (oMatchingTarget.inbound.signature || {}),
-            bChangeExistingAppState = hasExtendedUserDefaults(oResolutionResult)
-                || oSignature.additionalParameters === "ignored"
-                || hasRenameTo(oMatchingTarget);
-
-        if (!bChangeExistingAppState) {
-            cleanup(oMatchingTarget);
-            return oMatchingTarget;
-        }
-
-        var sSourceAppStateKey = oMatchingTarget.intentParamsPlusAllDefaults["sap-xapp-state"]
-            && oMatchingTarget.intentParamsPlusAllDefaults["sap-xapp-state"][0];
-        if (sSourceAppStateKey) {
-            const oAppStateData = await getAppStateData(oAppStateService, sSourceAppStateKey);
-
-            if (isValidAppStateData(oAppStateData)) {
-                if (hasExtendedUserDefaults(oResolutionResult)) {
-                    var oParameterDominatorMap = CstrUtils.constructParameterDominatorMap(oSignature.parameters);
-                    Object.keys(oResolutionResult.oNewAppStateMembers).forEach(function (sAppStateMemberName) {
-                        var aDominatorParams = oParameterDominatorMap[sAppStateMemberName].dominatedBy;
-                        if (isParameterContainedInSelectionVariant(oAppStateData, aDominatorParams)) {
-                            delete oResolutionResult.oNewAppStateMembers[sAppStateMemberName];
-                        }
-                    });
-                }
-
-                var bIgnoreAdditionalParameters = oSignature.additionalParameters === "ignored";
-                if (!hasExtendedUserDefaults(oResolutionResult) && !hasRenameTo(oMatchingTarget) && !bIgnoreAdditionalParameters) {
-                    // keep old AppState
-                    cleanup(oMatchingTarget);
-                    return oMatchingTarget;
-                }
-
-                oNewAppState = oAppStateService.createEmptyAppState(undefined, true);
-                if (oNewAppState) {
-                    oNewAppState.setData(oAppStateData);
-                    await _mergeAppState(oNewAppState, oMatchingTarget);
-                    return oMatchingTarget;
+    function removeUnusedComplexParameterValuesFromDefaultList (oMatchingTarget) {
+        oMatchingTarget.defaultedParamNames = oMatchingTarget.defaultedParamNames.filter((sName) => {
+            if (oMatchingTarget.intentParamsPlusAllDefaults[sName] && !Array.isArray(oMatchingTarget.intentParamsPlusAllDefaults[sName])) {
+                if (!(oMatchingTarget.resolutionResult.oNewAppStateMembers && oMatchingTarget.resolutionResult.oNewAppStateMembers[sName])) {
+                    return false;
                 }
-
-            } else { // invalid app state data
-                delete oResolutionResult.oNewAppStateMembers; // remove all extended user defaults
-                cleanup(oMatchingTarget); // keep old app state
-                return oMatchingTarget;
             }
-        }
-
-        if (hasExtendedUserDefaults(oResolutionResult)) {
-            var oEmptyAppState = oAppStateService.createEmptyAppState(undefined, true);
-            await _mergeAppState(oEmptyAppState, oMatchingTarget);
-            return oMatchingTarget;
-        }
-
-        // no need to rename in nonexisting appstate
-        cleanup(oMatchingTarget);
-        return oMatchingTarget;
+            return true;
+        });
     }
 
-    async function _mergeAppState (oNewAppState0, oMatchingTarget) {
-        // at this point, oNewAppState Members only contains members which are to be added!
-        // (there should be no collisions!)
-        var oNewAppStateData = oNewAppState0.getData() || {},
-            oSelectionVariant,
-            oChangeRecorder = {},
-            oSignature = oMatchingTarget.inbound.signature,
-            oResolutionResult = oMatchingTarget.resolutionResult;
-
-        if (oNewAppStateData.selectionVariant) {
-            oSelectionVariant = new SelectionVariant(JSON.stringify(oNewAppStateData.selectionVariant));
-        } else {
-            oSelectionVariant = new SelectionVariant();
-        }
-
-        if (hasExtendedUserDefaults(oResolutionResult)) {
-            Object.keys(oResolutionResult.oNewAppStateMembers).forEach(function (sName) {
-                oSelectionVariant.massAddSelectOption(sName, oResolutionResult.oNewAppStateMembers[sName].Ranges);
-            });
-        }
-
-        var bIgnoreAdditionalParameters = oSignature.additionalParameters === "ignored";
-        oSelectionVariant = renameAndRemoveDuplicates(oSelectionVariant, oChangeRecorder, oSignature.parameters, bIgnoreAdditionalParameters);
-
-        if (oSelectionVariant.getParameterNames().length !== 0 || oSelectionVariant.getSelectOptionsPropertyNames().length !== 0 || oChangeRecorder.deleted) {
-            oNewAppStateData.selectionVariant = oSelectionVariant.toJSONObject();
-        }
-
-        if (!oChangeRecorder.changed && !oChangeRecorder.deleted && !hasExtendedUserDefaults(oResolutionResult)) {
-            // there was no effective change -> retain old appstate
-            cleanup(oMatchingTarget);
-            return;
-        }
-
-        oNewAppState0.setData(oNewAppStateData);
-        await ushellUtils.promisify(oNewAppState0.save());
-
-        oMatchingTarget.intentParamsPlusAllDefaults["sap-xapp-state"] = [oNewAppState0.getKey()];
-        oMatchingTarget.mappedIntentParamsPlusSimpleDefaults["sap-xapp-state"] = [oNewAppState0.getKey()];
-        cleanup(oMatchingTarget);
+    /**
+     * read: defaultedParamNames
+     *       inbound.signature.parameters
+     * created: mappedDefaultedParamNames
+     *
+     * @param {object} oMatchingTarget the matching target
+     * @private
+     */
+    function mapDefaultParameterNames (oMatchingTarget) {
+        const oParameters = (ObjectPath.get("inbound.signature.parameters", oMatchingTarget) || {});
+        const oMap = {};
+        oMatchingTarget.defaultedParamNames.forEach((sName) => {
+            const sNewName = (oParameters[sName] && oParameters[sName].renameTo) || sName;
+            if (oMap[sNewName]) {
+                Log.error(`renaming of defaultedParamNames creates duplicates${sName}->${sNewName}`);
+            } else {
+                oMap[sNewName] = true;
+            }
+        });
+        oMatchingTarget.mappedDefaultedParamNames = Object.keys(oMap).sort();
     }
 
     function cleanup (oMatchingTarget) {
@@ -181,12 +96,17 @@ sap.ui.define([
         delete oMatchingTarget.resolutionResult.oNewAppStateMembers;
     }
 
-    function hasExtendedUserDefaults (oResolutionResult) {
-        return oResolutionResult.oNewAppStateMembers && !isEmptyObject(oResolutionResult.oNewAppStateMembers);
+    async function getAppStateData (oAppStateService, sAppStateKey) {
+        const oAppState = await ushellUtils.promisify(oAppStateService.getAppState(sAppStateKey));
+        return oAppState.getData();
+    }
+
+    function isValidAppStateData (oData) {
+        return oData === undefined || isPlainObject(oData);
     }
 
     function isPresentProperty (aList, aParamName) {
-        return Array.isArray(aList) && aList.some(function (oMember) {
+        return Array.isArray(aList) && aList.some((oMember) => {
             return (aParamName.indexOf(oMember) !== -1);
         });
     }
@@ -194,9 +114,9 @@ sap.ui.define([
     function isParameterContainedInSelectionVariant (oAppStateData, aParamName) {
         // check whether parameter exists as part of selectionVariant.Parameters or SelectOptions
         if (oAppStateData && oAppStateData.selectionVariant) {
-            var oSelectionVariant = new SelectionVariant(JSON.stringify(oAppStateData.selectionVariant)),
-                aSelectionVariantSelectOptionsPropertyNames = (oSelectionVariant.getSelectOptionsPropertyNames() || []),
-                aSelectionVariantParameterNames = (oSelectionVariant.getParameterNames() || []);
+            const oSelectionVariant = new SelectionVariant(JSON.stringify(oAppStateData.selectionVariant));
+            const aSelectionVariantSelectOptionsPropertyNames = (oSelectionVariant.getSelectOptionsPropertyNames() || []);
+            const aSelectionVariantParameterNames = (oSelectionVariant.getParameterNames() || []);
 
             if (isPresentProperty(aSelectionVariantSelectOptionsPropertyNames, aParamName) ||
                 isPresentProperty(aSelectionVariantParameterNames, aParamName)) {
@@ -207,14 +127,14 @@ sap.ui.define([
     }
 
     function renameAndRemoveDuplicates (oSelectionVariant, oRecordChange, oParameters, bIgnoreAdditionalParameters) {
-        var oResultingSelectionVariant = new SelectionVariant(),
-            aSelectionVariantParameterNames = (oSelectionVariant.getParameterNames() || []),
-            aSelectionVariantSelectOptionsPropertyNames = (oSelectionVariant.getSelectOptionsPropertyNames() || []),
-            sParamValue,
-            aSelectOption;
+        const oResultingSelectionVariant = new SelectionVariant();
+        const aSelectionVariantParameterNames = (oSelectionVariant.getParameterNames() || []);
+        const aSelectionVariantSelectOptionsPropertyNames = (oSelectionVariant.getSelectOptionsPropertyNames() || []);
+        let sParamValue;
+        let aSelectOption;
 
         // Rename parameters and remove duplicates
-        aSelectionVariantParameterNames.forEach(function (sParamName) {
+        aSelectionVariantParameterNames.forEach((sParamName) => {
             sParamValue = oSelectionVariant.getParameter(sParamName);
 
             // ignore parameter if it's not required
@@ -227,11 +147,10 @@ sap.ui.define([
                 // Check whether a parameter with the -renameTo- name already exists as part of the SelectionVariant
                 if ((oResultingSelectionVariant.getParameter(oParameters[sParamName].renameTo) === undefined) &&
                     (oResultingSelectionVariant.getSelectOption(oParameters[sParamName].renameTo) === undefined)) {
-
                     oResultingSelectionVariant.addParameter(oParameters[sParamName].renameTo, sParamValue);
                     oRecordChange.changed = true;
                 } else {
-                    Log.error("renaming of appstate creates duplicates " + sParamName + "->" + oParameters[sParamName].renameTo);
+                    Log.error(`renaming of appstate creates duplicates ${sParamName}->${oParameters[sParamName].renameTo}`);
                 }
             } else if ((oResultingSelectionVariant.getParameter(sParamName) === undefined) &&
                 (oResultingSelectionVariant.getSelectOption(sParamName) === undefined)) {
@@ -240,7 +159,7 @@ sap.ui.define([
         });
 
         // Rename SelectOptions and remove duplicates
-        aSelectionVariantSelectOptionsPropertyNames.forEach(function (sSelectOptionPropertyName) {
+        aSelectionVariantSelectOptionsPropertyNames.forEach((sSelectOptionPropertyName) => {
             aSelectOption = oSelectionVariant.getSelectOption(sSelectOptionPropertyName);
 
             // ignore parameter if it's not required
@@ -256,7 +175,7 @@ sap.ui.define([
                     oResultingSelectionVariant.massAddSelectOption(oParameters[sSelectOptionPropertyName].renameTo, aSelectOption);
                     oRecordChange.changed = true;
                 } else {
-                    Log.error("renaming of appstate creates duplicates " + sSelectOptionPropertyName + "->" + oParameters[sSelectOptionPropertyName].renameTo);
+                    Log.error(`renaming of appstate creates duplicates ${sSelectOptionPropertyName}->${oParameters[sSelectOptionPropertyName].renameTo}`);
                 }
             } else if ((oResultingSelectionVariant.getSelectOption(sSelectOptionPropertyName) === undefined) &&
                 (oResultingSelectionVariant.getParameter(sSelectOptionPropertyName) === undefined)) {
@@ -265,90 +184,169 @@ sap.ui.define([
         });
 
         // Remove all parameters from source SelectionVariant
-        aSelectionVariantParameterNames.forEach(function (sParamName) {
+        aSelectionVariantParameterNames.forEach((sParamName) => {
             oSelectionVariant.removeParameter(sParamName);
         });
         // Remove all SelectOptions from source SelectionVariant
-        aSelectionVariantSelectOptionsPropertyNames.forEach(function (sSelectOptionPropertyName) {
+        aSelectionVariantSelectOptionsPropertyNames.forEach((sSelectOptionPropertyName) => {
             oSelectionVariant.removeSelectOption(sSelectOptionPropertyName);
         });
 
         // Copy all parameters and SelectOptions from resulting SelectionVariant into source SelectionVariant,
         // because other important attributes as ID, Text, ParameterContextUrl, FilterContextUrl need to be kept as they were before
-        oResultingSelectionVariant.getParameterNames().forEach(function (sParamName) {
+        oResultingSelectionVariant.getParameterNames().forEach((sParamName) => {
             oSelectionVariant.addParameter(sParamName, oResultingSelectionVariant.getParameter(sParamName));
         });
-        oResultingSelectionVariant.getSelectOptionsPropertyNames().forEach(function (sSelectOptionPropertyName) {
+        oResultingSelectionVariant.getSelectOptionsPropertyNames().forEach((sSelectOptionPropertyName) => {
             oSelectionVariant.massAddSelectOption(sSelectOptionPropertyName, oResultingSelectionVariant.getSelectOption(sSelectOptionPropertyName));
         });
 
         return oSelectionVariant;
     }
 
-    function isValidAppStateData (oData) {
-        return oData === undefined || isPlainObject(oData);
-    }
+    async function _mergeAppState (oNewAppState0, oMatchingTarget) {
+        // at this point, oNewAppState Members only contains members which are to be added!
+        // (there should be no collisions!)
+        const oNewAppStateData = oNewAppState0.getData() || {};
+        let oSelectionVariant;
+        const oChangeRecorder = {};
+        const oSignature = oMatchingTarget.inbound.signature;
+        const oResolutionResult = oMatchingTarget.resolutionResult;
 
-    /**
-     * return true iff any of the signature parameters of oMatchingTarget indicate a renaming is happening
-     *
-     * @param {object} oMatchingTarget a matching target
-     * @returns {boolean} whether a renaming is part of the signature
-     */
-    function hasRenameTo (oMatchingTarget) {
-        return oMatchingTarget.inbound && oMatchingTarget.inbound.signature && oMatchingTarget.inbound.signature.parameters
-            && Object.keys(oMatchingTarget.inbound.signature.parameters).some(function (sKey) {
-                return !!(oMatchingTarget.inbound.signature.parameters[sKey].renameTo);
+        if (oNewAppStateData.selectionVariant) {
+            oSelectionVariant = new SelectionVariant(JSON.stringify(oNewAppStateData.selectionVariant));
+        } else {
+            oSelectionVariant = new SelectionVariant();
+        }
+
+        if (hasExtendedUserDefaults(oResolutionResult)) {
+            Object.keys(oResolutionResult.oNewAppStateMembers).forEach((sName) => {
+                oSelectionVariant.massAddSelectOption(sName, oResolutionResult.oNewAppStateMembers[sName].Ranges);
             });
+        }
+
+        const bIgnoreAdditionalParameters = oSignature.additionalParameters === "ignored";
+        oSelectionVariant = renameAndRemoveDuplicates(oSelectionVariant, oChangeRecorder, oSignature.parameters, bIgnoreAdditionalParameters);
+
+        if (oSelectionVariant.getParameterNames().length !== 0 || oSelectionVariant.getSelectOptionsPropertyNames().length !== 0 || oChangeRecorder.deleted) {
+            oNewAppStateData.selectionVariant = oSelectionVariant.toJSONObject();
+        }
+
+        if (!oChangeRecorder.changed && !oChangeRecorder.deleted && !hasExtendedUserDefaults(oResolutionResult)) {
+            // there was no effective change -> retain old appstate
+            cleanup(oMatchingTarget);
+            return;
+        }
+
+        oNewAppState0.setData(oNewAppStateData);
+        await ushellUtils.promisify(oNewAppState0.save());
+
+        oMatchingTarget.intentParamsPlusAllDefaults["sap-xapp-state"] = [oNewAppState0.getKey()];
+        oMatchingTarget.mappedIntentParamsPlusSimpleDefaults["sap-xapp-state"] = [oNewAppState0.getKey()];
+        cleanup(oMatchingTarget);
     }
 
     /**
-     * Clean up the unused complex parameter values from the default list
+     * This method modifies a passed Application State if extended User Defaults are to be merged with an AppState or renaming takes place.
      *
-     * After the invocation, the oMatchingTarget.resolutionResult.oNewAppStateMembers contains the
-     * actually *used* members (members present are deleted from the collection) Thus all defaultedParameterNames
-     * which are  thus the following defaultedParameterNames can be a) complex and b) not part of
+     * It also *always* takes care of renaming parameters (generating mappedDefaultedParamNames)
+     * Thus it must be invoked in the flow even for targets which do not deal with appstate
+     *
+     * If one or more extended user default values are present, they will be added to a new AppState unless already present
+     *
+     * A new Appstate is created when renaming has to occur or parameters are merged
+     * <note>
+     * If an incoming AppState content is encountered which is not a) undefined or (b) an object,
+     * no new AppState is created and no renaming or default merging takes place.
+     * The original passed AppState is returned unchanged
+     * </note>
+     *
+     * Note that within this function also renaming of default Parameter names takes place
+     * (independent of whether the AppState was tampered with!)
+     *
+     * Technically, we
+     *   a) remove defaulted parameters which are already present
+     *   b) merge the remaining parameters into the appstate
+     *   c) rename the app state, logging collisions
+     *   d) remove effectively not used defaults from defaultParamNames
+     *   e) remap defaultParamNames in case of renameTo
+     *
+     * The new AppState is mixed it into the resolution result
+     *
+     * After the invocation, the oMatchingTarget.resolutionResult.oNewAppStateMembers
+     * contains the actually *used* members (members present are deleted from the collection)
+     * Thus all defaultedParameterNames which are thus the following defaultedParameterNames can be a) complex and b) not part of
      * oMatchingTarget.resolutionResult.oNewAppStateMembers can be removed, as they were effectively not defaulted
      *
-     * @param {object} oMatchingTarget the matching target
+     * If one or more extended user default values are present, they will be added to a new AppState.
+     * In case there is an existing AppState, it's values will be copied as well.
+     * The new AppState is mixed it into the resolution result.
+     * If no extended user default value is present, the existing AppState is reused.
+     *
+     * @param {object} oMatchingTarget One of the objects returned by {@link #_getMatchingInbounds}.
+     * @param {object} oAppStateService the app state service instance
+     * @returns {Promise<object>} Resolves the mixed resolution result.
      * @private
+     * @since 1.34.0
      */
-    function removeUnusedComplexParameterValuesFromDefaultList (oMatchingTarget) {
-        oMatchingTarget.defaultedParamNames = oMatchingTarget.defaultedParamNames.filter(function (sName) {
-            if (oMatchingTarget.intentParamsPlusAllDefaults[sName] && !Array.isArray(oMatchingTarget.intentParamsPlusAllDefaults[sName])) {
-                if (!(oMatchingTarget.resolutionResult.oNewAppStateMembers && oMatchingTarget.resolutionResult.oNewAppStateMembers[sName])) {
-                    return false;
+    async function mixAppStateIntoResolutionResultAndRename (oMatchingTarget, oAppStateService) {
+        let oNewAppState;
+        const oResolutionResult = oMatchingTarget.resolutionResult;
+        const oSignature = oMatchingTarget.inbound && (oMatchingTarget.inbound.signature || {});
+        const bChangeExistingAppState = hasExtendedUserDefaults(oResolutionResult)
+                || oSignature.additionalParameters === "ignored"
+                || hasRenameTo(oMatchingTarget);
+
+        if (!bChangeExistingAppState) {
+            cleanup(oMatchingTarget);
+            return oMatchingTarget;
+        }
+
+        const sSourceAppStateKey = oMatchingTarget.intentParamsPlusAllDefaults["sap-xapp-state"]
+            && oMatchingTarget.intentParamsPlusAllDefaults["sap-xapp-state"][0];
+        if (sSourceAppStateKey) {
+            const oAppStateData = await getAppStateData(oAppStateService, sSourceAppStateKey);
+
+            if (isValidAppStateData(oAppStateData)) {
+                if (hasExtendedUserDefaults(oResolutionResult)) {
+                    const oParameterDominatorMap = CstrUtils.constructParameterDominatorMap(oSignature.parameters);
+                    Object.keys(oResolutionResult.oNewAppStateMembers).forEach((sAppStateMemberName) => {
+                        const aDominatorParams = oParameterDominatorMap[sAppStateMemberName].dominatedBy;
+                        if (isParameterContainedInSelectionVariant(oAppStateData, aDominatorParams)) {
+                            delete oResolutionResult.oNewAppStateMembers[sAppStateMemberName];
+                        }
+                    });
                 }
-            }
-            return true;
-        });
-    }
 
-    /**
-     * read: defaultedParamNames
-     *       inbound.signature.parameters
-     * created: mappedDefaultedParamNames
-     *
-     * @param {object} oMatchingTarget the matching target
-     * @private
-     */
-    function mapDefaultParameterNames (oMatchingTarget) {
-        var oParameters = (ObjectPath.get("inbound.signature.parameters", oMatchingTarget) || {}),
-            oMap = {};
-        oMatchingTarget.defaultedParamNames.forEach(function (sName) {
-            var sNewName = (oParameters[sName] && oParameters[sName].renameTo) || sName;
-            if (oMap[sNewName]) {
-                Log.error("renaming of defaultedParamNames creates duplicates" + sName + "->" + sNewName);
-            } else {
-                oMap[sNewName] = true;
+                const bIgnoreAdditionalParameters = oSignature.additionalParameters === "ignored";
+                if (!hasExtendedUserDefaults(oResolutionResult) && !hasRenameTo(oMatchingTarget) && !bIgnoreAdditionalParameters) {
+                    // keep old AppState
+                    cleanup(oMatchingTarget);
+                    return oMatchingTarget;
+                }
+
+                oNewAppState = oAppStateService.createEmptyAppState(undefined, true);
+                if (oNewAppState) {
+                    oNewAppState.setData(oAppStateData);
+                    await _mergeAppState(oNewAppState, oMatchingTarget);
+                    return oMatchingTarget;
+                }
+            } else { // invalid app state data
+                delete oResolutionResult.oNewAppStateMembers; // remove all extended user defaults
+                cleanup(oMatchingTarget); // keep old app state
+                return oMatchingTarget;
             }
-        });
-        oMatchingTarget.mappedDefaultedParamNames = Object.keys(oMap).sort();
-    }
+        }
 
-    async function getAppStateData (oAppStateService, sAppStateKey) {
-        const oAppState = await ushellUtils.promisify(oAppStateService.getAppState(sAppStateKey));
-        return oAppState.getData();
+        if (hasExtendedUserDefaults(oResolutionResult)) {
+            const oEmptyAppState = oAppStateService.createEmptyAppState(undefined, true);
+            await _mergeAppState(oEmptyAppState, oMatchingTarget);
+            return oMatchingTarget;
+        }
+
+        // no need to rename in nonexisting appstate
+        cleanup(oMatchingTarget);
+        return oMatchingTarget;
     }
 
     return {

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

@@ -29,7 +29,7 @@
  * In the future, the custom resolver mechanism should be probably moved towards modifying (or only adding to the list of Inbounds),
  * this way a single data source has to be altered to support consistently getLinks, isIntentSupported.
  *
- * @version 1.136.3
+ * @version 1.138.1
  */
 sap.ui.define([
     "sap/base/Log",