@sapui5/sap.ushell 1.131.1 → 1.132.1

package/src/main/js/sap/ushell/components/contentFinderStandalone/controller/ContentFinderStandalone.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Controller for ContentFinderDialog standalone root view
- * @version 1.131.1
+ * @version 1.132.1
  */
 sap.ui.define([
     "sap/ui/core/mvc/Controller",
@@ -41,172 +41,190 @@ sap.ui.define([
     return Controller.extend("sap.ushell.components.contentFinderStandalone.controller.ContentFinderStandalone",
         /** @lends sap.ushell.components.contentFinderStandalone.controller.ContentFinderStandalone.prototype */{
 
-        /**
-         * The init function called after the view was initialized.
-         *
-         * @since 1.123.0
-         * @private
-         */
-        onInit: function () {
-            const oAppSearchComponentContainer = this.getView().byId("appSearchComponentContainer");
-            const sUrlAppSearchManifest = sap.ui.require.toUrl("sap/ushell/components/contentFinderStandalone/manifestAppSearch.json");
-            oAppSearchComponentContainer.setManifest(sUrlAppSearchManifest);
-
-            this.oWorkPageService = new WorkPageService();
-            this.oCatalogService = new CatalogService();
-            this.oResourceBundle = this.getOwnerComponent().getModel("i18n").getResourceBundle();
-
-            // routing for 'appfinder'.
-            this.oShellUIService = AppLifeCycle.getShellUIService();
-            this.oRouter = Container.getRendererInternal().getRouter();
-            this.oRouter.getRoute("appfinder").attachMatched(this._handleContentFinderNavigation.bind(this));
-        },
-
-        /**
-         * Handles the navigation to the content finder.
-         * Updates shell header title.
-         *
-         * @since 1.128.0
-         * @private
-         */
-        _handleContentFinderNavigation: function () {
-            this.oShellUIService.setTitle(ushellResources.i18n.getText("appFinderTitle"));
-        },
-
-        /**
-         * Called when the appSearch component was created.
-         * Attaches the required event handling.
-         *
-         * @since 1.123.0
-         * @private
-         * @param {sap.base.Event} oEvent The 'componentCreated' event.
-         */
-        appSearchComponentCreated: function (oEvent) {
-            this.oComponent = oEvent.getParameter("component");
-
-            // Required to load the core-ext bundles to enable menubar, usersettings, search, ...
-            EventHub.emit("CenterViewPointContentRendered");
-
-            this.oComponent.attachVisualizationFilterApplied(null, this._onVisualizationFilterApplied, this);
-            this.oComponent.setRestrictedMode(true);
-            this.oComponent.getModel().setProperty("/standalone", true);
-            this.oComponent.getModel().setProperty("/activeNavigationTarget", "appSearch_tiles");
-            this.oComponent.queryVisualizations(0);
-            this.setCategoryTree();
-        },
-
-        setCategoryTree: async function () {
-            // fetch category data: catalogs
-            let oCatalogsResponse;
-            try {
-                oCatalogsResponse = await this.oCatalogService.getCatalogs();
-            } catch (error) {
-                Log.error("Catalog fetching failed with:" + JSON.stringify(error));
-                return;
-            }
-
-            let aCategories;
-            if (oCatalogsResponse?.catalogs?.length > 0) {
-                // prepare category tree with static categories
-                aCategories = [{
-                    id: undefined,
-                    title: this.oResourceBundle.getText("ContentFinderStandalone.CategoryTree.Category.AllTiles"),
-                    inactive: false
-                }, {
-                    id: "$$catalogs",
-                    title: this.oResourceBundle.getText("ContentFinderStandalone.CategoryTree.Category.Catalogs"),
-                    inactive: true,
-                    nodes: oCatalogsResponse?.catalogs,
-                    $count: oCatalogsResponse?.totalCount
-                }];
-            }
-
-            this.oComponent.setCategoryTree(aCategories);
-        },
-
-        /**
-         * Called when a filter action was performed in the Content Finder, e.g. search, filter by type, catalog, etc.
-         *
-         * @since 1.123.0
-         * @param {sap.base.Event} oEvent The 'visualizationFilterApplied' event
-         * @private
-         */
-        _onVisualizationFilterApplied: async function (oEvent) {
-            const oFilterParams = this._transformFilterParams(oEvent.getParameters());
-            let oVisualizationData;
-            const categoryId = oEvent.getParameter("categoryId");
-            if (categoryId) {
-                oVisualizationData = await this.oCatalogService.loadVisualizations(categoryId, oFilterParams);
-            } else {
-                oVisualizationData = await this.oWorkPageService.loadVisualizations(oFilterParams);
-            }
+            /**
+             * The init function called after the view was initialized.
+             *
+             * @since 1.123.0
+             * @private
+             */
+            onInit: function () {
+                this.oWorkPageService = new WorkPageService();
+                this.oCatalogService = new CatalogService();
+                this.oResourceBundle = this.getOwnerComponent().getModel("i18n").getResourceBundle();
+
+                // Routing for 'AppFinder'
+                this.oShellUIService = AppLifeCycle.getShellUIService();
+                this.oRouter = Container.getRendererInternal().getRouter();
+                this.oRouter.getRoute("appfinder").attachMatched(this._handleContentFinderNavigation.bind(this));
+            },
+
+            /**
+             * Handles the navigation to the content finder.
+             * Updates shell header title.
+             *
+             * @since 1.128.0
+             * @private
+             */
+            _handleContentFinderNavigation: function () {
+                this.oShellUIService.setTitle(ushellResources.i18n.getText("appFinderTitle"));
+            },
+
+            /**
+             * Called when the appSearch component was created.
+             *
+             * Attaches the required event handling.
+             *
+             * @param {sap.base.Event} oEvent The 'componentCreated' event.
+             *
+             * @since 1.123.0
+             * @private
+             */
+            appSearchComponentCreated: async function (oEvent) {
+                this.oComponent = oEvent.getParameter("component");
+
+                // Required to load the core-ext bundles to enable menubar, usersettings, search, ...
+                EventHub.emit("CenterViewPointContentRendered");
+
+                this.oComponent.attachVisualizationFilterApplied(null, this._onVisualizationFilterApplied, this);
+
+                this.oWorkPageService.loadVisualizations({}).then((oVisualizationData) => {
+                    this.oComponent.setVisualizationData(oVisualizationData);
+                });
+                this.setCategoryTree();
+
+                // Temporary fallback to the classic AppFinder in case the Content Finder causes issues or does not show all required data.
+                const oUrl = new URL(location.href);
+                oUrl.searchParams.append("sap-ushell-xx-overwrite-config", "/core/workPages/contentFinderStandalone:false");
+                this.oComponent.getUiModel().setProperty("/linkToAppFinder", oUrl.toString());
+            },
+
+
+            /**
+             * Sets the category tree for the ContentFinder.
+             *
+             * @returns {Promise<undefined>} Resolves with <code>undefined</code>.
+             */
+            setCategoryTree: async function () {
+                // fetch category data: catalogs
+                let oCatalogsResponse;
+                try {
+                    oCatalogsResponse = await this.oCatalogService.getCatalogs();
+                } catch (error) {
+                    Log.error("Catalog fetching failed with:" + JSON.stringify(error));
+                    return;
+                }
 
-            this.oComponent.setVisualizationData(oVisualizationData);
-        },
-
-        /**
-         * Transforms the filter parameters received by the ContentFinder to a format required by the graphql API.
-         *
-         * @since 1.123.0
-         * @param {object} oParams The ContentFinder filter parameters.
-         * @returns {{top: int, skip: int, filter: object[]}} The filter parameters in graphql API format.
-         * @private
-         */
-        _transformFilterParams: function (oParams) {
-            const iTop = oParams?.pagination?.top;
-            const iSkip = oParams?.pagination?.skip;
-            const sSearchTerm = oParams?.search;
-            const aTypes = oParams?.types || [];
-            const aExpandedTypes = aTypes.map((type) => ({ eq: type }));
-            const oSearchFilter = sSearchTerm
-                ? {
-                    type: aExpandedTypes,
-                    descriptor: [
+                let aCategories = [];
+                if (oCatalogsResponse?.catalogs?.length > 0) {
+                    // prepare category tree with static categories
+                    aCategories = [
                         {
-                            conditions: [
-                                {
-                                    propertyPath: "/sap.app/title",
-                                    stringFilter: [{ containsIgnoreCase: sSearchTerm }]
-                                }
-                            ]
+                            id: undefined,
+                            title: this.oResourceBundle.getText("ContentFinderStandalone.CategoryTree.Category.AllTiles"),
+                            filterIsTitle: true,
+                            inactive: false,
+                            allowedFilters: ["tiles"]
                         },
                         {
-                            conditions: [
-                                {
-                                    propertyPath: "/sap.app/subTitle",
-                                    stringFilter: [{ containsIgnoreCase: sSearchTerm }]
-                                }
-                            ]
-                        },
-                        {
-                            conditions: [
-                                {
-                                    propertyPath: "/sap.app/info",
-                                    stringFilter: [{ containsIgnoreCase: sSearchTerm }]
-                                }
-                            ]
-                        },
-                        {
-                            conditions: [
-                                {
-                                    propertyPath: "/sap.fiori/registrationIds",
-                                    anyFilter: [
-                                        {
-                                            conditions: [
-                                                {
-                                                    stringFilter: [{ containsIgnoreCase: sSearchTerm }]
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            ]
+                            id: "$$catalogs",
+                            title: this.oResourceBundle.getText("ContentFinderStandalone.CategoryTree.Category.Catalogs"),
+                            inactive: true,
+                            filterIsTitle: false,
+                            nodes: oCatalogsResponse?.catalogs,
+                            $count: oCatalogsResponse?.totalCount,
+                            allowedFilters: ["tiles"]
                         }
-                    ]
+                    ];
                 }
-                : { type: aExpandedTypes };
 
-            return { top: iTop, skip: iSkip, filter: [oSearchFilter] };
-        }
-    });
+                this.oComponent.setCategoryTree(aCategories);
+            },
+
+            /**
+             * Called when a filter action was performed in the Content Finder, e.g. search, filter by type, catalog, etc.
+             *
+             * @param {sap.base.Event} oEvent The 'visualizationFilterApplied' event
+             *
+             * @since 1.123.0
+             * @private
+             */
+            _onVisualizationFilterApplied: async function (oEvent) {
+                const oFilterParams = this._transformFilterParams(oEvent.getParameters());
+                let oVisualizationData;
+                const categoryId = oEvent.getParameter("categoryId");
+                if (categoryId) {
+                    oVisualizationData = await this.oCatalogService.loadVisualizations(categoryId, oFilterParams);
+                } else {
+                    oVisualizationData = await this.oWorkPageService.loadVisualizations(oFilterParams);
+                }
+
+                this.oComponent.setVisualizationData(oVisualizationData);
+            },
+
+            /**
+             * Transforms the filter parameters received by the ContentFinder to a format required by the graphql API.
+             *
+             * @param {object} oParams The ContentFinder filter parameters.
+             * @returns {{top: int, skip: int, filter: object[]}} The filter parameters in graphql API format.
+             *
+             * @since 1.123.0
+             * @private
+             */
+            _transformFilterParams: function (oParams) {
+                const iTop = oParams?.pagination?.top;
+                const iSkip = oParams?.pagination?.skip;
+                const sSearchTerm = oParams?.search;
+                const aTypes = oParams?.types || [];
+                const aExpandedTypes = aTypes.length > 0 ? [{ in: aTypes }] : [];
+                const oSearchFilter = sSearchTerm
+                    ? {
+                        type: aExpandedTypes,
+                        descriptor: [
+                            {
+                                conditions: [
+                                    {
+                                        propertyPath: "/sap.app/title",
+                                        stringFilter: [{ containsIgnoreCase: sSearchTerm }]
+                                    }
+                                ]
+                            },
+                            {
+                                conditions: [
+                                    {
+                                        propertyPath: "/sap.app/subTitle",
+                                        stringFilter: [{ containsIgnoreCase: sSearchTerm }]
+                                    }
+                                ]
+                            },
+                            {
+                                conditions: [
+                                    {
+                                        propertyPath: "/sap.app/info",
+                                        stringFilter: [{ containsIgnoreCase: sSearchTerm }]
+                                    }
+                                ]
+                            },
+                            {
+                                conditions: [
+                                    {
+                                        propertyPath: "/sap.fiori/registrationIds",
+                                        anyFilter: [
+                                            {
+                                                conditions: [
+                                                    {
+                                                        stringFilter: [{ containsIgnoreCase: sSearchTerm }]
+                                                    }
+                                                ]
+                                            }
+                                        ]
+                                    }
+                                ]
+                            }
+                        ]
+                    }
+                    : { type: aExpandedTypes };
+
+                return { top: iTop, skip: iSkip, filter: [oSearchFilter] };
+            }
+        });
 });

package/src/main/js/sap/ushell/components/contentFinderStandalone/manifest.json

@@ -1,9 +1,9 @@
 {
-    "_version": "1.39.0",
+    "_version": "1.67.0",
     "sap.app": {
         "id": "sap.ushell.components.contentFinderStandalone",
         "applicationVersion": {
-            "version": "1.131.1"
+            "version": "1.132.1"
         },
         "i18n": "./resources/resources.properties",
         "ach": "CA-FLP-FE-UI",
@@ -25,7 +25,36 @@
         "componentUsages": {
             "appSearch": {
                 "settings": {
-                    "id": "contentFinderAppSearch"
+                    "id": "contentFinderAppSearch",
+                    "enablePersonalization": false,
+                    "noItemsInCatalogDescription": "{{ContentFinderStandalone.AppSearch.IllustratedMessage.NoItems.InCatalog.Description}}",
+                    "showAppBoxFieldsPlaceholder": false,
+                    "showApplicationLaunchButton": true,
+                    "showCategoryTreeWhenEmpty": false
+                },
+                "componentData": {
+                    "visualizationFilters": {
+                        "displayed": [
+                            "tiles"
+                        ],
+                        "selected": "tiles",
+                        "available": [
+                            {
+                                "key": "tiles",
+                                "title": "{{ContentFinderStandalone.AppSearch.VisualizationsFilter.Tiles}}",
+                                "types": [
+                                    "sap.ushell.StaticAppLauncher",
+                                    "sap.ushell.DynamicAppLauncher",
+                                    "ssuite.smartbusiness.tiles.dual",
+                                    "ssuite.smartbusiness.tiles.numeric",
+                                    "ssuite.smartbusiness.tiles.contribution",
+                                    "ssuite.smartbusiness.tiles.deviation",
+                                    "ssuite.smartbusiness.tiles.trend",
+                                    "ssuite.smartbusiness.tiles.comparison"
+                                ]
+                            }
+                        ]
+                    }
                 },
                 "name": "sap.ushell.components.contentFinder",
                 "lazy": true
@@ -63,4 +92,4 @@
             "async": true
         }
     }
-}
+}

package/src/main/js/sap/ushell/components/contentFinderStandalone/resources/resources.properties

@@ -2,6 +2,11 @@
 # __ldi.translation.uuid=ea222c41-9e47-4e3a-bab8-45a1f08cbe73
 
 # Content Finder Dialog Standalone
+#XBUT
+ContentFinderStandalone.AppSearch.VisualizationsFilter.Tiles=Tiles
+#XTXT
+ContentFinderStandalone.AppSearch.IllustratedMessage.NoItems.InCatalog.Description=When there are apps, you will see them here.
+
 # Category Tree Root Node Titles
 #XTIT
 ContentFinderStandalone.CategoryTree.Category.AllTiles=All Tiles

package/src/main/js/sap/ushell/components/contentFinderStandalone/resources/resources_en_US_saptrc.properties

@@ -0,0 +1,3 @@
+
+ContentFinderStandalone.CategoryTree.Category.AllTiles=aZ3792TCQrJu4NF1sZD50w_All Tiles
+ContentFinderStandalone.CategoryTree.Category.Catalogs=xumOAgxtBwMcYiofTiQjbA_Catalogs

package/src/main/js/sap/ushell/components/contentFinderStandalone/view/ContentFinderStandalone.view.xml

@@ -1,13 +1,14 @@
 <mvc:View
-        id="contentFinderStandaloneView"
-        xmlns="sap.m"
-        xmlns:core="sap.ui.core"
-        xmlns:mvc="sap.ui.core.mvc"
-        height="100%"
-        controllerName="sap.ushell.components.contentFinderStandalone.controller.ContentFinderStandalone">
-
+    id="contentFinderStandaloneView"
+    xmlns="sap.m"
+    xmlns:core="sap.ui.core"
+    xmlns:mvc="sap.ui.core.mvc"
+    height="100%"
+    controllerName="sap.ushell.components.contentFinderStandalone.controller.ContentFinderStandalone"
+>
     <core:ComponentContainer
-        id="appSearchComponentContainer"
+        id="contentFinderStandaloneComponentContainer"
+        usage="appSearch"
         height="100%"
         componentCreated=".appSearchComponentCreated"
         async="true"

package/src/main/js/sap/ushell/components/factsheet/Component.js

@@ -17,7 +17,7 @@ sap.ui.define([
 
         // use inline declaration instead of component.json to save 1 round trip
         metadata: {
-            version: "1.131.1",
+            version: "1.132.1",
             library: "sap.ushell",
             dependencies: {
                 libs: ["sap.m", "sap.ui.vbm", "sap.suite.ui.commons", "sap.ui.layout", "sap.viz"],

package/src/main/js/sap/ushell/components/homepage/ActionMode.js

@@ -20,7 +20,7 @@
  *  - Deactivation handler
  *  - Rendering tile action menu
  *
- * @version 1.131.1
+ * @version 1.132.1
  *
  * @deprecated since 1.112
  */

package/src/main/js/sap/ushell/components/homepage/DashboardContent.view.js

@@ -5,7 +5,7 @@
  * with a header of type <code>sap.ushell.ui.launchpad.AnchorNavigationBar</code>
  * and content of type <code>sap.ushell.ui.launchpad.DashboardGroupsContainer</code>.
  *
- * @version 1.131.1
+ * @version 1.132.1
  *
  * @deprecated since 1.112
  * @private
@@ -14,6 +14,7 @@ sap.ui.define([
     "sap/m/library",
     "sap/ui/core/library",
     "sap/m/Page",
+    "sap/m/PageAccessibleLandmarkInfo",
     "sap/ui/core/Component",
     "sap/ui/core/Core",
     "sap/ui/core/mvc/View",
@@ -34,6 +35,7 @@ sap.ui.define([
     mobileLibrary,
     coreLibrary,
     Page,
+    PageAccessibleLandmarkInfo,
     Component,
     Core,
     View,
@@ -111,11 +113,11 @@ sap.ui.define([
 
             this.oPage = new Page("sapUshellDashboardPage", {
                 showHeader: false,
-                landmarkInfo: {
+                landmarkInfo: new PageAccessibleLandmarkInfo({
                     contentRole: AccessibleLandmarkRole.Region,
                     contentLabel: resources.i18n.getText("Dashboard.Page.Content.AriaLabel"),
                     rootRole: AccessibleLandmarkRole.None
-                },
+                }),
                 floatingFooter: true,
                 content: [ this.oDashboardGroupsBox ]
             });

package/src/main/js/sap/ushell/components/homepage/DashboardGroupsBox.js

@@ -6,7 +6,7 @@
  * Exposes the public function <code>createGroupsBox</code>
  * @see sap.ushell.components.homepage.DashboardContent.view
  *
- * @version 1.131.1
+ * @version 1.132.1
  * @since 1.35.0
  *
  * @deprecated since 1.112

package/src/main/js/sap/ushell/components/homepage/DashboardUIActions.js

@@ -5,7 +5,7 @@
  * Extends <code>sap.ui.base.Object</code><br>
  * Exposes the public function <code>initializeUIActions</code>
  *
- * @version 1.131.1
+ * @version 1.132.1
  * @since 1.35.0
  *
  * @deprecated since 1.112

package/src/main/js/sap/ushell/components/homepage/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.homepage",
         "applicationVersion": {
-            "version": "1.131.1"
+            "version": "1.132.1"
         },
         "i18n": {
             "bundleUrl": "../../renderer/resources/resources.properties",

package/src/main/js/sap/ushell/components/pages/ActionMode.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview ActionMode for the PageRuntime view
  *
- * @version 1.131.1
+ * @version 1.132.1
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/pages/Component.js

@@ -5,7 +5,7 @@
  * #Shell-home or #Launchpad-openFLPPage if spaces are enabled (/core/spaces/enabled).
  * In the future it should completely replace the classical homepage.
  *
- * @version 1.131.1
+ * @version 1.132.1
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/pages/MyHomeImport.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview MyHome migrate functionality for the PageRuntime view
  *
- * @version 1.131.1
+ * @version 1.132.1
  */
 
 sap.ui.define([