@sapui5/sap.ushell 1.130.1 → 1.131.0

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

@@ -2,7 +2,7 @@
 /**
  * @fileOverview ContentFinder Component
  *
- * @version 1.130.1
+ * @version 1.131.0
  */
 
 sap.ui.define([
@@ -13,10 +13,13 @@ sap.ui.define([
     "sap/ushell/components/contentFinder/model/GraphQLModel",
     "sap/ui/model/json/JSONModel",
     "sap/ushell/adapters/cdm/v3/utilsCdm",
-    "sap/ushell/Config"
-], function (Log, deepExtend, ObjectPath, UIComponent, GraphQLModel, JSONModel, utilsCdm, Config) {
+    "sap/ushell/Config",
+    "sap/f/library"
+], function (Log, deepExtend, ObjectPath, UIComponent, GraphQLModel, JSONModel, utilsCdm, Config, fLibrary) {
     "use strict";
 
+    const LayoutType = fLibrary.LayoutType;
+
     /**
      * Event for the visualizations to be added
      *
@@ -54,9 +57,7 @@ sap.ui.define([
             visualizations: {
                 tiles: []
             }
-        },
-
-        personalizationEnabled: Config.last("/core/shell/enablePersonalization")
+        }
     };
 
     /**
@@ -65,6 +66,7 @@ sap.ui.define([
      * @type {object}
      */
     var oInitialData = {
+        standalone: false, // If the ContentFinder is in standalone mode or not
         navigationTargets: oNavigationTargets,
 
         // The current/active navigation target within the ContentFinderDialog
@@ -76,9 +78,7 @@ sap.ui.define([
         // Additionally, no "Back" button is rendered, as the end user cannot navigate to the WidgetGallery.
         restrictedMode: false,
 
-        personalizationEnabled: Config.last("/core/shell/enablePersonalization"),
-
-        listViewEnabled: Config.last("/core/workPages/contentFinderListView"),
+        personalizationEnabled: false,
 
         widgetGallery: {
             widgetGroups: []
@@ -103,7 +103,7 @@ sap.ui.define([
             listView: false
         },
         categoryTree: [],
-        categoryTreeVisible: false
+        categoryTreeAvailable: false
     };
 
     /**
@@ -164,6 +164,42 @@ sap.ui.define([
                          */
                         categoryId: { type: "string" }
                     }
+                },
+                /**
+                 * Fires when the Content Finder dialog is closed:
+                 * @type {object}
+                 * @since 1.113.0
+                 * @private
+                 */
+                contentFinderClosed: {
+                    parameters: {}
+                },
+                /**
+                 * Fires when a widget is selected
+                 * @type {object}
+                 * @since 1.112.0
+                 * @private
+                 */
+                widgetSelected: {
+                    parameters: {
+                        /**
+                         * The currently selected widget ID
+                         */
+                        widgetId: { type: "string" }
+                    }
+                }, /**
+                 * Fires the event which provides the added visualizations.
+                 * @type {object}
+                 * @since 1.112.0
+                 * @private
+                 */
+                visualizationsAdded: {
+                    parameters: {
+                        /**
+                         * The visualizations object
+                         */
+                        visualizations: { type: "object[]" }
+                    }
                 }
             }
         },
@@ -184,7 +220,6 @@ sap.ui.define([
             UIComponent.prototype.init.apply(this, arguments);
 
             this.oResourceBundle = this.getModel("i18n").getResourceBundle();
-            this.aRegisteredEvents = [];
 
             var oModel = new GraphQLModel();
             var oSelectionModel = new JSONModel();
@@ -257,15 +292,18 @@ sap.ui.define([
          */
         /**
          * Sets the category tree data for the Content Finder model.
+         *
          * The category tree does not support pagination. All tree data must be set at once.
+         * If a category tree is available, the category tree is shown in the Content Finder by setting
+         * the FlexibleColumnLayout to TwoColumnsMidExpanded.
          *
-         * @param {CategoryTreeItem[]|[]|undefined} aCategoryTree A tree of category objects, undefined to hide the category tree or empty array to show message in DT.
+         * @param {CategoryTreeItem[]|[]} aCategoryTree A tree of category objects.
          * @experimental
          * @private
          */
         setCategoryTree: function (aCategoryTree) {
-            this.getModel().setProperty("/categoryTreeVisible", Array.isArray(aCategoryTree));
             this.getModel().setProperty("/categoryTree", aCategoryTree);
+            this.initializeSidebarStatus();
         },
 
         /**
@@ -318,15 +356,12 @@ sap.ui.define([
 
             var aExistingTiles = oModel.getProperty("/appSearch/visualizations/tiles");
             var aExistingCards = oModel.getProperty("/appSearch/visualizations/cards");
-            var bShowAppLaunchButton = oModel.getProperty("/showLaunchButton") || false;
 
             oModel.setProperty("/appSearch/visualizations/tiles", aExistingTiles.concat(deepExtend([], aTiles)));
             oModel.setProperty("/appSearch/visualizations/cards", aExistingCards.concat(deepExtend([], aCards)));
             oModel.setProperty("/appSearch/totalCount", iTotalCount);
             oModel.setProperty("/appSearch/filteredAppCount", iTotalCount);
             oModel.setProperty("/appSearch/visualizationsLoaded", true);
-            oModel.setProperty("/appSearch/showLaunchButton", bShowAppLaunchButton);
-
 
             this._updateVisualizationsRestricted();
             this._bLoading = false;
@@ -379,10 +414,18 @@ sap.ui.define([
             }.bind(this));
         },
 
+        /**
+         * @typedef {Object} Visualization
+         * @property {string} id - Unique identifier for the visualization.
+         * @property {string} title - Title of the visualization.
+         * @property {string} subtitle - Subtitle or description of the visualization.
+         */
+
         /**
          * Fires the <code>visualizationAdded</code> event which provides the added visualizations.
          *
          * @fires sap.ushell.components.contentFinder.Component#visualizationsAdded
+         * @param {Visualization[]} aVisualizationsToAdd An array of visualizations to be added.
          * @since 1.113.0
          * @private
          */
@@ -393,83 +436,26 @@ sap.ui.define([
                 });
             }
         },
-
         /**
-         * Attaches an event handler to the 'contentFinderClosed' event.
-         *
-         * When called, the context of the event handler will be bound to 'oListener' if specified, otherwise it will be bound to this.
-         *
-         * @param {function} fnFunction The callback to be called, when the event is triggered
-         * @param {object} [oListener] Context object to call the event handler with. Defaults to this.
-         * @returns {this} Reference to <code>this</code> for method chaining.
-         * @since 1.113.0
+         * Function to trigger the <code>contentFinderClosed</code> event.
+         * It will fire the `contentFinderClosed` without any parameters.
+         * @since 1.131.0
          * @private
          */
-        attachContentFinderClosed: function (fnFunction, oListener) {
-            this.aRegisteredEvents.push({ id: "contentFinderClosed", callback: fnFunction, listener: oListener });
-
-            this.attachEventOnce("contentFinderClosed", fnFunction, oListener);
-            return this;
+        triggerContentFinderClosed: function() {
+            this.fireEvent("contentFinderClosed");
         },
-
         /**
-         * Attaches an event handler to the 'widgetSelected' event.
-         *
-         * When called, the context of the event handler will be bound to 'oListener' if specified, otherwise it will be bound to this.
-         *
-         * @param {object} oData An application-specific payload object that will be passed to the event handler.
-         * @param {function} fnFunction The callback to be called, when the event is triggered
-         * @param {object} [oListener] Context object to call the event handler with. Defaults to this.
-         * @returns {this} Reference to <code>this</code> for method chaining.
-         * @since 1.113.0
+         * Fires the <code>widgetSelected</code> event .
+         * @param {string} [widgetId] The widget ID resulting from the widget selection.
+         * @since 1.131.0
          * @private
          */
-        attachWidgetSelected: function (oData, fnFunction, oListener) {
-            this.aRegisteredEvents.push({ id: "widgetSelected", callback: fnFunction, listener: oListener });
-
-            this.attachEventOnce("widgetSelected", oData, fnFunction, oListener);
-            return this;
-        },
-
-        /**
-         * Attaches an event handler to the 'visualizationsAdded' event.
-         *
-         * When called, the context of the event handler will be bound to 'oListener' if specified, otherwise it will be bound to this.
-         *
-         * @param {object} oData An application-specific payload object that will be passed to the event handler.
-         * @param {function} fnFunction The callback to be called, when the event is triggered
-         * @param {object} [oListener] Context object to call the event handler with. Defaults to this.
-         * @returns {this} Reference to <code>this</code> for method chaining.
-         * @since 1.113.0
-         * @private
-         */
-        attachVisualizationsAdded: function (oData, fnFunction, oListener) {
-            this.aRegisteredEvents.push({ id: "visualizationsAdded", callback: fnFunction, listener: oListener });
-
-            this.attachEventOnce("visualizationsAdded", oData, fnFunction, oListener);
-            return this;
-        },
-
-        /**
-         * Attaches an event handler to the 'visualizationFilterApplied' event.
-         *
-         * When called, the context of the event handler will be bound to 'oListener' if specified, otherwise it will
-         * be bound to this.
-         *
-         * @param {object} oData An application-specific payload object that will be passed to the event handler.
-         * @param {function} fnFunction The callback to be called, when the event is triggered
-         * @param {object} [oListener] Context object to call the event handler with. Defaults to this.
-         * @returns {this} Reference to <code>this</code> for method chaining.
-         * @since 1.115.0
-         * @private
-         */
-        attachVisualizationFilterApplied: function (oData, fnFunction, oListener) {
-            this.aRegisteredEvents.push({ id: "visualizationFilterApplied", callback: fnFunction, listener: oListener });
-
-            this.attachEvent("visualizationFilterApplied", oData, fnFunction, oListener);
-            return this;
+        triggerWidgetSelected: function (widgetId) {
+            if (widgetId) {
+                this.fireEvent("widgetSelected", { widgetId: widgetId });
+            }
         },
-
         /**
          * Resets the AppSearch, but keeps originally passed visualizations in the model.
          *
@@ -494,7 +480,9 @@ sap.ui.define([
             var oModel = this.getModel();
 
             oModel.setProperty("/activeNavigationTarget", sTarget);
-
+            if (sTarget === oNavigationTargets.appSearchCards) {
+                this.initializeSidebarStatus();
+            }
             if (sTarget === oNavigationTargets.appSearchTiles || sTarget === oNavigationTargets.appSearchCards) {
                 oModel.setProperty("/appSearch/visualizations/tiles", []);
                 oModel.setProperty("/appSearch/visualizations/cards", []);
@@ -522,7 +510,9 @@ sap.ui.define([
          * @private
          */
         initializeModel: function () {
-            this.getModel().setData(deepExtend({}, oInitialData));
+            const oModel = this.getModel();
+            oModel.setData(deepExtend({}, oInitialData));
+            this.initializeModelData(oModel);
         },
 
         /**
@@ -532,7 +522,64 @@ sap.ui.define([
          * @private
          */
         initializeSelectionModel: function () {
-            this.getModel("Selection").setData(deepExtend({}, oInitialSelectionData));
+            const oModel = this.getModel("Selection");
+            oModel.setData(deepExtend({}, oInitialSelectionData));
+            this.initializeModelData(oModel);
+        },
+
+        /**
+         * Initializes the model data.
+         *
+         * The method should also set all model related properties to their initial values.
+         *
+         * @param {sap.ui.model.json.JSONModel} oModel The model to initialize
+         * @since 1.131.0
+         * @private
+         */
+        initializeModelData: function (oModel) {
+            // If a siteId is set, the AppFinder is in run time mode, without siteId design time mode.
+            const oUrlParams = new URLSearchParams(window.location.search);
+            const bIsDesignTime = !(oUrlParams.get("siteId") || Config.last("/core/site/siteId"));
+
+            // The category tree is always available in design time.
+            oModel.setProperty("/appSearch/isDesignTime", bIsDesignTime);
+
+            oModel.setProperty("/categoryTreeAvailable", bIsDesignTime);
+            oModel.setProperty("/appSearch/showLaunchButton", !bIsDesignTime);
+            oModel.setProperty("/personalizationEnabled", Config.last("/core/shell/enablePersonalization"));
+
+            this.initializeSidebarStatus();
+
+            /**
+             * 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");
+            oModel.setProperty("/linkToAppFinder", oUrl.toString());
+        },
+
+        /**
+         * Initializes the sidebar status.
+         *
+         * The sidebar status is set to MidColumnFullScreen (no category tree) if the category tree is empty in run time.
+         *
+         * @since 1.131.0
+         * @private
+         */
+        initializeSidebarStatus: function () {
+            const oModel = this.getModel();
+
+            const bDesignTime = oModel.getProperty("/appSearch/isDesignTime");
+            const vCategoryTree = oModel.getProperty("/categoryTree");
+            const sActiveNavigationTarget = oModel.getProperty("/activeNavigationTarget");
+
+            if ((!bDesignTime && vCategoryTree?.length === 0) || (bDesignTime && sActiveNavigationTarget === oNavigationTargets.appSearchCards)) {
+                oModel.setProperty("/categoryTreeAvailable", false);
+                oModel.setProperty("/sidebarStatus", LayoutType.MidColumnFullScreen);
+            } else {
+                oModel.setProperty("/categoryTreeAvailable", Array.isArray(vCategoryTree));
+                oModel.setProperty("/sidebarStatus", LayoutType.TwoColumnsMidExpanded);
+            }
         },
 
         /**
@@ -673,23 +720,6 @@ sap.ui.define([
 
             oModel.setProperty("/appSearch/visualizations/tiles", aPreparedTiles);
 
-        },
-
-        /**
-         * Once the ContentFinder is closed, all the component registered events need to be detached
-         *
-         * @since 1.113.0
-         * @private
-         */
-        _unregisterEvents: function () {
-            this.aRegisteredEvents.forEach(function (oRegisteredEvent) {
-                var sEventId = oRegisteredEvent.id;
-                var fnFunction = oRegisteredEvent.callback;
-                var oListener = oRegisteredEvent.listener;
-                this.detachEvent(sEventId, fnFunction, oListener);
-            }.bind(this));
-
-            this.aRegisteredEvents = [];
         }
     });
 });

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

@@ -2,7 +2,7 @@
 
 /**
  * @file AppSearch controller for AppSearch view
- * @version 1.130.1
+ * @version 1.131.0
  */
 sap.ui.define([
     "./ContentFinderDialog.controller",
@@ -25,11 +25,11 @@ sap.ui.define([
     hasher,
     Filter,
     FilterOperator,
-    library
+    fLibrary
 ) {
     "use strict";
 
-    const LayoutType = library.LayoutType;
+    const LayoutType = fLibrary.LayoutType;
     const ListType = mobileLibrary.ListType;
 
     /**
@@ -66,15 +66,14 @@ sap.ui.define([
             this.oModel = oComponent.getModel();
             this.oSelectionModel = oComponent.getModel("Selection");
             this.oResourceBundle = oComponent.getModel("i18n").getResourceBundle();
-            this.oModel.setProperty("/sidebarStatus", LayoutType.TwoColumnsMidExpanded);
-            this.oModel.setProperty("/appSearch/isDesignTime", !!Config.last("/core/site/siteId"));
-
             const oContentFinder = this.byId("contentFinderAppSearchFlexibleColumnLayout");
             oContentFinder.attachStateChange(this.onFlexibleColumnLayoutStateChange.bind(this));
         },
 
         /**
-         * Triggered when the 'FlexibleColumnLayout' state changes. Sets up the initial layout of the 'FlexibleColumnLayout' component by updating relevant model priperties.
+         * Triggered when the 'FlexibleColumnLayout' state changes.
+         *
+         * Sets up the initial layout of the 'FlexibleColumnLayout' component by updating relevant model properties.
          *
          * - Updates the model properties based on the event parameters.
          *
@@ -85,9 +84,16 @@ sap.ui.define([
         onFlexibleColumnLayoutStateChange: function (oEvent) {
             const sLayout = oEvent.getParameter("layout");
             const iMaxColumnsCount = oEvent.getParameter("maxColumnsCount");
+
+            // This happens only if the layout was resized to a larger width when only the category tree is displayed,
+            // then the layout needs to leave the "OneColumn" state because there are more columns available.
+            // Otherwise, we just update the sidebarStatus property.
             if (sLayout === LayoutType.OneColumn && iMaxColumnsCount > 1) {
                 this.oModel.setProperty("/sidebarStatus", LayoutType.TwoColumnsMidExpanded);
+            } else {
+                this.oModel.setProperty("/sidebarStatus", sLayout);
             }
+
             this.oModel.setProperty("/maxColumnsCount", iMaxColumnsCount);
         },
 
@@ -106,9 +112,7 @@ sap.ui.define([
             this.emptyVisualizations();
             this.getOwnerComponent().initializeSelectionModel();
             this.toggleSelectionView(false);
-            this.getView().byId("appSearchField").setValue("");
-            this.oModel.setProperty("/appSearch/searchTerm", "");
-            this.sCurrentSearchTerm = "";
+            this.resetVisualizationsSearchField();
         },
 
         /**
@@ -292,12 +296,25 @@ sap.ui.define([
             this.byId(tilesView).setModel(oModel);
         },
 
+        /**
+         * Resets all data related to the visualizations search field.
+         *
+         * @private
+         * @since 1.131.0
+         */
+        resetVisualizationsSearchField: function () {
+            this.getView().byId("appSearchField").setValue("");
+            this.oModel.setProperty("/appSearch/searchTerm", "");
+            this.sCurrentSearchTerm = "";
+        },
+
         onCategoryTreeItemPressed: function (oEvent) {
             const oItem = oEvent.getParameter("listItem");
             if (oItem.getType() !== ListType.Inactive) {
                 this.oModel.setProperty("/sidebarStatus", LayoutType.TwoColumnsMidExpanded);
 
-                this.resetAppSearch();
+                this.emptyVisualizations();
+                this.resetVisualizationsSearchField();
                 const sCategoryId = oItem.getBindingContext().getProperty("id");
                 const sCategoryTitle = oItem.getBindingContext().getProperty("title");
                 this.oModel.setProperty("/selectedCategoryId", sCategoryId);
@@ -312,10 +329,6 @@ sap.ui.define([
             }
         },
 
-        onCategoryTreeClosePressed: function () {
-            this.oModel.setProperty("/sidebarStatus", LayoutType.MidColumnFullScreen);
-        },
-
         onCategoryTreeUpdateFinished: function (oEvent) {
             const oTree = oEvent.getSource();
             /** The <code>checkUpdate</code> implementation of the <code>ClientTreeBinding</code>
@@ -341,6 +354,10 @@ sap.ui.define([
          * Updates the sidebar status based on the current layout and the maximum number of columns,
          * which causes the layout of the 'FlexibleColumnLayout' to change into it's new desired state.
          *
+         * OneColumn: Only the SidePanel is shown.
+         * MidColumnFullScreen: Only the visualizations are shown.
+         * TwoColumnsMidExpanded: The SidePanel is shown and the other columns with the visualizations are expanded.
+         *
          * @since 1.129.0
          * @private
          */
@@ -370,36 +387,6 @@ sap.ui.define([
             } else {
                 WindowUtils.openURL(sSelectedTileLaunchUrl, "_blank");
             }
-        },
-
-        /**
-         * Formats the accessibility description for the custom list item. This will be part of the string read out by the screen reader.
-         *
-         * @param {string} sTitle The app title.
-         * @param {string} sSubtitle The app subtitle.
-         * @param {boolean} bAdded Flag indicating if the app has already been added to the cell.
-         * @param {string} sFioriIdLabel The app title.
-         * @param {string} sAppId The app subtitle.
-         * @param {string} sInformationLabel The information label
-         * @param {string} sInfo The app information
-         * @param {string} sSystemLabel The system label
-         * @param {string} sSystemId The system
-         * @param {string} sFieldEmpty The field empty text
-         * @since 1.115.0
-         * @returns {string} The description.
-         */
-        formatAppBoxAccDescription: function (sTitle, sSubtitle, bAdded, sFioriIdLabel, sAppId, sInformationLabel, sInfo, sSystemLabel, sSystemId, sFieldEmpty) {
-            const aDescriptions = [];
-            if (sTitle) { aDescriptions.push(sTitle); }
-            if (sSubtitle) { aDescriptions.push(sSubtitle); }
-            if (bAdded) { aDescriptions.push(this.oResourceBundle.getText("ContentFinder.AppSearch.Message.AlreadyUsed")); }
-            if (sFioriIdLabel) { aDescriptions.push(sFioriIdLabel); }
-            if (sAppId) { aDescriptions.push(sAppId); } else if (sFieldEmpty) { aDescriptions.push(sFieldEmpty); }
-            if (sInformationLabel) { aDescriptions.push(sInformationLabel); }
-            if (sInfo) { aDescriptions.push(sInfo); } else if (sFieldEmpty) { aDescriptions.push(sFieldEmpty); }
-            if (sSystemLabel) { aDescriptions.push(sSystemLabel); }
-            if (sSystemId) { aDescriptions.push(sSystemId); } else if (sFieldEmpty) { aDescriptions.push(sFieldEmpty); }
-            return aDescriptions.join(" . ");
         }
     });
 });

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

@@ -2,7 +2,7 @@
 
 /**
  * @file Controller for ContentFinderDialog root view
- * @version 1.130.1
+ * @version 1.131.0
  */
 sap.ui.define([
     "../model/formatter",
@@ -107,10 +107,8 @@ sap.ui.define([
             // Navigate to the initial page to trigger the "navigate" event of the NavContainer every time the view is displayed.
             return oOwnerComponent.getNavContainer().then(function (oNavContainer) {
                 oNavContainer.backToTop();
-                oOwnerComponent.fireEvent("contentFinderClosed");
+                oOwnerComponent.triggerContentFinderClosed();
 
-                //Once the ContentFinder is closed, all registered events need to be detached
-                oOwnerComponent._unregisterEvents();
             });
         }
     });

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

@@ -2,7 +2,7 @@
 
 /**
  * @file Controller for WidgetGallery view
- * @version 1.130.1
+ * @version 1.131.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.130.1"
+            "version": "1.131.0"
         },
         "i18n": "./resources/resources.properties",
         "ach": "CA-FLP-FE-UI",

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

@@ -8,6 +8,34 @@ sap.ui.define([
     "use strict";
 
     return JSONListBinding.extend("sap.ushell.components.contentFinder.model.GraphQLListBinding", {
+
+
+        /**
+         * Creates a new GraphQLListBinding.
+         *
+         * Override to provide the totalCount property path via parameter.
+         *
+         * @param {sap.ui.model.json.JSONModel} oModel Model instance that this binding is created for and that it belongs to
+         * @param {string} sPath Binding path to be used for this binding
+         * @param {sap.ui.model.Context} oContext Binding context relative to which a relative binding path will be resolved
+         * @param {sap.ui.model.Sorter[]|sap.ui.model.Sorter} [aSorters=[]]
+         *   The sorters used initially; call {@link #sort} to replace them
+         * @param {sap.ui.model.Filter[]|sap.ui.model.Filter} [aFilters=[]]
+         *   The filters to be used initially with type {@link sap.ui.model.FilterType.Application}; call {@link #filter} to
+         *   replace them
+         * @param {object} [mParameters] Map of optional parameters as defined by subclasses; this class does not introduce any own parameters
+         *
+         * @augments sap.ui.model.json.JSONListBinding
+         * @since 1.131.0
+         */
+        constructor: function (oModel, sPath, oContext, aSorters, aFilters, mParameters) {
+            JSONListBinding.apply(this, arguments);
+
+            if (mParameters?.totalCountPropertyPath !== undefined) {
+                this.sTotalCountPropertyPath = mParameters.totalCountPropertyPath;
+            }
+        },
+
         /**
          * Override to return the totalCount returned by the server.
          * The amount of items in the model will not represent the total count because the data may be paginated.
@@ -20,7 +48,12 @@ sap.ui.define([
             if (this.aFilters && this.aFilters.length > 0 && this.aFilters[0].getFilters().length > 0) {
                 return this.iLength;
             }
-            return this.getModel().getProperty("/appSearch/totalCount") || 0;
+
+            if (this.sTotalCountPropertyPath === undefined) {
+                return this.iLength;
+            } else {
+                return this.getModel().getProperty(this.sTotalCountPropertyPath) || 0;
+            }
         },
 
         /**