@sapui5/sap.ushell 1.140.0 → 1.141.1

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module exposes a model containing the pages hierarchy to its clients.
- * @version 1.140.0
+ * @version 1.141.1
  */
 sap.ui.define([
     "sap/base/Log",
@@ -219,7 +219,7 @@ sap.ui.define([
             oCdmService = await this._oCdmServicePromise;
         } catch (oError) {
             Log.error("Pages - loadPage: Couldn't resolve CDM Service.", oError, this.COMPONENT_NAME);
-            return Promise.reject(oError);
+            throw oError;
         }
 
         try {
@@ -238,7 +238,7 @@ sap.ui.define([
             return sNewPagePath;
         } catch (oError) {
             Log.error("Pages - loadPage: Failed to gather site data.", oError, this.COMPONENT_NAME);
-            return Promise.reject(oError);
+            throw oError;
         }
     };
 
@@ -258,7 +258,7 @@ sap.ui.define([
             oCdmService = await this._oCdmServicePromise;
         } catch (oError) {
             Log.error("Pages - loadPages: Couldn't resolve CDM Service.", oError, this.COMPONENT_NAME);
-            return Promise.reject(oError);
+            throw oError;
         }
 
         // load and cache all the pages with a single request
@@ -300,7 +300,7 @@ sap.ui.define([
             oCdmService = await this._oCdmServicePromise;
         } catch (oError) {
             Log.error("Pages - findVisualization: Personalization cannot be saved: CDM Service cannot be retrieved.", oError, this.COMPONENT_NAME);
-            return Promise.reject(oError);
+            throw oError;
         }
 
         try {
@@ -331,7 +331,7 @@ sap.ui.define([
             }, []);
         } catch (oError) {
             Log.error("Pages - findVisualization: Couldn't load page, get visualizations or applications.", oError, this.COMPONENT_NAME);
-            return Promise.reject(oError);
+            throw oError;
         }
     };
 
@@ -407,7 +407,7 @@ sap.ui.define([
         } catch (oError) {
             this.setPersonalizationActive(false);
             Log.error("Pages - moveVisualization: Personalization cannot be saved: CDM Service or Page cannot be retrieved.", oError, this.COMPONENT_NAME);
-            return Promise.reject(oError);
+            throw oError;
         }
 
         try {
@@ -447,7 +447,7 @@ sap.ui.define([
             };
         } catch (oError) {
             this.setPersonalizationActive(false);
-            return Promise.reject(oError);
+            throw oError;
         }
     };
 
@@ -485,7 +485,7 @@ sap.ui.define([
         } catch (oError) {
             this.setPersonalizationActive(false);
             Log.error("Pages - deleteVisualization: Personalization cannot be saved: CDM Service or Page cannot be retrieved.", oError, this.COMPONENT_NAME);
-            return Promise.reject(oError);
+            throw oError;
         }
 
         try {
@@ -499,7 +499,7 @@ sap.ui.define([
             return await this._conditionalSavePersonalization(oPage.identification.id);
         } catch (oError) {
             this.setPersonalizationActive(false);
-            return Promise.reject(oError);
+            throw oError;
         }
     };
 
@@ -629,7 +629,7 @@ sap.ui.define([
                     oPage = await oCdmService.getPage(sPageId);
                 } catch (oError) {
                     Log.error("Pages - addVisualization: Personalization cannot be saved: Failed to get page.", oError, this.COMPONENT_NAME);
-                    return Promise.reject(oError);
+                    throw oError;
                 }
 
                 const oSection = oPage.payload.sections[sSectionId || oPage.payload.layout.sectionOrder[0]];
@@ -735,7 +735,7 @@ sap.ui.define([
         } catch (oError) {
             this.setPersonalizationActive(false);
             Log.error("Pages - moveSection: Personalization cannot be saved: CDM Service or Page cannot be retrieved.", oError, this.COMPONENT_NAME);
-            return Promise.reject(oError);
+            throw oError;
         }
 
         try {
@@ -747,7 +747,7 @@ sap.ui.define([
             return await this._conditionalSavePersonalization(sPageId);
         } catch (oError) {
             this.setPersonalizationActive(false);
-            return Promise.reject(oError);
+            throw oError;
         }
     };
 
@@ -792,7 +792,7 @@ sap.ui.define([
         } catch (oError) {
             this.setPersonalizationActive(false);
             Log.error("Pages - addSection: Personalization cannot be saved: CDM Service or Page cannot be retrieved.", oError, this.COMPONENT_NAME);
-            return Promise.reject(oError);
+            throw oError;
         }
 
         try {
@@ -835,7 +835,7 @@ sap.ui.define([
             return await this._conditionalSavePersonalization(sPageId);
         } catch (oError) {
             this.setPersonalizationActive(false);
-            return Promise.reject(oError);
+            throw oError;
         }
     };
 
@@ -867,7 +867,7 @@ sap.ui.define([
         } catch (oError) {
             this.setPersonalizationActive(false);
             Log.error("Pages - deleteSection: Personalization cannot be saved: CDM Service or Page cannot be retrieved.", oError, this.COMPONENT_NAME);
-            return Promise.reject(oError);
+            throw oError;
         }
 
         try {
@@ -876,7 +876,7 @@ sap.ui.define([
             return await this._conditionalSavePersonalization(sPageId);
         } catch (oError) {
             this.setPersonalizationActive(false);
-            return Promise.reject(oError);
+            throw oError;
         }
     };
 
@@ -914,7 +914,7 @@ sap.ui.define([
         } catch (oError) {
             this.setPersonalizationActive(false);
             Log.error("Pages - setSectionVisibility: Personalization cannot be saved: CDM Service or Page cannot be retrieved.", oError, this.COMPONENT_NAME);
-            return Promise.reject(oError);
+            throw oError;
         }
 
         try {
@@ -922,7 +922,7 @@ sap.ui.define([
             return await this._conditionalSavePersonalization(sPageId);
         } catch (oError) {
             this.setPersonalizationActive(false);
-            return Promise.reject(oError);
+            throw oError;
         }
     };
 
@@ -953,7 +953,7 @@ sap.ui.define([
         } catch (oError) {
             this.setPersonalizationActive(false);
             Log.error("Pages - renameSection: Personalization cannot be saved: CDM Service or Page cannot be retrieved.", oError, this.COMPONENT_NAME);
-            return Promise.reject(oError);
+            throw oError;
         }
 
         try {
@@ -961,7 +961,7 @@ sap.ui.define([
             return await this._conditionalSavePersonalization(oPage.identification.id);
         } catch (oError) {
             this.setPersonalizationActive(false);
-            return Promise.reject(oError);
+            throw oError;
         }
     };
 
@@ -998,7 +998,7 @@ sap.ui.define([
         } catch (oError) {
             this.setPersonalizationActive(false);
             Log.error("Pages - resetSection: Personalization cannot be saved: Failed to gather data from CDM Service.", oError, this.COMPONENT_NAME);
-            return Promise.reject(oError);
+            throw oError;
         }
 
         try {
@@ -1041,7 +1041,7 @@ sap.ui.define([
             return await this._conditionalSavePersonalization(oCdmPage.identification.id);
         } catch (oError) {
             this.setPersonalizationActive(false);
-            return Promise.reject(oError);
+            throw oError;
         }
     };
 
@@ -1076,7 +1076,7 @@ sap.ui.define([
         } catch (oError) {
             this.setPersonalizationActive(false);
             Log.error("Pages - resetPage: Personalization cannot be saved: Failed to gather data from CDM Service.", oError, this.COMPONENT_NAME);
-            return Promise.reject(oError);
+            throw oError;
         }
 
         try {
@@ -1088,7 +1088,7 @@ sap.ui.define([
             return await this._conditionalSavePersonalization(oCdmPage.identification.id);
         } catch (oError) {
             this.setPersonalizationActive(false);
-            return Promise.reject(oError);
+            throw oError;
         }
     };
 
@@ -1140,20 +1140,20 @@ sap.ui.define([
                 this._aPagesToBeSaved.splice(iIndex, 1);
 
                 return new Promise((resolve, reject) => {
-                    oCdmService.save(sPage).then(resolve, reject);
+                    oCdmService.save(sPage).then(resolve).catch(reject);
                 }).catch((oError) => {
                     // Add page back to list because it wasn't saved
                     if (this._aPagesToBeSaved.indexOf(sPage) === -1) {
                         this._aPagesToBeSaved.push(sPage);
                     }
-                    return Promise.reject(oError);
+                    throw oError;
                 });
             }));
 
             this._bDirtyState = false;
         } catch (oError) {
             Log.error("Pages - savePersonalization: Personalization cannot be saved: CDM Service cannot be retrieved or the save process encountered an error.", oError, this.COMPONENT_NAME);
-            return Promise.reject(oError);
+            throw oError;
         }
     };
 
@@ -1651,11 +1651,11 @@ sap.ui.define([
     Pages.prototype.updateBookmarks = async function (oIdentifier, oParameters) {
         if (!oIdentifier || !oIdentifier.url || typeof oIdentifier.url !== "string") {
             Log.error("Fail to update bookmark. No valid URL");
-            return Promise.reject("Invalid URL provided");
+            throw new Error("Invalid URL provided");
         }
         if (!oParameters || typeof oParameters !== "object") {
             Log.error(`Fail to update bookmark. No valid parameters, URL is: ${oIdentifier.url}`);
-            return Promise.reject("Missing parameters");
+            throw new Error("Missing parameters");
         }
         let iUpdateCounter = 0;
         const aResult = await Promise.all([
@@ -1830,7 +1830,7 @@ sap.ui.define([
         } catch (oError) {
             this.setPersonalizationActive(false);
             Log.error("Pages - updateVisualization: Personalization cannot be saved: CDM Service or Page cannot be retrieved.", oError, this.COMPONENT_NAME);
-            return Promise.reject(oError);
+            throw oError;
         }
 
         try {
@@ -1844,7 +1844,7 @@ sap.ui.define([
             return await this._conditionalSavePersonalization(oPage.identification.id);
         } catch (oError) {
             this.setPersonalizationActive(false);
-            return Promise.reject(oError);
+            throw oError;
         }
     };
 

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

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's personalization service, which provides generic read and write access to the currently logged on user's
  * personalization settings for the app currently executed in the shell.
  *
- * @version 1.140.0
+ * @version 1.141.1
  * @deprecated since 1.120. Please use {@link sap.ushell.services.PersonalizationV2} instead.
  */
 sap.ui.define([
@@ -411,32 +411,34 @@ sap.ui.define([
 
         const oChosenAdapter = personalizationUtils.pickAdapter(oScope, oTransientAdapter, oPersistentAdapter);
 
-        personalizationUtils.loadAdapter(oChosenAdapter).then((oLoadedAdapter) => {
-            let oLoadPromise;
-            const oContextContainer = new ContextContainer(this, oLoadedAdapter, sPrefixedContainerKey, oAdjustedScope, oComponent);
+        personalizationUtils.loadAdapter(oChosenAdapter)
+            .then((oLoadedAdapter) => {
+                let oLoadPromise;
+                const oContextContainer = new ContextContainer(this, oLoadedAdapter, sPrefixedContainerKey, oAdjustedScope, oComponent);
 
-            // Historically, a sequence getContainer / load was always called.
+                // Historically, a sequence getContainer / load was always called.
 
-            // If an adapter supports returning an initialized container without requiring an subsequent load, it can set the flag
-            // supportsGetWithoutSubsequentLoad and the load call will be omitted in case an empty container is required.
-            const bSupportsGetWithoutSubsequentLoad = (oLoadedAdapter && oLoadedAdapter.supportsGetWithoutSubsequentLoad === true);
+                // If an adapter supports returning an initialized container without requiring an subsequent load, it can set the flag
+                // supportsGetWithoutSubsequentLoad and the load call will be omitted in case an empty container is required.
+                const bSupportsGetWithoutSubsequentLoad = (oLoadedAdapter && oLoadedAdapter.supportsGetWithoutSubsequentLoad === true);
 
-            if (bCreateEmpty && bSupportsGetWithoutSubsequentLoad) {
-                oLoadPromise = new jQuery.Deferred();
-                oLoadPromise.resolve(oContextContainer);
-            } else {
-                oLoadPromise = oContextContainer.load();
-            }
-
-            oLoadPromise.fail(() => {
-                oDeferred.reject();
-            }).done(() => {
-                if (bCreateEmpty || oContextContainer._isExpired()) {
-                    oContextContainer.clear();
+                if (bCreateEmpty && bSupportsGetWithoutSubsequentLoad) {
+                    oLoadPromise = new jQuery.Deferred();
+                    oLoadPromise.resolve(oContextContainer);
+                } else {
+                    oLoadPromise = oContextContainer.load();
                 }
-                oDeferred.resolve(oContextContainer);
-            });
-        }, oDeferred.reject);
+
+                oLoadPromise.fail((oError) => {
+                    oDeferred.reject(oError);
+                }).done(() => {
+                    if (bCreateEmpty || oContextContainer._isExpired()) {
+                        oContextContainer.clear();
+                    }
+                    oDeferred.resolve(oContextContainer);
+                });
+            })
+            .catch(oDeferred.reject);
 
         return oDeferred.promise();
     };
@@ -469,9 +471,9 @@ sap.ui.define([
         const oPrior = this._pendingContainerOperations_cancelAddNext(sContainerKey, null);
         oPrior.always(() => {
             this.getContainer(sContainerKey, oScope) // delays to oPrior! registers a new op!
-                .fail(() => {
+                .fail((oError) => {
                     this._pendingContainerOperations_cancelAddNext(sContainerKey, oDeferred); // reinstall oPrior (!)
-                    oDeferred.reject();
+                    oDeferred.reject(oError);
                 })
                 .done((/* oContainer */) => {
                     // install the "latest" deferred
@@ -481,11 +483,13 @@ sap.ui.define([
                         ? this._oAdapterWindowOnly
                         : this._oAdapterWithBackendAdapter;
 
-                    personalizationUtils.loadAdapter(oAdapter).then((oLoadedAdapter) => {
-                        oLoadedAdapter.delAdapterContainer(sPrefixedContainerKey, oScope)
-                            .fail(oDeferred.reject)
-                            .done(oDeferred.resolve);
-                    }, oDeferred.reject);
+                    personalizationUtils.loadAdapter(oAdapter)
+                        .then((oLoadedAdapter) => {
+                            oLoadedAdapter.delAdapterContainer(sPrefixedContainerKey, oScope)
+                                .fail(oDeferred.reject)
+                                .done(oDeferred.resolve);
+                        })
+                        .catch(oDeferred.reject);
                 });
         });
         return oDeferred.promise();
@@ -668,7 +672,7 @@ sap.ui.define([
         if (bIsSupported) {
             return oAdapter.resetEntirePersonalization();
         }
-        return Promise.reject();
+        throw new Error("Reset entire personalization is not supported");
     };
 
     /**
@@ -695,7 +699,7 @@ sap.ui.define([
                 return bIsSupported;
             } catch (oError) {
                 Log.error(`isResetEntirePersonalizationSupported failed with error: ${oError.toString()}`);
-                return Promise.reject(oError);
+                throw oError;
             }
         }
 

package/src/main/js/sap/ushell/services/PersonalizationV2/ContextContainer.js

@@ -109,9 +109,9 @@ sap.ui.define([
         const that = this;
         oPrior.always(() => {
             that._oAdapterContainer.load()
-                .fail(() => {
+                .fail((oError) => {
                     // TODO
-                    oDeferred.reject();
+                    oDeferred.reject(oError);
                 })
                 .done(() => {
                     that._copyFromAdapter();
@@ -216,10 +216,10 @@ sap.ui.define([
             oPrior.always(() => {
                 try {
                     that._oAdapterContainer.save() // promise
-                        .fail(() => { oSaveDeferred.reject(); })
+                        .fail((oError) => { oSaveDeferred.reject(oError); })
                         .done(() => { oSaveDeferred.resolve(); });
-                } catch (e) {
-                    oSaveDeferred.reject();
+                } catch (oError) {
+                    oSaveDeferred.reject(oError);
                 }
             });
         }
@@ -243,7 +243,7 @@ sap.ui.define([
         const oSaveDeferred = new jQuery.Deferred();
         const oPrior = this._oService._pendingContainerOperations_flushAddNext(this._sContainerKey, oSaveDeferred);
         oPrior
-            .fail(() => { oSaveDeferred.reject(); })
+            .fail((oError) => { oSaveDeferred.reject(oError); })
             .done(() => { oSaveDeferred.resolve(); });
         return ushellUtils.promisify(oSaveDeferred.promise());
     };

package/src/main/js/sap/ushell/services/PersonalizationV2/Personalizer.js

@@ -79,7 +79,7 @@ sap.ui.define([
             })
             .catch((oError)=> {
                 Log.error(`Failed to get personalization data for Personalizer container: ${this._sPersContainer}`, oError);
-                return Promise.reject();
+                throw oError;
             });
     };
 
@@ -100,7 +100,7 @@ sap.ui.define([
             })
             .catch((oError)=> {
                 Log.error(`Failed to get personalization data for Personalizer container: ${this._sPersContainer}`, oError);
-                return Promise.reject();
+                throw oError;
             });
     };
     /**
@@ -119,7 +119,7 @@ sap.ui.define([
             })
             .catch((oError)=> {
                 Log.error(`Fail to delete Personalization data for Personalizer container: ${this._sPersContainer}`, oError);
-                return Promise.reject();
+                throw oError;
             });
     };
 

package/src/main/js/sap/ushell/services/PersonalizationV2/WindowAdapter.js

@@ -57,8 +57,8 @@ sap.ui.define([
                 .done(() => {
                     oDeferred.resolve();
                 })
-                .fail((sMsg) => {
-                    oDeferred.reject(sMsg);
+                .fail((oError) => {
+                    oDeferred.reject(oError);
                 });
         } else {
             oDeferred.resolve();

package/src/main/js/sap/ushell/services/PersonalizationV2/WindowAdapterContainer.js

@@ -77,8 +77,8 @@ sap.ui.define([
                 // store immediately in the window variable so that the second load is satisfied from the window
                 this.WindowAdapter.prototype.data[that._sContainerKey] = personalizationUtils.clone(that._oItemMap.entries);
                 oDeferred.resolve();
-            }).fail((sMsg) => {
-                oDeferred.reject(sMsg);
+            }).fail((oError) => {
+                oDeferred.reject(oError);
             });
         } else {
             this.WindowAdapter.prototype.data[this._sContainerKey] = {};
@@ -100,8 +100,8 @@ sap.ui.define([
         if (this._oBackendContainer) {
             this._oBackendContainer.save().done(() => {
                 oDeferred.resolve();
-            }).fail((sMsg) => {
-                oDeferred.reject(sMsg);
+            }).fail((oError) => {
+                oDeferred.reject(oError);
             });
         } else {
             oDeferred.resolve();

package/src/main/js/sap/ushell/services/PersonalizationV2/utils.js

@@ -137,16 +137,12 @@ sap.ui.define([
      * @since 1.120.0
      * @private
      */
-    function loadAdapter (oAdapter) {
+    async function loadAdapter (oAdapter) {
         if (!oAdapter.lazy) {
             return ushellUtils.promisify(jQuery.when(oAdapter.instance));
         }
 
-        try {
-            return ushellUtils.promisify(oAdapter.create.call(null));
-        } catch (oError) {
-            return Promise.reject(oError);
-        }
+        return ushellUtils.promisify(oAdapter.create.call(null));
     }
 
     /**
@@ -197,7 +193,7 @@ sap.ui.define([
         }
         try {
             return JSON.parse(sJson);
-        } catch (e) {
+        } catch {
             return undefined;
         }
     }
@@ -216,7 +212,7 @@ sap.ui.define([
         }
         try {
             return JSON.parse(JSON.stringify(oObject));
-        } catch (e) {
+        } catch {
             return undefined;
         }
     }

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

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's personalization service, which provides generic read and write access to the currently logged on user's
  * personalization settings for the app currently executed in the shell.
  *
- * @version 1.140.0
+ * @version 1.141.1
  */
 sap.ui.define([
     "sap/base/Log",
@@ -480,22 +480,24 @@ sap.ui.define([
                         ? this._oAdapterWindowOnly
                         : this._oAdapterWithBackendAdapter;
 
-                    personalizationUtils.loadAdapter(oAdapter).then((oLoadedAdapter) => {
-                        oLoadedAdapter.delAdapterContainer(sPrefixedContainerKey, oScope)
-                            .fail((oError) => {
-                                Log.error("Delete failed", oError);
-                                oDeferred.reject();
-                            })
-                            .done(oDeferred.resolve);
-                    }, (oError) => {
-                        Log.error("Delete failed", oError);
-                        oDeferred.reject();
-                    });
+                    personalizationUtils.loadAdapter(oAdapter)
+                        .then((oLoadedAdapter) => {
+                            oLoadedAdapter.delAdapterContainer(sPrefixedContainerKey, oScope)
+                                .fail((oError) => {
+                                    Log.error("Delete failed", oError);
+                                    oDeferred.reject(oError);
+                                })
+                                .done(oDeferred.resolve);
+                        })
+                        .catch((oError) => {
+                            Log.error("Delete failed", oError);
+                            oDeferred.reject(oError);
+                        });
                 })
                 .catch((oError) => {
                     Log.error("Delete failed", oError);
                     this._pendingContainerOperations_cancelAddNext(sContainerKey, oDeferred); // reinstall oPrior (!)
-                    oDeferred.reject();
+                    oDeferred.reject(oError);
                 });
         });
         return ushellUtils.promisify(oDeferred.promise());
@@ -595,7 +597,7 @@ sap.ui.define([
         if (bIsSupported) {
             return oAdapter.resetEntirePersonalization();
         }
-        return Promise.reject();
+        throw new Error("Reset entire personalization is not supported");
     };
 
     /**
@@ -623,7 +625,7 @@ sap.ui.define([
                 return bIsSupported;
             } catch (oError) {
                 Log.error("isResetEntirePersonalizationSupported failed with error:", oError);
-                return Promise.reject(oError);
+                throw oError;
             }
         }
 

package/src/main/js/sap/ushell/services/PluginManager/Extensions.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The extensions which plugins can use to customise the launchpad
  *
- * @version 1.140.0
+ * @version 1.141.1
  * @private
  */
 sap.ui.define([
@@ -46,10 +46,10 @@ sap.ui.define([
         Menu: getMenuExtensions
     };
 
-    function getExtensions (sPluginName, sExtensionName) {
+    async function getExtensions (sPluginName, sExtensionName) {
         const fnExtensionFactory = O_AVAILABLE_EXTENSIONS[sExtensionName];
         if (!fnExtensionFactory) {
-            return Promise.reject(`Unsupported extension: '${sExtensionName}'`);
+            throw new Error(`Unsupported extension: '${sExtensionName}'`);
         }
         return fnExtensionFactory(sPluginName);
     }

package/src/main/js/sap/ushell/services/PluginManager/HeaderExtensions.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The extensions for the ShellHeader
- * @version 1.140.0
+ * @version 1.141.1
  */
 sap.ui.define([
     "sap/ushell/EventHub"

package/src/main/js/sap/ushell/services/PluginManager/MenuExtensions.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The extensions for the MenuBar, an interface to let plugins request menu entry providers.
  *
- * @version 1.140.0
+ * @version 1.141.1
  */
 sap.ui.define(["sap/ushell/Container"], (Container) => {
     "use strict";

package/src/main/js/sap/ushell/services/PluginManager/SimpleExpression.js

@@ -4,7 +4,7 @@
  * This allows to enter simple postfix expressions and to test if an id complies with the expression.
  * It can replace unsafe regular expressions that are vulnerable to ReDoS attacks.
  *
- * @version 1.140.0
+ * @version 1.141.1
  */
 
 sap.ui.define([], () => {