@sapui5/sap.ushell 1.119.2 → 1.120.0

package/src/main/js/sap/ushell/renderers/fiori2/Shell.view.js

@@ -18,7 +18,7 @@
     "sap/ui/model/json/JSONModel",
     "sap/ui/core/mvc/XMLView",
     "sap/ui/core/Core",
-    "sap/ushell/renderers/fiori2/ShellLayout"
+    "sap/ushell/renderer/ShellLayout"
 ], function (
     Log,
     Device,
@@ -78,11 +78,11 @@
 
         /**
          * Most of the following code acts just as placeholder for new Unified Shell Control.
-         * Shell.view.js uses deprecated and synchronous APIs. It is replaced by ShellAsync.view.js
+         * renderers/fiori2/Shell.view.js uses deprecated and synchronous APIs. It is replaced by renderer/Shell.view.js
          *
          * @returns {sap.ui.core.Control} The root control of the Renderer
          *
-         * @deprecated since 1.99. Please use {@link sap.ushell.renderers.fiori2.ShellAsync.view} instead.
+         * @deprecated since 1.99. Please use {@link sap.ushell.renderer.Shell.view} instead.
          */
         createContent: function () {
             // Change config if more then three buttons moved to the header
@@ -382,7 +382,7 @@
         createAllMyAppsView: function () {
             return XMLView.create({
                 id: "allMyAppsView",
-                viewName: "sap.ushell.renderers.fiori2.allMyApps.AllMyApps"
+                viewName: "sap.ushell.renderer.allMyApps.AllMyApps"
             }).then(function (allMyAppsView) {
                 allMyAppsView.setModel(this.getShellModel());
                 allMyAppsView.setModel(resources.i18nModel, "i18n");
@@ -575,7 +575,7 @@
         /**
          * Adds a binding which is destroyed on Renderer destroy
          * @param {sap.ui.model.Binding} oBinding The Binding
-         * @see sap.ushell.renderers.fiori2.Shell.controller#onExit
+         * @see sap.ushell.renderer.Shell.controller#onExit
          *
          * @private
          * @since 1.114.0
@@ -586,7 +586,7 @@
 
         /**
          * @param {sap.ui.model.Binding} oBinding The Binding
-         * @see sap.ushell.renderers.fiori2.Shell.controller#onExit
+         * @see sap.ushell.renderer.Shell.controller#onExit
          *
          * @private
          * @since 1.114.0
@@ -597,7 +597,7 @@
 
         /**
          * @param {sap.ui.core.Control} oControl The Control
-         * @see sap.ushell.renderers.fiori2.Shell.controller#onExit
+         * @see sap.ushell.renderer.Shell.controller#onExit
          *
          * @private
          * @since 1.114.0

package/src/main/js/sap/ushell/renderers/fiori2/allMyApps/AllMyAppsKeyboardHandler.js

@@ -1,98 +1,13 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
+ /**
+  * File was moved to sap/ushell/renderer/allMyApps/AllMyAppsKeyboardHandler
+  * @deprecated since 1.120.0
+  */
 sap.ui.define([
-    "sap/ui/events/KeyCodes",
-    "sap/ui/thirdparty/jquery"
-], function (KeyCodes, jQuery) {
+    "sap/ushell/renderer/allMyApps/AllMyAppsKeyboardHandler"
+], function (AllMyAppsKeyboardHandler) {
     "use strict";
 
-    var KeyboardNavigation = function () { };
-
-    KeyboardNavigation.prototype.init = function (oView) {
-        oView.byId("sapUshellAllMyAppsDataSourcesList").addEventDelegate({
-            // on tab next (Tab)
-            onsaptabnext: function (e) {
-                var aDetailAppsElements = jQuery(".sapUshellAllMyAppsListItem");
-
-                this.jqDetailAreaElement = oView.byId("oItemsContainerlist").$();
-                this.jqDetailAreaElement.on("keydown.keyboardNavigation", this.keydownHandler.bind(this));
-
-                // Focus the first App in the Detail Area.
-                this._setItemFocus(e, aDetailAppsElements[0]);
-            }.bind(this)
-        });
-        oView.byId("oItemsContainerlist").addEventDelegate({
-            onsaptabprevious: function (/*e*/) {
-                var oCurrentlyFocusedAppElement = jQuery('.sapUshellAllMyAppsListItem[tabindex="0"]')[0];
-
-                jQuery(oCurrentlyFocusedAppElement).attr("tabindex", -1);
-            },
-            onsaptabnext: function (/*e*/) {
-                var aCustomPanel = jQuery(".sapUshellAllMyAppsCustomPanel");
-                var oCurrentlyFocusedAppElement = jQuery('.sapUshellAllMyAppsListItem[tabindex="0"]')[0];
-
-                // Since the is no custom panel, there is no need to "remember" the last selected item
-                if (aCustomPanel.length === 0) {
-                    jQuery(oCurrentlyFocusedAppElement).attr("tabindex", -1);
-                }
-            }
-        });
-        // Clicking SHIFT+TAB from the custom panel should return the focus to the last selected item/app.
-        // Clicking TAB should move the focus to the master list and "forget" the last selected item/app
-        oView.byId("sapUshellAllMyAppsCustomPanel").addEventDelegate({
-            onsaptabnext: function (e) {
-                var oCurrentlyFocusedAppElement = jQuery('.sapUshellAllMyAppsListItem[tabindex="0"]')[0];
-                jQuery(oCurrentlyFocusedAppElement).attr("tabindex", -1);
-            }
-        });
-    };
-
-    KeyboardNavigation.prototype.keydownHandler = function (e) {
-        switch (e.keyCode) {
-            case KeyCodes.ARROW_UP:
-                this.arrowKeyHandler(e, -2);
-                break;
-            case KeyCodes.ARROW_DOWN:
-                this.arrowKeyHandler(e, 2);
-                break;
-            case KeyCodes.ARROW_LEFT:
-                this.arrowKeyHandler(e, -1);
-                break;
-            case KeyCodes.ARROW_RIGHT:
-                this.arrowKeyHandler(e, 1);
-                break;
-            default:
-                break;
-        }
-    };
-
-    KeyboardNavigation.prototype.arrowKeyHandler = function (e, iDirectionFactor) {
-        var aDetailAppsElements = jQuery(".sapUshellAllMyAppsListItem").toArray();
-        var oCurrentlyFocusedAppElement = jQuery('.sapUshellAllMyAppsListItem[tabindex="0"]')[0];
-        var iCurrentlyFocusedIndex = aDetailAppsElements.indexOf(oCurrentlyFocusedAppElement);
-        var oElementToFocus = aDetailAppsElements[iCurrentlyFocusedIndex + iDirectionFactor];
-
-        if (oElementToFocus) {
-            jQuery(oCurrentlyFocusedAppElement).attr("tabindex", -1);
-            this._setItemFocus(e, oElementToFocus);
-        }
-    };
-
-    KeyboardNavigation.prototype._setItemFocus = function (e, oElementToFocus) {
-        if (oElementToFocus) {
-            e.preventDefault();
-            e.stopImmediatePropagation();
-            jQuery(oElementToFocus).attr("tabindex", 0);
-            oElementToFocus.focus();
-        }
-    };
-
-    KeyboardNavigation.prototype.destroy = function () {
-        if (this.jqDetailAreaElement) {
-            this.jqDetailAreaElement.off(".keyboardNavigation");
-        }
-        delete this.jqDetailAreaElement;
-    };
-
-    return new KeyboardNavigation();
+    return AllMyAppsKeyboardHandler;
 }, /* bExport= */ true);

package/src/main/js/sap/ushell/renderers/fiori2/allMyApps/AllMyAppsManager.js

@@ -1,443 +1,13 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
-sap.ui.define([
-    "sap/ui/thirdparty/jquery",
-    "sap/ushell/resources",
-    "sap/ushell/library"
-], function (
-    jQuery,
-    resources,
-    ushellLibrary
-) {
+ /**
+  * File was moved to sap/ushell/renderer/allMyApps/AllMyAppsManager
+  * @deprecated since 1.120.0
+  */
+ sap.ui.define([
+    "sap/ushell/renderer/allMyApps/AllMyAppsManager"
+], function (AllMyAppsManager) {
     "use strict";
 
-    var AllMyAppsProviderType = ushellLibrary.AllMyAppsProviderType;
-
-    /**
-     * Reading apps data from all the data_sources/providers and updating AllMyApps model.
-     *
-     * loadAppsData is the main function that is responsible for reading apps data from all data_sources/providers,
-     * using the following functionality:
-     *   - _handleGroupsData - Reading groups data
-     *   - _handleExternalProvidersData - Reading external_providers data
-     *   - _addCatalogToModel - Reading catalogs data
-     */
-    var AllMyAppsManager = function () { };
-
-    AllMyAppsManager.prototype.loadAppsData = function (oModel, oPopoverObject, loadCatalogs) {
-        return sap.ushell.Container.getServiceAsync("AllMyApps")
-            .then(function (AllMyApps) {
-                this.oPopover = oPopoverObject;
-
-                if (!AllMyApps.isEnabled()) {
-                    return;
-                }
-
-                this.iNumberOfProviders = 0;
-                this.oModel = oModel;
-
-                if (AllMyApps.isHomePageAppsEnabled()) {
-                    this._handleGroupsData();
-                }
-
-                if (AllMyApps.isExternalProviderAppsEnabled()) {
-                    this._handleExternalProvidersData(oModel);
-                }
-
-                if (AllMyApps.isCatalogAppsEnabled()) {
-                    this._handleCatalogs(loadCatalogs);
-                }
-
-                if (!AllMyApps.isCatalogAppsEnabled() || (AllMyApps.isCatalogAppsEnabled() && loadCatalogs)) {
-                    // Publish event all my apps finished loading.
-                    var oEventBus = sap.ui.getCore().getEventBus();
-                    oEventBus.publish("launchpad", "allMyAppsMasterLoaded");
-                }
-            }.bind(this));
-    };
-
-    AllMyAppsManager.prototype._handleGroupsData = function () {
-        var oGroupsDataPromise = this._getGroupsData();
-        var oHomeModelEntry = { title: resources.i18n.getText("allMyApps_homeEntryTitle") };
-        var aProvidersArray;
-
-        // Get groups apps
-        return new Promise(function (resolve, reject) {
-            oGroupsDataPromise.done(resolve).fail(reject);
-        })
-            .then(function (oGroupsArray) {
-                oHomeModelEntry.groups = oGroupsArray;
-                oHomeModelEntry.type = AllMyAppsProviderType.HOME;
-
-                if (oGroupsArray.length === 0) {
-                    return;
-                }
-
-                // Home (groups) provider should be at the 1st place in the providers list,
-                // hence we use array unshift in order to put it at index 0
-                aProvidersArray = this.oModel.getProperty("/AppsData");
-                if (aProvidersArray) {
-                    var index = this._getIndexByType(aProvidersArray, oHomeModelEntry.type);
-                    if (index !== undefined) {
-                        aProvidersArray[index] = oHomeModelEntry;
-                    } else {
-                        aProvidersArray.unshift(oHomeModelEntry);
-                    }
-                }
-
-                this.oModel.setProperty("/AppsData", aProvidersArray);
-                this.iNumberOfProviders += 1;
-            }.bind(this));
-    };
-
-    AllMyAppsManager.prototype._getIndexByType = function (providersArray, providerType) {
-        if (providersArray.length <= 0) {
-            return 0;
-        }
-
-        for (var i = 0; i < providersArray.length; i++) {
-            if (providersArray[i].type === providerType) {
-                return i;
-            }
-        }
-    };
-
-    AllMyAppsManager.prototype._getGroupsData = function () {
-        var oDeferred = new jQuery.Deferred();
-        sap.ushell.Container.getServiceAsync("LaunchPage")
-            .then(function (LaunchPage) {
-                return Promise.all([
-                    LaunchPage.getDefaultGroup(),
-                    LaunchPage.getGroups()
-                ]);
-            })
-            .then(function (aResults) {
-                this.oDefaultGroup = aResults[0];
-                var aGroups = aResults[1];
-                var aPromises = [];
-                aGroups.forEach(function (oGroup) {
-                    aPromises.push(this._getFormattedGroup(oGroup));
-                }.bind(this));
-                return Promise.all(aPromises);
-            }.bind(this))
-            .then(function (aFormattedGroups) {
-                var aFilteredGroups = aFormattedGroups.filter(function (oFormattedGroup) {
-                    return oFormattedGroup && (oFormattedGroup.apps.length > 0 || oFormattedGroup.numberCustomTiles > 0);
-                });
-                oDeferred.resolve(aFilteredGroups);
-            });
-
-        return oDeferred.promise();
-    };
-
-    AllMyAppsManager.prototype._getFormattedGroup = function (oGroup) {
-        var oFormattedGroup;
-        var sGroupTitle;
-        var aTiles;
-
-        return sap.ushell.Container.getServiceAsync("LaunchPage")
-            .then(function (LaunchPage) {
-                // @TODO What about hidden groups?  => isGroupVisible(group) === true
-                if (LaunchPage.isGroupVisible(oGroup) === false) {
-                    return;
-                }
-                // The default group gets "My Home" title
-                if (LaunchPage.getGroupId(oGroup) === LaunchPage.getGroupId(this.oDefaultGroup)) {
-                    sGroupTitle = resources.i18n.getText("my_group");
-                } else {
-                    sGroupTitle = LaunchPage.getGroupTitle(oGroup);
-                }
-                oFormattedGroup = {};
-                oFormattedGroup.title = sGroupTitle;
-                oFormattedGroup.apps = [];
-
-                aTiles = LaunchPage.getGroupTiles(oGroup);
-                return this._getFormattedGroupApps(aTiles);
-            }.bind(this))
-            .then(function (oResult) {
-                if (!oResult) {
-                    return;
-                }
-                oFormattedGroup.apps = oResult.aFormattedApps;
-                oFormattedGroup.numberCustomTiles = oResult.iNumberOfCustomTiles;
-                if (oResult.iNumberOfCustomTiles === 1) {
-                    oFormattedGroup.sCustomLabel = resources.i18n.getText("allMyApps_customStringSingle");
-                    oFormattedGroup.sCustomLink = resources.i18n.getText("allMyApps_customLinkHomePageSingle");
-                } else {
-                    oFormattedGroup.sCustomLabel = resources.i18n.getText("allMyApps_customString", [oResult.iNumberOfCustomTiles]);
-                    oFormattedGroup.sCustomLink = resources.i18n.getText("allMyApps_customLinkHomePage");
-                }
-                oFormattedGroup.handlePress = this._onHandleGroupPress;
-                return oFormattedGroup;
-            }.bind(this));
-    };
-
-    AllMyAppsManager.prototype._getFormattedGroupApps = function (oApps) {
-        var aFormattedApps = [];
-        var iNumberOfCustomTiles = 0;
-        return sap.ushell.Container.getServiceAsync("LaunchPage")
-            .then(function (LaunchPage) {
-                var aPromises = [];
-                oApps.forEach(function (oTile) {
-                    if (LaunchPage.isTileIntentSupported(oTile)) {
-                        var oGetAppEntityFromTilePromise = this._getAppEntityFromTile(oTile)
-                            .then(function (oApp) {
-                                if (oApp) {
-                                    aFormattedApps.push(oApp);
-                                } else {
-                                    // if this is not an app this is a custom tile.
-                                    iNumberOfCustomTiles++;
-                                }
-                            });
-                        aPromises.push(oGetAppEntityFromTilePromise);
-                    }
-                }.bind(this));
-                return Promise.all(aPromises);
-            }.bind(this))
-            .then(function () {
-                return {
-                    iNumberOfCustomTiles: iNumberOfCustomTiles,
-                    aFormattedApps: aFormattedApps
-                };
-            });
-    };
-
-    AllMyAppsManager.prototype._onHandleGroupPress = function (ev, oData) {
-        window.hasher.setHash("#Shell-home");
-        // Close the popover on navigation (it should be explicitly closed when navigating with the same hash)
-        this.oPopover.close();
-        var oBus = sap.ui.getCore().getEventBus();
-
-        // This is in the case of cold start
-        oBus.subscribe("launchpad", "dashboardModelContentLoaded", function () {
-            oBus.publish("launchpad", "scrollToGroupByName", {
-                groupName: oData.title,
-                isInEditTitle: false
-            });
-        }, this);
-
-        // Try to open in case we are not in cold start
-        oBus.publish("launchpad", "scrollToGroupByName", {
-            groupName: oData.title,
-            isInEditTitle: false
-        });
-    };
-
-    AllMyAppsManager.prototype._handleExternalProvidersData = function () {
-        var that = this;
-        return sap.ushell.Container.getServiceAsync("AllMyApps")
-            .then(function (AllMyApps) {
-                var oExternalProviders = AllMyApps.getDataProviders();
-                var aExternalProvidersIDs = Object.keys(oExternalProviders);
-                var sExternalProviderId;
-                var oExternalProvider;
-                var sExternalProviderTitle;
-                var oExternalProviderModelEntry;
-                var index;
-                var oExternalProviderPromise;
-
-                // Get external providers apps
-                if (aExternalProvidersIDs.length > 0) {
-                    for (index = 0; index < aExternalProvidersIDs.length; index++) {
-                        sExternalProviderId = aExternalProvidersIDs[index];
-                        oExternalProvider = oExternalProviders[sExternalProviderId];
-                        sExternalProviderTitle = oExternalProvider.getTitle();
-                        oExternalProviderModelEntry = {};
-                        oExternalProviderModelEntry.title = sExternalProviderTitle;
-                        oExternalProviderPromise = oExternalProvider.getData();
-                        oExternalProviderPromise.done(function (aProviderDataArray) {
-                            // If the promise for data is resolved valid array of at least one group
-                            if (aProviderDataArray && (aProviderDataArray.length > 0)) {
-                                this.groups = aProviderDataArray;
-                                this.type = AllMyAppsProviderType.EXTERNAL;
-                                that.oModel.setProperty("/AppsData/" + that.iNumberOfProviders, this);
-                                that.iNumberOfProviders += 1;
-                                // Publish event all my apps finished loading.
-                                var oEventBus = sap.ui.getCore().getEventBus();
-                                oEventBus.publish("launchpad", "allMyAppsMasterLoaded");
-                            }
-                        }.bind(oExternalProviderModelEntry));
-                    }
-                }
-            });
-    };
-
-    AllMyAppsManager.prototype._handleNotFirstCatalogsLoad = function () {
-        var oModel = this.oModel.getProperty("/AppsData");
-        var sCatalogProvider = AllMyAppsProviderType.CATALOG;
-        if (oModel.length && oModel[oModel.length - 1].type === sCatalogProvider) {
-            this.bFirstCatalogLoaded = true;
-            sap.ui.getCore().getEventBus().publish("launchpad", "allMyAppsFirstCatalogLoaded", { bFirstCatalogLoadedEvent: true });
-        }
-    };
-
-    AllMyAppsManager.prototype._handleCatalogs = function (loadCatalogs) {
-        if (!loadCatalogs) {
-            this._handleNotFirstCatalogsLoad();
-            return Promise.resolve();
-        }
-        this.bFirstCatalogLoaded = false;
-        // Array of promise objects that are generated inside addCatalogToModel (the "progress" function of getCatalogs)
-        this.aPromises = [];
-        // Get catalog apps
-        return sap.ushell.Container.getServiceAsync("LaunchPage")
-            .then(function (LaunchPage) {
-                LaunchPage.getCatalogs()
-                    // There's a need to make sure that onDoneLoadingCatalogs is called only after all catalogs are loaded
-                    // (i.e. all calls to addCatalogToModel are finished).
-                    // For this, all the promise objects that are generated inside addCatalogToModel are generated into this.aPromises,
-                    // and jQuery.when calls onDoneLoadingCatalogs only after all the promises are resolved
-                    .done(function (/*catalogs*/) {
-                        jQuery.when.apply(jQuery, this.aPromises).then(this._onDoneLoadingCatalogs.bind(this));
-                    }.bind(this))
-                    // in case of a severe error, show an error message
-                    .fail(function (/*args*/) {
-                        this._onGetCatalogsFail(resources.i18n.getText("fail_to_load_catalog_msg"));
-                    }.bind(this))
-                    // for each loaded catalog, add it to the model
-                    .progress(this._addCatalogToModel.bind(this));
-            }.bind(this));
-    };
-
-    AllMyAppsManager.prototype._addCatalogToModel = function (oCatalog) {
-        var LaunchPage;
-        var oProviderModelEntry = {
-            apps: [],
-            numberCustomTiles: 0,
-            type: null
-        };
-        var iProvidersIndex;
-        var aPromises = [
-            sap.ushell.Container.getServiceAsync("LaunchPage")
-        ];
-
-        // Even though the code is asynchronous now there might be severe race conditions if this method gets called multiple times in a short timeframe.
-        // Therefore we ensure the calls are handled synchronously
-        if (this._oAddCatalogToModelPromise) {
-            aPromises.push(this._oAddCatalogToModelPromise);
-        }
-
-        this._oAddCatalogToModelPromise = Promise.all(aPromises)
-            .then(function (aValues) {
-                LaunchPage = aValues[0];
-                oProviderModelEntry.type = AllMyAppsProviderType.CATALOG;
-
-                var oCatalogTilesPromise = LaunchPage.getCatalogTiles(oCatalog);
-                this.aPromises.push(oCatalogTilesPromise);
-                return oCatalogTilesPromise;
-            }.bind(this))
-            .then(function (aCatalogTiles) {
-                var aProviders;
-                if (aCatalogTiles.length === 0) {
-                    return;
-                }
-                // find if catalog with the same name already exists.
-                var sCatalogName = LaunchPage.getCatalogTitle(oCatalog);
-
-                aProviders = this.oModel.getProperty("/AppsData");
-                for (iProvidersIndex = 0; iProvidersIndex < aProviders.length; iProvidersIndex++) {
-                    if ((aProviders[iProvidersIndex].type === AllMyAppsProviderType.CATALOG) && (aProviders[iProvidersIndex].title === sCatalogName)) {
-                        // if not create a new catalog entry.
-                        oProviderModelEntry = aProviders[iProvidersIndex];
-                        break;
-                    }
-                }
-
-                // add the attributes and tile for the catalog.
-                oProviderModelEntry.title = LaunchPage.getCatalogTitle(oCatalog);
-                return this._getFormattedGroupApps(aCatalogTiles);
-            }.bind(this))
-            .then(function (oResult) {
-                if (!oResult) {
-                    return;
-                }
-                // Extend the array since we might have found an existing ProviderModelEntry with included apps
-                Array.prototype.push.apply(oProviderModelEntry.apps, oResult.aFormattedApps);
-                oProviderModelEntry.numberCustomTiles = oResult.iNumberOfCustomTiles;
-                if (oProviderModelEntry.numberCustomTiles === 1) {
-                    oProviderModelEntry.sCustomLabel = resources.i18n.getText("allMyApps_customStringSingle");
-                    oProviderModelEntry.sCustomLink = resources.i18n.getText("allMyApps_customLinkAppFinderSingle");
-                } else {
-                    oProviderModelEntry.sCustomLabel = resources.i18n.getText("allMyApps_customString", [oProviderModelEntry.numberCustomTiles]);
-                    oProviderModelEntry.sCustomLink = resources.i18n.getText("allMyApps_customLinkAppFinder");
-                }
-
-                oProviderModelEntry.handlePress = function (ev, oData) {
-                    // Close the popover on navigation (it should be explicitly closed when navigating with the same hash)
-                    this.oPopover.close();
-                    window.hasher.setHash("#Shell-home&/appFinder/catalog/" + JSON.stringify({
-                        catalogSelector: oData.title,
-                        tileFilter: "",
-                        tagFilter: "[]",
-                        targetGroup: ""
-                    }));
-                }.bind(this);
-
-                // Add the catalog to the model as a data-source/provider only if it includes at least one app
-                if (oProviderModelEntry.apps.length > 0 || oProviderModelEntry.numberCustomTiles > 0) {
-                    this.oModel.setProperty("/AppsData/" + iProvidersIndex, oProviderModelEntry);
-                    if (this.bFirstCatalogLoaded === false) {
-                        sap.ui.getCore().getEventBus().publish("launchpad", "allMyAppsFirstCatalogLoaded", { bFirstCatalogLoadedEvent: true });
-                        this.bFirstCatalogLoaded = true;
-                    }
-                    this.iNumberOfProviders += 1;
-                }
-            }.bind(this));
-            return this._oAddCatalogToModelPromise;
-    };
-
-    AllMyAppsManager.prototype._onGetCatalogsFail = function (sMessage) {
-        return sap.ushell.Container.getServiceAsync("Message")
-            .then(function (Message) {
-                Message.info(sMessage);
-            });
-    };
-
-    AllMyAppsManager.prototype._onDoneLoadingCatalogs = function () {
-        // Sort the catalogs alphabetically for continuity reasons
-        var oModel = this.oModel.getProperty("/AppsData");
-        oModel.sort(function (a, b) {
-            var nameA = a.title.toUpperCase();
-            var nameB = b.title.toUpperCase();
-            if (nameA < nameB) {
-                return -1;
-            }
-            if (nameA > nameB) {
-                return 1;
-            }
-            return 0;
-        });
-        this.oModel.setProperty("/AppsData", oModel);
-
-        var oEventBus = sap.ui.getCore().getEventBus();
-
-        if (!this.bFirstCatalogLoaded) {
-            oEventBus.publish("launchpad", "allMyAppsNoCatalogsLoaded");
-        }
-    };
-
-    AllMyAppsManager.prototype._getAppEntityFromTile = function (oCatalogTile) {
-        return sap.ushell.Container.getServiceAsync("LaunchPage")
-            .then(function (LaunchPage) {
-                var oApp;
-                var sTileTitle = LaunchPage.getCatalogTilePreviewTitle(oCatalogTile);
-                var sTileSubTitle = LaunchPage.getCatalogTilePreviewSubtitle(oCatalogTile);
-                var sTileUrl = LaunchPage.getCatalogTileTargetURL(oCatalogTile);
-
-                // If the tile has a valid url and either title or subtitle
-                if (sTileUrl && (sTileTitle || sTileSubTitle)) {
-                    oApp = {};
-                    oApp.url = sTileUrl;
-                    if (sTileTitle) {
-                        oApp.title = sTileTitle;
-                        oApp.subTitle = sTileSubTitle;
-                    } else {
-                        oApp.title = sTileSubTitle;
-                    }
-                    return oApp;
-                }
-            });
-    };
-
-    return new AllMyAppsManager();
+    return AllMyAppsManager;
 }, /* bExport= */ true);

package/src/main/js/sap/ushell/resources.js

@@ -19,7 +19,7 @@ sap.ui.define([
         if (!this._oResourceModel) {
             // create translation resource model
             this._oResourceModel = new ResourceModel({
-                bundleUrl: sap.ui.require.toUrl("sap/ushell/renderers/fiori2/resources/resources.properties"),
+                bundleUrl: sap.ui.require.toUrl("sap/ushell/renderer/resources/resources.properties"),
                 bundleLocale: sLocale
             });
         }

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

@@ -6,7 +6,15 @@ sap.ui.define([
     "use strict";
 
     /**
-     * A UShell service for registering an external provider of content (i.e., data source) to display All My Apps UI in the SAP Fiori launchpad.<br><br>
+     * @alias sap.ushell.services.AllMyApps
+     * @class
+     *
+     * @classdesc A UShell service for registering an external provider of content (i.e., data source) to display All My Apps UI in the SAP Fiori launchpad.<br><br>
+     *
+     * <b>Note:</b> To retrieve a valid instance of this service, it is necessary to call
+     * <code>sap.ushell.Container.getServiceAsync("AllMyApps")</code>. For details, see
+     * {@link sap.ushell.services.Container#getServiceAsync}.
+     *
      * All My Apps UI is a Unified Shell module that allows the user to view their available data sources and applications
      * and to launch/navigate to an application.<br>
      * A data sources can be one of the following types:<br>
@@ -24,18 +32,20 @@ sap.ui.define([
      * - isExternalProviderAppsEnabled<br>
      *
      * To add an external provider as a custom data source, you must registered it using the service function registerExternalProvider.<br>
+     *
      * @param {object} oContainerInterface The container interface
      * @param {string} sParameters The parameter string
      * @param {object} oServiceConfiguration The service configuration
      *
-     * @since 1.45.0
+     * @hideconstructor
      *
+     * @since 1.45.0
      * @private
      */
     function AllMyApps (oContainerInterface, sParameters, oServiceConfiguration) {
-        var oServiceConfig = oServiceConfiguration && oServiceConfiguration.config,
-            bEnabled = false,
-            oDataProviders = {};
+        var oServiceConfig = oServiceConfiguration && oServiceConfiguration.config;
+        var bEnabled = false;
+        var oDataProviders = {};
 
         // *************************************************************************************************
         // ************************************* Service API - Begin ***************************************
@@ -176,8 +186,7 @@ sap.ui.define([
          *
          * @private
          */
-        this.init = function () {
-        };
+        this.init = function () { };
     }
 
     AllMyApps.hasNoAdapter = true;