@sapui5/sap.ushell 1.114.0 → 1.115.1

package/src/main/js/sap/ushell/components/cepsearchresult/app/util/i18n/i18n_zh_TW.properties

@@ -82,6 +82,21 @@ CATEGORIES.BusinessRecord.Card.SubTitle=
 CATEGORIES.BusinessRecord.LoadingData=\u6B63\u5728\u641C\u5C0B\u4F01\u696D\u8A18\u9304...
 CATEGORIES.BusinessRecord.NoData=\u627E\u4E0D\u5230\u7B26\u5408\u7684\u4F01\u696D\u8A18\u9304
 
+CATEGORIES.Document.Title=Documents
+CATEGORIES.Document.ShortTitle=Documents
+CATEGORIES.Document.Card.Title=Documents
+CATEGORIES.Document.Card.SubTitle=
+CATEGORIES.Document.LoadingData=Searching for documents
+CATEGORIES.Document.NoData=No matching documents found
+
+CATEGORIES.Video.Title=Videos
+CATEGORIES.Video.ShortTitle=Videos
+CATEGORIES.Video.Card.Title=Videos
+CATEGORIES.Video.Card.SubTitle=
+CATEGORIES.Video.LoadingData=Searching for videos
+CATEGORIES.Video.NoData=No matching videos found
+
+CATEGORIES.All.ViewAll=View All
 
 FILTERS.Tags.Label=\u6A19\u7C64/\u95DC\u9375\u5B57
 FILTERS.Tags.Description=\u7BE9\u9078\u6A19\u7C64\u548C\u95DC\u9375\u5B57
@@ -92,3 +107,11 @@ FILTERS.System.Description=\u5728\u7279\u5B9A\u9023\u63A5\u7CFB\u7D71\u4E2D\u7BE
 FILTERS.Modified.Label=\u5DF2\u4FEE\u6539
 FILTERS.Modified.Description=\u7BE9\u9078\u5DF2\u4FEE\u6539
 
+CATEGORY.Views.TileButtonText=Tile
+CATEGORY.Views.ListButtonText=List
+CATEGORY.Views.CardButtonText=Card
+CATEGORY.Views.TileButtonTooltip=Tile View
+CATEGORY.Views.ListButtonTooltip=List View
+CATEGORY.Views.CardButtonTooltip=Card View
+
+CATEGORY.Views.RefreshButton=Refresh Result

package/src/main/js/sap/ushell/components/container/ApplicationContainer.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The UI integration's SAPUI5 control which supports application embedding.
- * @version 1.114.0
+ * @version 1.115.1
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -2,18 +2,16 @@
 /**
  * @fileOverview ContentFinder Component
  *
- * @version 1.114.0
+ * @version 1.115.1
  */
 
 sap.ui.define([
     "sap/base/Log",
     "sap/base/util/deepExtend",
     "sap/base/util/ObjectPath",
-    "sap/m/library",
     "sap/ui/core/UIComponent",
-    "sap/ui/model/json/JSONModel",
-    "sap/ushell/library"
-], function (Log, deepExtend, ObjectPath, mobileLibrary, UIComponent, JSONModel, ushellLibrary) {
+    "sap/ushell/components/contentFinder/model/GraphQLModel"
+], function (Log, deepExtend, ObjectPath, UIComponent, GraphQLModel) {
     "use strict";
 
     /**
@@ -24,6 +22,14 @@ sap.ui.define([
      * @property {array} visualizationIds The list of visualization IDs to be added.
      */
 
+    /**
+     * Event to query visualizations with a set of types, searchTerm and pagination.
+     *
+     * @event sap.ushell.components.contentFinder.Component#visualizationFilterApplied
+     * @type {object}
+     * @property {{pagination: {skip: int, top: int}}} filter data Filter data object containing pagination and filter information.
+     */
+
     /**
      * Event if a widget (type) without target was selected in the widget gallery.
      *
@@ -32,6 +38,7 @@ sap.ui.define([
      * @property {string} widgetId The ID of the selected widget type
      */
 
+
     /**
      * The available navigation targets
      */
@@ -42,6 +49,11 @@ sap.ui.define([
         // TODO: appSearch_mixed: "appSearch_cards"
     };
 
+    var oNavigationTargetTypeMapping = {
+        appSearch_tiles: ["sap.ushell.StaticAppLauncher", "sap.ushell.DynamicAppLauncher"],
+        appSearch_cards: ["sap.card"]
+    };
+
     /**
      * Initial data to be set to the ContentFinder model.
      *
@@ -54,7 +66,7 @@ sap.ui.define([
         activeNavigationTarget: oNavigationTargets.widgetGallery,
 
         // A content finder in restricted mode shows no widget Gallery and starts directly with the appSearch.
-        // Additionally no "Back" button is rendered, as the end user cannot navigate to the WidgetGallery.
+        // Additionally, no "Back" button is rendered, as the end user cannot navigate to the WidgetGallery.
         restrictedMode: false,
 
         widgetGallery: {
@@ -62,6 +74,8 @@ sap.ui.define([
         },
 
         appSearch: {
+            growingThreshold: 30,
+            visualizationsLoaded: false,
             selectedAppCount: 0,
             hasSelectables: true,
             currentSelectedTreeNode: "",
@@ -76,6 +90,7 @@ sap.ui.define([
                 cards: [],
                 tiles: []
             },
+            totalCount: 0,
             originalRestrictedVisualizations: [],
             restrictedVisualizations: []
         }
@@ -117,7 +132,7 @@ sap.ui.define([
             this.oRootView = this.getRootControl();
             this.aRegisteredEvents = [];
 
-            var oModel = new JSONModel();
+            var oModel = new GraphQLModel();
             oModel.setSizeLimit(Infinity);
             this.setModel(oModel);
             this._initializeModel();
@@ -165,6 +180,35 @@ sap.ui.define([
             this.getModel().setProperty("/widgetGallery/widgetGroups", aWidgetGroups);
         },
 
+        /**
+         * Fires the event to query for visualizations.
+         *
+         * @since 1.115.0
+         * @param {int} iSkip Number of entries already displayed.
+         * @param {string} [sSearchTerm] The search term.
+         *
+         * @private
+         */
+        queryVisualizations: function (iSkip, sSearchTerm) {
+            var oModel = this.getModel();
+            var sActiveNavigationTarget = oModel.getProperty("/activeNavigationTarget");
+            var aTypes = oNavigationTargetTypeMapping[sActiveNavigationTarget] || [];
+
+            if (!this._bLoading) {
+                this._bLoading = true;
+                oModel.setProperty("/appSearch/visualizationsLoaded", false);
+
+                this.fireEvent("visualizationFilterApplied", {
+                    pagination: {
+                        skip: iSkip,
+                        top: oModel.getProperty("/appSearch/growingThreshold")
+                    },
+                    types: aTypes,
+                    search: sSearchTerm || null
+                });
+            }
+        },
+
         /**
          * Sets the visualization data for the Content Finder model.
          *
@@ -174,6 +218,7 @@ sap.ui.define([
          */
         setVisualizationData: function (oVisualizationData) {
             var aVisualizations = ObjectPath.get("Visualizations.nodes", oVisualizationData) || [];
+            var iTotalCount = ObjectPath.get("Visualizations.totalCount", oVisualizationData) || 0;
             var oModel = this.getModel();
 
             // Prepare AppBox object structure for tiles and cards
@@ -186,8 +231,47 @@ sap.ui.define([
 
             oModel.setProperty("/appSearch/visualizations/tiles", deepExtend([], aTiles));
             oModel.setProperty("/appSearch/visualizations/cards", deepExtend([], aCards));
+            oModel.setProperty("/appSearch/totalCount", iTotalCount);
+            oModel.setProperty("/appSearch/visualizationsLoaded", true);
 
             this._updateVisualizationsRestricted();
+            this._bLoading = false;
+        },
+
+        /**
+         * Concatenates the visualization data for the Content Finder model.
+         * Will replace 'setVisualizationData' once pagination is available.
+         *
+         * @param {object} oVisualizationData An object containing all the visualization data as arrays.
+         * @since 1.115.0
+         * @private
+         */
+        setVisualizationDataPaginated: function (oVisualizationData) {
+            var aVisualizations = ObjectPath.get("Visualizations.nodes", oVisualizationData) || [];
+            var iTotalCount = ObjectPath.get("Visualizations.totalCount", oVisualizationData) || 0;
+            var oModel = this.getModel();
+
+            // Prepare AppBox object structure for tiles and cards
+            var aTiles = this._prepareTiles(aVisualizations);
+            var aCards = this._prepareCards(aVisualizations);
+
+            var aExistingOriginalTiles = oModel.getProperty("/appSearch/originalVisualizations/tiles");
+            var aExistingOriginalCards = oModel.getProperty("/appSearch/originalVisualizations/cards");
+
+            var aExistingTiles = oModel.getProperty("/appSearch/visualizations/tiles");
+            var aExistingCards = oModel.getProperty("/appSearch/visualizations/cards");
+
+            // Set data to the main model
+            oModel.setProperty("/appSearch/originalVisualizations/tiles", aExistingOriginalTiles.concat(deepExtend([], aTiles)));
+            oModel.setProperty("/appSearch/originalVisualizations/cards", aExistingOriginalCards.concat(deepExtend([], aCards)));
+
+            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/visualizationsLoaded", true);
+
+            this._updateVisualizationsRestricted();
+            this._bLoading = false;
         },
 
         /**
@@ -195,7 +279,7 @@ sap.ui.define([
          *
          * A content finder in restricted mode shows no "Back" button as part of the AppSearch view.
          *
-         * @param {boolean} bRestrictedMode A boolean representring whether the content finder is restricted or not.
+         * @param {boolean} bRestrictedMode A boolean representing whether the content finder is restricted or not.
          * @since 1.113.0
          * @public
          */
@@ -240,19 +324,17 @@ sap.ui.define([
         /**
          * Returns all selected app boxes.
          *
-         * @param {boolean} [bDisabled] In case this parameter is provided, the "disabled" property is checked, too.
          * @returns {array} Returns an array containing all selected app boxes.
          * @since 1.113.0
          * @private
          */
-        getSelectedAppBoxes: function (bDisabled) {
+        getSelectedAppBoxes: function () {
             var oVisualizations = this.getModel().getProperty("/appSearch/visualizations");
             var aAllSelectedAppBoxes = [];
 
             Object.values(oVisualizations).forEach(function (aWidgetTypeData) {
                 var aSelectedAppBoxes = aWidgetTypeData.filter(function (oAppBox) {
-                    return oAppBox.selected
-                        && (typeof bDisabled !== "boolean" || oAppBox.disabled === bDisabled);
+                    return oAppBox.selected;
                 });
 
                 aAllSelectedAppBoxes = aAllSelectedAppBoxes.concat(aSelectedAppBoxes);
@@ -269,7 +351,7 @@ sap.ui.define([
          * @private
          */
         addVisualizations: function () {
-            var aSelectedAppBoxes = this.getSelectedAppBoxes(false);
+            var aSelectedAppBoxes = this.getSelectedAppBoxes();
             if (aSelectedAppBoxes.length > 0) {
                 this.fireEvent("visualizationsAdded", {
                     visualizations: aSelectedAppBoxes
@@ -333,6 +415,26 @@ sap.ui.define([
             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 'this' in order to allow 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;
+        },
+
 
         /**
          * Resets the AppSearch, but keeps originally passed visualizations in the model.
@@ -371,6 +473,17 @@ sap.ui.define([
             oModel.setProperty("/activeNavigationTarget", sTarget);
 
             if (sTarget === oNavigationTargets.appSearchTiles || sTarget === oNavigationTargets.appSearchCards) {
+
+                oModel.setProperty("/appSearch/originalVisualizations/tiles", []);
+                oModel.setProperty("/appSearch/originalVisualizations/cards", []);
+
+                oModel.setProperty("/appSearch/visualizations/tiles", []);
+                oModel.setProperty("/appSearch/visualizations/cards", []);
+
+                this._bLoading = false;
+
+                this.queryVisualizations(0);
+
                 return this.getNavContainer().then(function (oNavContainer) {
                     oNavContainer.to(this.oContentFinderAppSearchPage);
                 }.bind(this));
@@ -393,11 +506,27 @@ sap.ui.define([
             this.getModel().setData(deepExtend({}, oInitialData));
         },
 
+        /**
+         * @typedef preparedTile
+         * @property {string} id The vizId.
+         * @property {string} appId The appId.
+         * @property {string} icon The icon src.
+         * @property {string} info The info string.
+         * @property {string} launchUrl The launch url for the tile.
+         * @property {string} subtitle The subtitle.
+         * @property {string} title The title.
+         * @property {string} type The type.
+         * @property {string} dataHelpId The data-help-id for the assistant.
+         * @property {object} vizData The whole vizData object.
+         * @property {boolean} selected flag.
+         * @property {boolean} added added flag. True if the visualization was already added to the cell.
+         */
+
         /**
          * Prepares tiles from the visualizationData and enriches them for the appBoxes.
          *
          * @param {array} aVisualizationData The visualizationData from the consumer
-         * @returns {object} oData The prepared and filtered tiles
+         * @returns {array<preparedTile>} The prepared and filtered tiles
          * @since 1.113.0
          * @private
          */
@@ -409,8 +538,7 @@ sap.ui.define([
                 ].indexOf(tile.Type) > -1;
             });
 
-            var oData = [];
-            aTilesData.forEach(function (oTile, iIndex) {
+            return aTilesData.map(function (oTile) {
                 if (!oTile.Descriptor) {
                     Log.error("No Descriptor available. Cannot load this tile!", null, this.logComponent);
                     return;
@@ -426,42 +554,51 @@ sap.ui.define([
                     sAppID = oTileSapApp.id;
                 }
 
-                oData.push({
+                return {
                     id: oTile.Id,
                     appId: sAppID,
                     icon: ObjectPath.get("icons.icon", oTile.Descriptor["sap.ui"]) || "",
                     info: oTileSapApp && oTileSapApp.info || "",
                     launchUrl: oTile.Descriptor["sap.flp"] && oTile.Descriptor["sap.flp"].target || "",
-                    previewSize: ushellLibrary.AppBoxPreviewSize.Small,
-                    posinset: iIndex + 1,
-                    setsize: aTilesData.length,
                     subtitle: oTileSapApp && oTileSapApp.subTitle || "",
                     title: oTileSapApp && oTileSapApp.title || "",
                     type: oTile.Type,
-                    frameType: mobileLibrary.FrameType.OneByOne,
+                    dataHelpId: oTile.Id,
                     vizData: oTile,
                     selected: false,
-                    disabled: false
-                });
+                    added: false
+                };
             }.bind(this));
-            return oData;
         },
 
+        /**
+         * @typedef preparedCard
+         * @property {string} id The vizId.
+         * @property {string} appId The appId.
+         * @property {string} icon The icon src.
+         * @property {string} info The info string.
+         * @property {string} subtitle The subtitle.
+         * @property {string} title The title.
+         * @property {string} type The type.
+         * @property {object} manifest The card manifest (Descriptor).
+         * @property {string} dataHelpId The data-help-id for the assistant.
+         * @property {object} vizData The whole vizData object.
+         */
+
         /**
          * Prepares cards from the visualizationData and enriches them for the appBoxes.
          *
          * @param {array} aVisualizationData The visualizationData from the consumer
-         * @returns {object} oData The prepared and filtered tiles
+         * @returns {array<preparedCard>} The prepared cards
          * @since 1.113.0
          * @private
          */
         _prepareCards: function (aVisualizationData) {
-            var aCardsData = aVisualizationData.filter(function (tile) {
-                return tile.Type === "sap.card";
+            var aCardsData = aVisualizationData.filter(function (oViz) {
+                return oViz.Type === "sap.card";
             });
 
-            var oData = [];
-            aCardsData.forEach(function (oCard, iIndex) {
+            return aCardsData.map(function (oCard) {
                 if (!oCard.Descriptor) {
                     Log.error("No Descriptor available. Cannot load this card!", null, this.logComponent);
                     return;
@@ -470,28 +607,23 @@ sap.ui.define([
                 var oCardSapApp = oCard.Descriptor["sap.app"];
                 var sAppID = oCardSapApp && oCardSapApp.id || "";
 
-                oData.push({
+                return {
                     id: oCard.Id,
                     appId: sAppID,
                     icon: ObjectPath.get("icons.icon", oCard.Descriptor["sap.ui"]) || "",
                     info: oCardSapApp && oCardSapApp.info || "",
-                    previewSize: ushellLibrary.AppBoxPreviewSize.Large,
-                    posinset: iIndex + 1,
-                    setsize: aCardsData.length,
                     subtitle: oCardSapApp && oCardSapApp.subTitle || "",
                     title: oCardSapApp && oCardSapApp.title || "",
                     type: oCard.Type,
                     manifest: oCard.Descriptor,
-                    vizData: oCard,
-                    selected: false,
-                    disabled: false
-                });
+                    dataHelpId: oCard.Id,
+                    vizData: oCard
+                };
             }.bind(this));
-            return oData;
         },
 
         /**
-         * Updates the restricted state of the currently available visualizations.
+         * Updates the added flag of the currently available visualizations.
          *
          * @since 1.113.0
          * @private
@@ -502,9 +634,7 @@ sap.ui.define([
             var aTiles = oModel.getProperty("/appSearch/visualizations/tiles");
 
             var aPreparedTiles = aTiles.map(function (oTile) {
-                var bRestricted = aRestrictedVisualizations.includes(oTile.id);
-                oTile.selected = bRestricted;
-                oTile.disabled = bRestricted;
+                oTile.added = aRestrictedVisualizations.includes(oTile.id);
                 return oTile;
             });