@sapui5/sap.ushell 1.120.7 → 1.121.0

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

@@ -5,12 +5,13 @@ sap.ui.define([
     "sap/m/library",
     "sap/m/MessageBox",
     "sap/m/GroupHeaderListItem",
-    "sap/ui/core/Core",
+    "sap/ui/core/Element",
     "sap/ui/core/UIComponent",
     "sap/ui/model/Filter",
     "sap/ui/model/FilterOperator",
     "sap/ui/model/json/JSONModel",
     "sap/ushell/Config",
+    "sap/ushell/Container",
     "sap/ushell/library",
     "sap/ushell/resources"
 ], function (
@@ -18,12 +19,13 @@ sap.ui.define([
     mobileLibrary,
     MessageBox,
     GroupHeaderListItem,
-    Core,
+    Element,
     UIComponent,
     Filter,
     FilterOperator,
     JSONModel,
     Config,
+    Container,
     ushellLibrary,
     resources
 ) {
@@ -38,7 +40,7 @@ sap.ui.define([
     // visualizationOrganizer Component
     return UIComponent.extend("sap.ushell.components.visualizationOrganizer.Component", {
         metadata: {
-            version: "1.120.7",
+            version: "1.121.0",
             library: "sap.ushell",
             dependencies: { libs: ["sap.m"] },
             properties: {
@@ -67,7 +69,7 @@ sap.ui.define([
         requestData: function () {
             var bOnlyHomePage = !Config.last("/core/shell/enablePersonalization") && Config.last("/core/spaces/myHome/enabled");
             var sMyHomePageId = Config.last("/core/spaces/myHome/myHomePageId");
-            return sap.ushell.Container.getServiceAsync("CommonDataModel")
+            return Container.getServiceAsync("CommonDataModel")
                 .then(function (oCommonDataModelService) {
                     return oCommonDataModelService.getAllPages();
                 })
@@ -234,7 +236,7 @@ sap.ui.define([
          * @protected
          */
         open: function (oOpenBy, oVizInfo) {
-            var oPopover = Core.byId("sapUshellVisualizationOrganizerPopover");
+            var oPopover = Element.getElementById("sapUshellVisualizationOrganizerPopover");
             var oLoadPopover = Promise.resolve();
 
             if (!oPopover) {
@@ -262,8 +264,8 @@ sap.ui.define([
                 oPopover.attachAfterClose(this.fnResetPopup);
 
                 return Promise.all([
-                    sap.ushell.Container.getServiceAsync("Menu"),
-                    sap.ushell.Container.getServiceAsync("Pages")
+                    Container.getServiceAsync("Menu"),
+                    Container.getServiceAsync("Pages")
                 ]).then(function (aResults) {
                     var oPageAssociation;
                     var oMenuService = aResults[0];
@@ -357,7 +359,7 @@ sap.ui.define([
          * @protected
          */
         cancel: function () {
-            var oPopover = Core.byId("sapUshellVisualizationOrganizerPopover");
+            var oPopover = Element.getElementById("sapUshellVisualizationOrganizerPopover");
             var oChangedItems = this._retrieveChangedPageIds();
 
             if (oPopover && oChangedItems.deleteFromPageIds.length === 0 && oChangedItems.addToPageIds.length === 0) {
@@ -390,7 +392,7 @@ sap.ui.define([
          * @protected
          */
         toggle: function (oOpenBy, oVizInfo) {
-            var oPopover = Core.byId("sapUshellVisualizationOrganizerPopover");
+            var oPopover = Element.getElementById("sapUshellVisualizationOrganizerPopover");
             // To really make the visualizationOrganizer toggleable, we need to know the last openBy control.
             if (oPopover && oPopover.isOpen() && oPopover._oOpenBy && oPopover._oOpenBy.getId() === oOpenBy.getId()) {
                 this.cancel();
@@ -410,7 +412,7 @@ sap.ui.define([
          * @private
          */
         _applyOrganizationChangeToSection: function (oOpenBy, oVizInfo, oSectionContext) {
-            return sap.ushell.Container.getServiceAsync("Pages").then(function (oPageService) {
+            return Container.getServiceAsync("Pages").then(function (oPageService) {
                 var oVizChangeChain;
                 var sVizId = decodeURIComponent(oVizInfo.id);
                 var sVisualizationTitle = oVizInfo.title;
@@ -546,7 +548,7 @@ sap.ui.define([
             var oOpenBy = this.oOpenBy;
             var stAlreadyRemovedFromPageId = new Set();
             var oPagesService;
-            var oVizChangeChain = sap.ushell.Container.getServiceAsync("Pages").then(function (PagesService) {
+            var oVizChangeChain = Container.getServiceAsync("Pages").then(function (PagesService) {
                 oPagesService = PagesService;
             });
 
@@ -606,10 +608,10 @@ sap.ui.define([
          * @private
          */
         _resetPopup: function (oEvent) {
-            var oPopover = Core.byId("sapUshellVisualizationOrganizerPopover");
-            var oPagesList = Core.byId("sapUshellVisualizationOrganizerSpacesList");
-            var oSearchField = Core.byId("sapUshellVisualizationOrganizerSearch");
-            var oToggleButton = Core.byId("sapUshellVisualizationOrganizerSelectedPages");
+            var oPopover = Element.getElementById("sapUshellVisualizationOrganizerPopover");
+            var oPagesList = Element.getElementById("sapUshellVisualizationOrganizerSpacesList");
+            var oSearchField = Element.getElementById("sapUshellVisualizationOrganizerSearch");
+            var oToggleButton = Element.getElementById("sapUshellVisualizationOrganizerSelectedPages");
 
             oPopover.detachAfterClose(this.fnResetPopup);
 
@@ -671,7 +673,7 @@ sap.ui.define([
          * @private
          */
         _onSearch: function (oEvent) {
-            var oSelectedPagesButton = Core.byId("sapUshellVisualizationOrganizerSelectedPages");
+            var oSelectedPagesButton = Element.getElementById("sapUshellVisualizationOrganizerSelectedPages");
             var bPressed = this.getPressed();
 
             if (oEvent.sId === "press") {
@@ -683,8 +685,8 @@ sap.ui.define([
         },
 
         _updatePagesList: function () {
-            var oPagesList = Core.byId("sapUshellVisualizationOrganizerSpacesList");
-            var oSearchField = Core.byId("sapUshellVisualizationOrganizerSearch");
+            var oPagesList = Element.getElementById("sapUshellVisualizationOrganizerSpacesList");
+            var oSearchField = Element.getElementById("sapUshellVisualizationOrganizerSearch");
             var oBinding = oPagesList.getBinding("items");
             var sSearchValue = oSearchField.getValue();
             var bToggleActive = this.getPressed();
@@ -771,7 +773,7 @@ sap.ui.define([
                 return Promise.resolve(null);
             }
 
-            return sap.ushell.Container.getServiceAsync("Pages").then(function (oPageService) {
+            return Container.getServiceAsync("Pages").then(function (oPageService) {
                 var sPageId = decodeURIComponent(oContext.pageID);
                 var sSelectedSectionId = oContext.sectionID ? decodeURIComponent(oContext.sectionID) : "";
 
@@ -847,7 +849,7 @@ sap.ui.define([
         /**
          * Get the list of all personalizable pages
          *
-         * @returns {array<pageInfo>} the list of personalizable pages
+         * @returns {pageInfo[]} the list of personalizable pages
          */
         getPersonalizablePages: function () {
             return this.aPersonalizablePages;
@@ -869,8 +871,8 @@ sap.ui.define([
         },
 
         _retrieveChangedPageIds: function () {
-            var oPagesList = Core.byId("sapUshellVisualizationOrganizerSpacesList");
-            var oSearchField = Core.byId("sapUshellVisualizationOrganizerSearch");
+            var oPagesList = Element.getElementById("sapUshellVisualizationOrganizerSpacesList");
+            var oSearchField = Element.getElementById("sapUshellVisualizationOrganizerSearch");
             var oPopoverModel = oPagesList.getModel();
             var stInitialPages = oPopoverModel.getProperty("/pinnedPages") || new Set();
 
@@ -910,7 +912,7 @@ sap.ui.define([
         },
 
         okay: function () {
-            var oPopover = Core.byId("sapUshellVisualizationOrganizerPopover");
+            var oPopover = Element.getElementById("sapUshellVisualizationOrganizerPopover");
             // Prevent multiple add clicks
             if (oPopover.getBusy()) {
                 return;
@@ -970,7 +972,7 @@ sap.ui.define([
             return new Promise(function (fnResolve) {
                 this.toggle(oSource, oAppInfo)
                     .then(function () {
-                        var oPopover = Core.byId("sapUshellVisualizationOrganizerPopover");
+                        var oPopover = Element.getElementById("sapUshellVisualizationOrganizerPopover");
                         if (oPopover && oPopover.isOpen()) {
                             oPopover.attachEventOnce("afterClose", function () {
                                 //update pin button
@@ -1004,8 +1006,8 @@ sap.ui.define([
             var oBookmarkService;
             var oPagesService;
             var oVizChangeChain = Promise.all([
-                sap.ushell.Container.getServiceAsync("BookmarkV2"),
-                sap.ushell.Container.getServiceAsync("Pages")
+                Container.getServiceAsync("BookmarkV2"),
+                Container.getServiceAsync("Pages")
             ]).then(function (aServices) {
                 oBookmarkService = aServices[0];
                 oPagesService = aServices[1];
@@ -1060,7 +1062,7 @@ sap.ui.define([
          * @private
          */
         _applyBookmarkTileChangeToSection: function (oVizInfo, oSectionContext) {
-            return sap.ushell.Container.getServiceAsync("Pages").then(function (oPageService) {
+            return Container.getServiceAsync("Pages").then(function (oPageService) {
                 var oVizChangeChain;
                 var sMessageToUser;
                 var sUrl = oVizInfo.url;
@@ -1105,7 +1107,7 @@ sap.ui.define([
          * @private
          */
         updateBookmarkCount: function (aAppsData, oSectionContext) {
-            return sap.ushell.Container.getServiceAsync("Pages")
+            return Container.getServiceAsync("Pages")
                 .then(function (PagesService) {
                     var aCountPromises = aAppsData.map(function (oAppData) {
                         return PagesService._findBookmarks({ url: oAppData.url })
@@ -1224,7 +1226,7 @@ sap.ui.define([
         },
 
         exit: function () {
-            var oPopover = Core.byId("sapUshellVisualizationOrganizerPopover");
+            var oPopover = Element.getElementById("sapUshellVisualizationOrganizerPopover");
             if (oPopover) {
                 oPopover.destroy();
             }

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

@@ -3,15 +3,14 @@
  * @fileOverview WorkPageBuilder Component
  * This UIComponent gets initialized by the FLP renderer upon visiting a work page if work pages are enabled (/core/workPages/enabled).
  *
- * @version 1.120.7
+ * @version 1.121.0
  */
 
 sap.ui.define([
     "sap/ui/core/UIComponent",
     "sap/base/util/ObjectPath",
-    "sap/base/Log",
-    "sap/ushell/services/VisualizationInstantiation"
-], function (UIComponent, ObjectPath, Log, VisualizationInstantiation) {
+    "sap/base/Log"
+], function (UIComponent, ObjectPath, Log) {
     "use strict";
 
     /**
@@ -27,7 +26,7 @@ sap.ui.define([
      * @since 1.99.0
      * @alias sap.ushell.components.workPageBuilder.Component
      */
-    return UIComponent.extend("sap.ushell.components.workPageBuilder.Component", /** @lends sap.ushell.components.workPageBuilder.Component */{
+    return UIComponent.extend("sap.ushell.components.workPageBuilder.Component", /** @lends sap.ushell.components.workPageBuilder.Component.prototype */{
         metadata: {
             manifest: "json",
             library: "sap.ushell",
@@ -53,37 +52,16 @@ sap.ui.define([
         },
 
         init: function () {
-            this.oSiteApplications = {};
-            this.oSiteVizTypes = {};
-            /**
-             * The VisualizationInstantiation service has to be instantiated like this (not with sap.ushell.Container.getServiceAsync)
-             * This is because the admin UI is running in an iFrame and has no sap.ushell.Container.
-             * If parent.sap.ushell.Container is used, the instantiated control uses sources from the parent frame (ManageObject, etc.),
-             * which causes issues (e.g. isA does not work).
-             * Might be changed at a later point, when there is a sap.ushell.Container also running inside the iFrame.
-             */
-            this._oVizInstantiationPromise = Promise.resolve(new VisualizationInstantiation());
             UIComponent.prototype.init.apply(this, arguments);
         },
 
-        /**
-         * Resolves with the ushell VizInstantiation service.
-         *
-         * @returns {Promise<sap.ushell.services.VisualizationInstantiation>} A promise resolving to the VizInstantiation service.
-         * @since 1.112.0
-         * @private
-         */
-        getVizInstantiationPromise: function () {
-            return this._oVizInstantiationPromise;
-        },
-
         /**
          * API to call the getEditMode function on the WorkPageBuilder controller.
          * @returns {boolean} Returns the value of editMode
          * @since 1.109.0
          * @private
          * @ui5-restricted portal-cf-*
-        */
+         */
         getEditMode: function () {
             return this.getRootControl().getController().getEditMode();
         },
@@ -95,7 +73,7 @@ sap.ui.define([
          * @since 1.109.0
          * @private
          * @ui5-restricted portal-cf-*
-        */
+         */
         setEditMode: function (bEditMode) {
             this.getRootControl().getController().setEditMode(bEditMode);
         },
@@ -107,7 +85,7 @@ sap.ui.define([
          * @since 1.116.0
          * @private
          * @ui5-restricted portal-cf-*
-        */
+         */
         setPreviewMode: function (bPreviewMode) {
             this.getRootControl().getController().setPreviewMode(bPreviewMode);
         },
@@ -119,7 +97,7 @@ sap.ui.define([
          * @since 1.116.0
          * @private
          * @ui5-restricted portal-cf-*
-        */
+         */
         getPreviewMode: function () {
             return this.getRootControl().getController().getPreviewMode();
         },
@@ -131,7 +109,7 @@ sap.ui.define([
          * @since 1.109.0
          * @private
          * @ui5-restricted portal-cf-*
-        */
+         */
         getPageData: function () {
             return this.getRootControl().getController().getPageData();
         },
@@ -144,41 +122,10 @@ sap.ui.define([
          * @since 1.109.0
          * @private
          * @ui5-restricted portal-cf-*
-        */
+         */
         setPageData: function (oPageData) {
-            return Promise.all([
-                this._transformVizData(ObjectPath.get("workPage.usedVisualizations.nodes", oPageData) || [])
-            ]).then(function (aResults) {
-                var aPreparedVizData = aResults[0];
-                this.getRootControl().getController().setPageData({
-                    workPage: {
-                        contents: ObjectPath.get("workPage.contents", oPageData),
-                        usedVisualizations: {
-                            nodes: aPreparedVizData
-                        }
-                    }
-                });
-            }.bind(this));
-        },
-
-        /**
-         * API to call the setVisualizationData function on the WorkPageRuntime controller.
-         * @param {{visualizations: {nodes: object[], totalCount: int}}} oVizNodes Array of Visualizations
-         * @returns {Promise} A promise resolving when the data was set.
-         *
-         * @since 1.109.0
-         * @private
-         * @ui5-restricted portal-cf-*
-        */
-        setVisualizationData: function (oVizNodes) {
-            return this._transformVizData(ObjectPath.get("visualizations.nodes", oVizNodes) || []).then(function (aPreparedVizData) {
-                this.getRootControl().getController().setVisualizationData({
-                    visualizations: {
-                        nodes: aPreparedVizData,
-                        totalCount: ObjectPath.get("visualizations.totalCount", oVizNodes) || 0
-                    }
-                });
-            }.bind(this));
+            this.getRootControl().getController().setPageData(oPageData);
+            return Promise.resolve();
         },
 
         /**
@@ -190,15 +137,8 @@ sap.ui.define([
          * @private
          * @ui5-restricted portal-cf-*
          */
-        setVisualizationDataPaginated: function (oVizNodes) {
-            return this._transformVizData(ObjectPath.get("visualizations.nodes", oVizNodes) || []).then(function (aPreparedVizData) {
-                this.getRootControl().getController().setVisualizationDataPaginated({
-                    visualizations: {
-                        nodes: aPreparedVizData,
-                        totalCount: ObjectPath.get("visualizations.totalCount", oVizNodes)
-                    }
-                });
-            }.bind(this));
+        setVisualizationData: function (oVizNodes) {
+            return this.getRootControl().getController().setVisualizationData(oVizNodes);
         },
 
         /**
@@ -207,7 +147,7 @@ sap.ui.define([
          * @since 1.110.0
          * @private
          * @ui5-restricted portal-cf-*
-        */
+         */
         getNavigationDisabled: function () {
             return this.getRootControl().getController().getNavigationDisabled();
         },
@@ -219,7 +159,7 @@ sap.ui.define([
          * @since 1.110.0
          * @private
          * @ui5-restricted portal-cf-*
-        */
+         */
         setNavigationDisabled: function (bNavigation) {
             this.getRootControl().getController().setNavigationDisabled(bNavigation);
         },
@@ -242,7 +182,7 @@ sap.ui.define([
          * @since 1.110.0
          * @private
          * @ui5-restricted portal-cf-*
-        */
+         */
         setShowFooter: function (bVisible) {
             this.getRootControl().getController().setShowFooter(bVisible);
         },
@@ -255,150 +195,9 @@ sap.ui.define([
          * @since 1.116.0
          * @private
          * @ui5-restricted portal-cf-*
-        */
+         */
         setShowPageTitle: function (bVisible) {
             this.getRootControl().getController().setShowPageTitle(bVisible);
-        },
-
-        /**
-         * NOTE:
-         * The following methods are helper functions to retrieve additional site data
-         * to the visualizations.
-         * They do the following:
-         * - replace the indicator data source for dynamic tiles (system context is required)
-         *
-         * These functions should be removed once this information is available from the content API
-         */
-
-        /**
-         * Applies preparatory transformation on the visualization data.
-         *
-         * @param {object[]} aVizData The visualization data
-         * @returns {Promise<object[]>} The modified visualization data.
-         * @since 1.110.0
-         * @private
-         */
-        _transformVizData: function (aVizData) {
-            var oContainer = this.getUshellContainer();
-            var oStandardAppLauncherVizData;
-
-            if (!oContainer) {
-                return Promise.resolve(aVizData);
-            }
-
-            // performance optimization: load CDM site only if page contains standard app launcher visualizations
-            oStandardAppLauncherVizData = aVizData.find(function (oVizData) {
-                return (oVizData.type === "sap.ushell.StaticAppLauncher")
-                    || (oVizData.type === "sap.ushell.DynamicAppLauncher");
-            });
-            if (!oStandardAppLauncherVizData) {
-                return Promise.resolve(aVizData);
-            }
-
-            return Promise.all([
-                oContainer.getServiceAsync("ClientSideTargetResolution"),
-                oContainer.getServiceAsync("CommonDataModel")
-            ]).then(function (aResults) {
-                var oCstrService = aResults[0];
-                var oCdmService = aResults[1];
-                return this._saveSiteData(oCdmService).then(function () {
-                    return this._replaceIndicatorDatasource(aVizData, oCstrService);
-                }.bind(this));
-            }.bind(this));
-        },
-
-        /**
-         * Replaces the indicatorDataSource path with the one returned by the system context, if required.
-         * The site data must be loaded and saved before calling this method.
-         *
-         * @param {object[]} aVizData The visualization data.
-         * @param {object} oCstrService The ClientSideTargetResolution ushell service.
-         * @returns {Promise<object[]>} A promise resolving with the modified vizData.
-         * @since 1.110.0
-         * @private
-         */
-        _replaceIndicatorDatasource: function (aVizData, oCstrService) {
-            return Promise.all(
-                aVizData.map(function (oVizData) {
-                    var sAppId = ObjectPath.get(["descriptor", "value", "sap.flp", "target", "appId"], oVizData);
-                    var oApplication = this.getSiteApplication(sAppId);
-                    var oIndicatorDataSource = ObjectPath.get(["descriptor", "value", "sap.flp", "indicatorDataSource"], oVizData);
-                    var sContentProviderId;
-
-                    if (oApplication) {
-                        sContentProviderId = ObjectPath.get(["sap.app", "contentProviderId"], oApplication);
-
-                        if (sContentProviderId && oIndicatorDataSource && oIndicatorDataSource.path) {
-                            return oCstrService.getSystemContext(sContentProviderId).then(function (oSystemContext) {
-                                if (oSystemContext) {
-                                    var sDataSourceId = oIndicatorDataSource.dataSource;
-                                    var oDataSource = ObjectPath.get(["descriptor", "value", "sap.app", "dataSources", sDataSourceId], oVizData);
-                                    var sFullyQualifiedXhrUrl;
-
-                                    if (oDataSource) {
-                                        sFullyQualifiedXhrUrl = oSystemContext.getFullyQualifiedXhrUrl(oDataSource.uri);
-                                        ObjectPath.set(["descriptor", "value", "sap.app", "dataSources", sDataSourceId, "uri"],
-                                            sFullyQualifiedXhrUrl, oVizData);
-                                    } else {
-                                        sFullyQualifiedXhrUrl = oSystemContext.getFullyQualifiedXhrUrl(oIndicatorDataSource.path);
-                                        ObjectPath.set(["descriptor", "value", "sap.flp", "indicatorDataSource", "path"], sFullyQualifiedXhrUrl, oVizData);
-                                    }
-                                }
-                                return oVizData;
-                            }).catch(function (vError) {
-                                Log.error(vError);
-                                return oVizData;
-                            });
-                        }
-                    }
-
-                    return Promise.resolve(oVizData);
-                }.bind(this))
-            );
-        },
-
-        /**
-         * This is an intermediate helper function to save some required site data in the component instance.
-         * Since the site request will be removed in the future, this function is only temporary.
-         * To be removed once all of the required data from the site request can be retrieved via content API.
-         *
-         * Saves the following from the site request:
-         * - All applications
-         * - All vizTypes
-         *
-         * @param {object} oCdmService The &quot;CommonDataModel&quot; ushell service instance
-         * @returns {Promise} A promise resolving when the data has been saved.
-         * @since 1.110.0
-         * @private
-         */
-        _saveSiteData: function (oCdmService) {
-            return Promise.all([
-                oCdmService.getApplications(),
-                oCdmService.getVizTypes()
-            ]).then(function (aResults) {
-                this.oSiteApplications = aResults[0] || {};
-                this.oSiteVizTypes = aResults[1] || {};
-            }.bind(this));
-        },
-
-        /**
-         * Returns the application descriptor for the given sAppId.
-         *
-         * @param {string} sAppId The application id.
-         * @returns {object} The application descriptor.
-         */
-        getSiteApplication: function (sAppId) {
-            return this.oSiteApplications[sAppId];
-        },
-
-        /**
-         * Returns the vizType object for the given sVizType.
-         *
-         * @param {string} sType The vizType string.
-         * @returns {object} The vizType definition object.
-         */
-        getSiteVizType: function (sType) {
-            return this.oSiteVizTypes[sType];
         }
     });
 });

package/src/main/js/sap/ushell/components/workPageBuilder/controller/WorkPageBuilder.accessibility.js

@@ -2,7 +2,7 @@
 
 /**
  * @file WorkPageBuilder accessibility features
- * @version 1.120.7
+ * @version 1.121.0
  */
 
 sap.ui.define([