@sapui5/sap.ushell 1.122.1 → 1.123.0

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

@@ -2,7 +2,7 @@
 /**
  * @fileOverview ContentFinder Component
  *
- * @version 1.122.1
+ * @version 1.123.0
  */
 
 sap.ui.define([
@@ -97,7 +97,8 @@ sap.ui.define([
             totalCount: 0,
             originalRestrictedVisualizations: [],
             restrictedVisualizations: []
-        }
+        },
+        categoryTree: []
     };
 
     /**
@@ -192,6 +193,16 @@ sap.ui.define([
             this.getModel().setProperty("/widgetGallery/widgetGroups", aWidgetGroups);
         },
 
+        /**
+         * Sets the menu tree data for the Content Finder model.
+         * @param {object} aCategoryTree The category tree object.
+         * @experimental
+         * @private
+         */
+        setCategoryTree: function (aCategoryTree) {
+            this.getModel().setProperty("/categoryTree", aCategoryTree);
+        },
+
         /**
          * Fires the event to query for visualizations.
          *

package/src/main/js/sap/ushell/components/contentFinder/controller/AppSearch.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file AppSearch controller for AppSearch view
- * @version 1.122.1
+ * @version 1.123.0
  */
 sap.ui.define([
     "./ContentFinderDialog.controller",
@@ -189,9 +189,6 @@ sap.ui.define([
          */
         onShowSelectedPressed: function (oEvent) {
             var bPressed = oEvent.getParameter("pressed");
-            var sSearchTerm = bPressed ? "" : this.sCurrentSearchTerm;
-
-            this.byId("appSearchField").setValue(sSearchTerm);
             this.toggleSelectionView(bPressed);
         },
 
@@ -202,6 +199,8 @@ sap.ui.define([
          * @since 1.121.0
          */
         toggleSelectionView: function (bActive) {
+            var sSearchTerm = bActive ? "" : this.sCurrentSearchTerm;
+            this.byId("appSearchField").setValue(sSearchTerm);
             var oModel = bActive ? this.oSelectionModel : this.oModel;
             oModel.setProperty("/appSearch/showSelectedPressed", bActive);
             this.byId("tiles").setModel(oModel);
@@ -210,7 +209,8 @@ sap.ui.define([
         _formatVisibilityIllustratedMessage: function (bVisualizationsLoaded, iTilesLength, iCardsLength, bShowSelectedPressed, iSelectedAppCount) {
             if (bVisualizationsLoaded) {
                 if (bShowSelectedPressed && !iSelectedAppCount) {
-                    return true;
+                    this.toggleSelectionView(!bShowSelectedPressed);
+                    return false;
                 }
                 if ((iTilesLength === 0 || iCardsLength > 0) && (iCardsLength === 0 || iTilesLength > 0)) {
                     return true;
@@ -220,6 +220,13 @@ sap.ui.define([
             return false;
         },
 
+        onTreeListItemPressed: function (oEvent) {
+            /**
+             * @TODO: implement
+             * Get the category id via: oEvent.getParameter("listItem").getBindingContext().getProperty("id")
+             */
+        },
+
         /**
          * Formats the accessibility description for the custom list item. This will be part of the string read out by the screen reader.
          *

package/src/main/js/sap/ushell/components/contentFinder/controller/ContentFinderDialog.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Controller for ContentFinderDialog root view
- * @version 1.122.1
+ * @version 1.123.0
  */
 sap.ui.define([
     "../model/formatter",

package/src/main/js/sap/ushell/components/contentFinder/controller/WidgetGallery.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Controller for WidgetGallery view
- * @version 1.122.1
+ * @version 1.123.0
  */
 sap.ui.define([
     "./ContentFinderDialog.controller"

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.contentFinder",
         "applicationVersion": {
-            "version": "1.122.1"
+            "version": "1.123.0"
         },
         "i18n": "./resources/resources.properties",
         "ach": "CA-FLP-FE-UI",

package/src/main/js/sap/ushell/components/contentFinder/model/formatter.js

@@ -74,10 +74,6 @@ sap.ui.define([], function () {
             }
 
             //Search
-            if (sSearchTerm && !bItemsAvailable) {
-                sResultText = oResourceBundle.getText("ContentFinder.AppSearch.Title.NoSearchResult", [sSearchTerm]);
-            }
-
             if (sSearchTerm && bItemsAvailable) {
                 sResultText = oResourceBundle.getText("ContentFinder.AppSearch.Title.SearchResult", [sSearchTerm, iFilteredAppCount]);
             }

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

@@ -58,3 +58,5 @@ ContentFinder.AppSearch.Text.FieldEmpty=Not available
 ContentFinder.AppSearch.Button.Preview=Preview
 #XMSG
 ContentFinder.AppSearch.Message.Select=Select {0}
+#XMSG
+ContentFinder.CategoryTree.Search=Search by group, catalog or role name 

package/src/main/js/sap/ushell/components/contentFinder/view/AppSearch.view.xml

@@ -8,144 +8,166 @@
     controllerName="sap.ushell.components.contentFinder.controller.AppSearch"
     id="contentFinderAppSearchView"
     height="100%">
-    <!-- The container needs any fixed height (e.g. minFlexSize="1px") to calculate the content
-    heights. -->
-    <l:FixFlex
-        id="contentFinderAppSearchLayout"
-        minFlexSize="1px">
-        <l:fixContent>
-            <OverflowToolbar
-                id="appSearchOverflowToolbar"
-                asyncMode="false"
-                style="Clear"
-                class="contentFinderToolbar sapUiMediumMargin">
-                <Title
-                    id="appBoxContainerTitle"
-                    titleStyle="H5"
-                    text="{
-                    parts: [
-                        '/activeNavigationTarget',
-                        '/appSearch/searchTerm',
-                        '/appSearch/showSelectedPressed',
-                        'Selection>/appSearch/visualizations/tiles/length',
-                        '/appSearch/visualizations/tiles',
-                        '/appSearch/visualizations/cards',
-                        '/appSearch/restrictedVisualizations',
-                        '/appSearch/filteredAppCount',
-                        '/appSearch/totalCount'
-                    ], formatter: '.formatter.formatAppSearchTitle' }">
-                    <layoutData>
-                        <OverflowToolbarLayoutData
-                            minWidth="6rem"
-                            shrinkable="true"
-                            priority="High"/>
-                    </layoutData>
-                </Title>
-                <ToolbarSpacer/>
 
-                <!-- Add 'search=".onSearch"' for server side searching -->
-                <SearchField
-                    id="appSearchField"
-                    placeholder="{i18n>ContentFinder.AppSearch.SearchPlaceholder}"
-                    search=".onSearch">
-                    <layoutData>
-                        <OverflowToolbarLayoutData
-                            minWidth="6rem"
-                            maxWidth="13.75rem"
-                            shrinkable="true"
-                            priority="NeverOverflow"/>
-                    </layoutData>
-                </SearchField>
-                <ToggleButton
-                    id="showAllSelectedBtn"
-                    visible="{= ${/activeNavigationTarget} === ${/navigationTargets/appSearchTiles}}"
-                    pressed="{/appSearch/showSelectedPressed}"
-                    enabled="{= ${Selection>/appSearch/visualizations/tiles/length} > 0 || ${/appSearch/showSelectedPressed} }"
-                    icon="sap-icon://multi-select"
-                    tooltip="{= ${/appSearch/showSelectedPressed} ? ${i18n>ContentFinder.AppSearch.Button.Tooltip.ShowAll} : ${i18n>ContentFinder.AppSearch.Button.Tooltip.ShowSelected}}"
-                    press=".onShowSelectedPressed">
-                    <layoutData>
-                        <OverflowToolbarLayoutData
-                            shrinkable="false"
-                            priority="Low"/>
-                    </layoutData>
-                </ToggleButton>
-            </OverflowToolbar>
-        </l:fixContent>
-        <l:flexContent>
+    <SplitContainer id="contentFinderAppSearchSplitContainer" mode="{= !${/categoryTree}.length ? 'HideMode':'ShowHideMode'}" >
+        <masterPages>
+            <!-- Category Tree Menu -->
             <Page
-                id="contentPage"
-                showHeader="false"
-                class="sapUiResponsiveContentPadding"
-                busy="{= !${/appSearch/visualizationsLoaded}}">
-                <f:GridList
-                    id="tiles"
-                    includeItemInSelection="true"
-                    mode="MultiSelect"
-                    growing="true"
-                    growingScrollToLoad="true"
-                    growingThreshold="{/appSearch/growingThreshold}"
-                    updateStarted=".onUpdateStarted"
-                    items="{/appSearch/visualizations/tiles}"
-                    selectionChange=".onAppBoxSelected"
-                    rememberSelections="false"
-                    visible="{= ${/activeNavigationTarget} === ${/navigationTargets/appSearchTiles} &amp;&amp; ${/appSearch/visualizations/tiles/length} > 0 }">
-                    <f:customLayout>
-                        <grid:GridResponsiveLayout containerQuery="true">
-                            <grid:layout>
-                                <grid:GridSettings
-                                    gridTemplateColumns="repeat(auto-fill, 19.0625rem)"
-                                    gridAutoRows="12.75rem"
-                                    gridGap="1rem"/>
-                            </grid:layout>
-                        </grid:GridResponsiveLayout>
-                    </f:customLayout>
-                    <core:Fragment
-                        id="tilesBox"
-                        fragmentName="sap.ushell.components.contentFinder.view.AppSearchBox"
-                        type="XML"/>
-                </f:GridList>
-                <f:GridList
-                    id="cards"
-                    includeItemInSelection="true"
-                    mode="SingleSelectMaster"
-                    growing="true"
-                    growingScrollToLoad="true"
-                    growingThreshold="{/appSearch/growingThreshold}"
-                    updateStarted=".onUpdateStarted"
-                    items="{/appSearch/visualizations/cards}"
-                    selectionChange=".onAppBoxSelectedAndClose"
-                    rememberSelections="false"
-                    visible="{= ${/activeNavigationTarget} === ${/navigationTargets/appSearchCards} &amp;&amp; ${/appSearch/visualizations/cards/length} > 0 }">
-                    <f:customLayout>
-                        <grid:GridResponsiveLayout containerQuery="true">
-                            <grid:layout>
-                                <grid:GridSettings
-                                    gridTemplateColumns="repeat(auto-fill, 19.0625rem)"
-                                    gridAutoRows="12.75rem"
-                                    gridGap="1rem"/>
-                            </grid:layout>
-                        </grid:GridResponsiveLayout>
-                    </f:customLayout>
-                    <core:Fragment
-                        id="cardsBox"
-                        fragmentName="sap.ushell.components.contentFinder.view.AppSearchBox"
-                        type="XML"/>
-                </f:GridList>
-                <IllustratedMessage
-                    id="illustratedMessageNoData"
-                    illustrationSize="IllustratedMessageSize.Auto"
-                    visible="{
-                    parts: [
-                        { path: '/appSearch/visualizationsLoaded' },
-                        { path: '/appSearch/visualizations/tiles/length' },
-                        { path: '/appSearch/visualizations/cards/length' },
-                        { path: '/appSearch/showSelectedPressed' },
-                        { path: 'Selection>/appSearch/visualizations/tiles/length' }
-                    ],
-                    formatter: '._formatVisibilityIllustratedMessage'}"
-                    illustrationType="{= ${/appSearch/searchTerm} ? 'sapIllus-SearchFolder' : 'sapIllus-Tent'}"/>
+                id="contentFinderAppSearchCategoryTreePage"
+                enableScrolling="false"
+                showHeader="false">
+                <mvc:XMLView
+                    id="contentFinderAppSearchCategoryTreeView"
+                    async="true"
+                    height="100%"
+                    viewName="sap.ushell.components.contentFinder.view.AppSearchCategoryTree" />
             </Page>
-        </l:flexContent>
-    </l:FixFlex>
+        </masterPages>
+        <detailPages>
+            <Page
+                id="contentFinderAppSearchDetailPage"
+                enableScrolling="false"
+                showHeader="false">
+                    <!-- The container needs any fixed height (e.g. minFlexSize="1px") to calculate the content heights. -->
+                    <l:FixFlex
+                        id="contentFinderAppSearchLayout"
+                        minFlexSize="1px">
+                        <l:fixContent>
+                            <OverflowToolbar
+                                id="appSearchOverflowToolbar"
+                                asyncMode="false"
+                                style="Clear"
+                                class="contentFinderToolbar sapUiMediumMargin">
+                                <Title
+                                    id="appBoxContainerTitle"
+                                    titleStyle="H5"
+                                    text="{
+                                    parts: [
+                                        '/activeNavigationTarget',
+                                        '/appSearch/searchTerm',
+                                        '/appSearch/showSelectedPressed',
+                                        'Selection>/appSearch/visualizations/tiles/length',
+                                        '/appSearch/visualizations/tiles',
+                                        '/appSearch/visualizations/cards',
+                                        '/appSearch/restrictedVisualizations',
+                                        '/appSearch/filteredAppCount',
+                                        '/appSearch/totalCount'
+                                    ], formatter: '.formatter.formatAppSearchTitle' }">
+                                    <layoutData>
+                                        <OverflowToolbarLayoutData
+                                            minWidth="6rem"
+                                            shrinkable="true"
+                                            priority="High"/>
+                                    </layoutData>
+                                </Title>
+                                <ToolbarSpacer/>
+
+                                <!-- Add 'search=".onSearch"' for server side searching -->
+                                <SearchField
+                                    id="appSearchField"
+                                    placeholder="{i18n>ContentFinder.AppSearch.SearchPlaceholder}"
+                                    search=".onSearch">
+                                    <layoutData>
+                                        <OverflowToolbarLayoutData
+                                            minWidth="6rem"
+                                            maxWidth="13.75rem"
+                                            shrinkable="true"
+                                            priority="NeverOverflow"/>
+                                    </layoutData>
+                                </SearchField>
+                                <ToggleButton
+                                    id="showAllSelectedBtn"
+                                    visible="{= ${/activeNavigationTarget} === ${/navigationTargets/appSearchTiles}}"
+                                    pressed="{/appSearch/showSelectedPressed}"
+                                    enabled="{= ${Selection>/appSearch/visualizations/tiles/length} > 0 || ${/appSearch/showSelectedPressed} }"
+                                    icon="sap-icon://multi-select"
+                                    tooltip="{= ${/appSearch/showSelectedPressed} ? ${i18n>ContentFinder.AppSearch.Button.Tooltip.ShowAll} : ${i18n>ContentFinder.AppSearch.Button.Tooltip.ShowSelected}}"
+                                    press=".onShowSelectedPressed">
+                                    <layoutData>
+                                        <OverflowToolbarLayoutData
+                                            shrinkable="false"
+                                            priority="Low"/>
+                                    </layoutData>
+                                </ToggleButton>
+                            </OverflowToolbar>
+                        </l:fixContent>
+                        <l:flexContent>
+                            <Page
+                                id="contentPage"
+                                showHeader="false"
+                                class="sapUiResponsiveContentPadding"
+                                busy="{= !${/appSearch/visualizationsLoaded}}">
+                                <f:GridList
+                                    id="tiles"
+                                    includeItemInSelection="true"
+                                    mode="MultiSelect"
+                                    growing="true"
+                                    growingScrollToLoad="true"
+                                    growingThreshold="{/appSearch/growingThreshold}"
+                                    updateStarted=".onUpdateStarted"
+                                    items="{/appSearch/visualizations/tiles}"
+                                    selectionChange=".onAppBoxSelected"
+                                    rememberSelections="false"
+                                    visible="{= ${/activeNavigationTarget} === ${/navigationTargets/appSearchTiles} &amp;&amp; ${/appSearch/visualizations/tiles/length} > 0 }">
+                                    <f:customLayout>
+                                        <grid:GridResponsiveLayout containerQuery="true">
+                                            <grid:layout>
+                                                <grid:GridSettings
+                                                    gridTemplateColumns="repeat(auto-fill, 19.0625rem)"
+                                                    gridAutoRows="12.75rem"
+                                                    gridGap="1rem"/>
+                                            </grid:layout>
+                                        </grid:GridResponsiveLayout>
+                                    </f:customLayout>
+                                    <core:Fragment
+                                        id="tilesBox"
+                                        fragmentName="sap.ushell.components.contentFinder.view.AppSearchBox"
+                                        type="XML"/>
+                                </f:GridList>
+                                <f:GridList
+                                    id="cards"
+                                    includeItemInSelection="true"
+                                    mode="SingleSelectMaster"
+                                    growing="true"
+                                    growingScrollToLoad="true"
+                                    growingThreshold="{/appSearch/growingThreshold}"
+                                    updateStarted=".onUpdateStarted"
+                                    items="{/appSearch/visualizations/cards}"
+                                    selectionChange=".onAppBoxSelectedAndClose"
+                                    rememberSelections="false"
+                                    visible="{= ${/activeNavigationTarget} === ${/navigationTargets/appSearchCards} &amp;&amp; ${/appSearch/visualizations/cards/length} > 0 }">
+                                    <f:customLayout>
+                                        <grid:GridResponsiveLayout containerQuery="true">
+                                            <grid:layout>
+                                                <grid:GridSettings
+                                                    gridTemplateColumns="repeat(auto-fill, 19.0625rem)"
+                                                    gridAutoRows="12.75rem"
+                                                    gridGap="1rem"/>
+                                            </grid:layout>
+                                        </grid:GridResponsiveLayout>
+                                    </f:customLayout>
+                                    <core:Fragment
+                                        id="cardsBox"
+                                        fragmentName="sap.ushell.components.contentFinder.view.AppSearchBox"
+                                        type="XML"/>
+                                </f:GridList>
+                                <IllustratedMessage
+                                    id="illustratedMessageNoData"
+                                    illustrationSize="IllustratedMessageSize.Auto"
+                                    visible="{
+                                    parts: [
+                                        { path: '/appSearch/visualizationsLoaded' },
+                                        { path: '/appSearch/visualizations/tiles/length' },
+                                        { path: '/appSearch/visualizations/cards/length' },
+                                        { path: '/appSearch/showSelectedPressed' },
+                                        { path: 'Selection>/appSearch/visualizations/tiles/length' }
+                                    ],
+                                    formatter: '._formatVisibilityIllustratedMessage'}"
+                                    illustrationType="{= ${/appSearch/searchTerm} ? 'sapIllus-SearchFolder' : 'sapIllus-Tent'}"/>
+                            </Page>
+                        </l:flexContent>
+                    </l:FixFlex>
+            </Page>
+        </detailPages>
+    </SplitContainer>
 </mvc:View>

package/src/main/js/sap/ushell/components/contentFinder/view/AppSearchCategoryTree.view.xml

@@ -0,0 +1,24 @@
+<mvc:XMLView 
+    xmlns="sap.m" 
+    xmlns:mvc="sap.ui.core.mvc" 
+    controllerName="sap.ushell.components.contentFinder.controller.AppSearch">
+    <Tree
+        id="CategoryTree"
+        sticky="HeaderToolbar"
+        mode="SingleSelectMaster"
+        selectionChange=".onTreeListItemPressed"
+        items="{/categoryTree}">
+        <headerToolbar>
+            <Toolbar>
+                <SearchField
+                    id="CategorySearch"
+                    placeholder="{i18n>ContentFinder.CategoryTree.Search}"
+                    width="100%"
+                    liveChange=".onCatalogSearch" />
+            </Toolbar>
+        </headerToolbar>
+        <items>
+            <StandardTreeItem title="{title}" type="{type}"  />
+        </items>
+    </Tree>
+</mvc:XMLView>

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

@@ -0,0 +1,31 @@
+//Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+/**
+ * @fileOverview ContentFinder standalone Component
+ *
+ * @version 1.123.0
+ */
+
+sap.ui.define([
+    "sap/ushell/components/contentFinder/Component"
+], function (Component) {
+    "use strict";
+
+    /**
+     * Component of the ContentFinder standalone view.
+     *
+     * @param {string} sId Component id.
+     * @param {object} mSettings Optional map for component settings.
+     * @class
+     * @extends sap.ui.core.UIComponent
+     * @private
+     * @since 1.123.0
+     * @alias sap.ushell.components.contentFinderStandalone.Component
+     */
+    return Component.extend("sap.ushell.components.contentFinderStandalone.Component",
+        /** @lends sap.ushell.components.contentFinderStandalone.Component.prototype */{
+        metadata: {
+            manifest: "json",
+            library: "sap.ushell"
+        }
+    });
+});

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

@@ -0,0 +1,146 @@
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+
+/**
+ * @file Controller for ContentFinderDialog standalone root view
+ * @version 1.123.0
+ */
+sap.ui.define([
+    "sap/ui/core/mvc/Controller",
+    "sap/ushell/utils/workpage/WorkPageService",
+    "sap/ushell/EventHub"
+], function (
+    Controller,
+    WorkPageService,
+    EventHub
+) {
+    "use strict";
+
+    /**
+     * @alias sap.ushell.components.contentFinderStandalone.controller.ContentFinderStandalone
+     * @class
+     * @classdesc Controller of the standalone root view.
+     *
+     * @param {string} sId Controller id.
+     * @param {object} oParams Controller parameters.
+     *
+     * @extends sap.ui.core.mvc.Controller
+     *
+     * @since 1.123.0
+     * @private
+     */
+    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();
+        },
+
+        /**
+         * 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(this._onVisualizationFilterApplied, this);
+            this.oComponent.setRestrictedMode(true);
+            this.oComponent.getModel().setProperty("/activeNavigationTarget", "appSearch_tiles");
+            this.oComponent.queryVisualizations(0);
+        },
+
+        /**
+         * 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());
+            const 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.
+         *
+         * @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: [
+                        {
+                            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] };
+        }
+    });
+});