@sapui5/sap.ushell 1.114.9 → 1.114.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/main/js/sap/ushell/.library +1 -1
- package/src/main/js/sap/ushell/ApplicationType.js +9 -3
- package/src/main/js/sap/ushell/CanvasShapesManager.js +2 -2
- package/src/main/js/sap/ushell/Fiori20Adapter.js +1 -1
- package/src/main/js/sap/ushell/Fiori20AdapterTest.js +1 -1
- package/src/main/js/sap/ushell/NWBCInterface.js +1 -1
- package/src/main/js/sap/ushell/TechnicalParameters.js +1 -1
- package/src/main/js/sap/ushell/URLTemplateProcessor.js +1 -1
- package/src/main/js/sap/ushell/Ui5NativeServiceFactory.js +1 -1
- package/src/main/js/sap/ushell/Ui5ServiceFactory.js +1 -1
- package/src/main/js/sap/ushell/_URLTemplateProcessor/DefinitionParameterSetBuilder.js +1 -1
- package/src/main/js/sap/ushell/_URLTemplateProcessor/DependencyGraph.js +1 -1
- package/src/main/js/sap/ushell/_URLTemplateProcessor/Functions.js +1 -1
- package/src/main/js/sap/ushell/_URLTemplateProcessor/Resolvers.js +1 -1
- package/src/main/js/sap/ushell/_URLTemplateProcessor/TemplateParameterParser.js +1 -1
- package/src/main/js/sap/ushell/_URLTemplateProcessor/utils.js +1 -1
- package/src/main/js/sap/ushell/adapters/cdm/ClientSideTargetResolutionAdapter.js +1 -1
- package/src/main/js/sap/ushell/adapters/cdm/CommonDataModelAdapter.js +1 -1
- package/src/main/js/sap/ushell/adapters/cdm/ConfigurationDefaultsAdapter.js +1 -1
- package/src/main/js/sap/ushell/adapters/cdm/ContainerAdapter.js +1 -1
- package/src/main/js/sap/ushell/adapters/cdm/LaunchPageAdapter.js +1 -1
- package/src/main/js/sap/ushell/adapters/cdm/PagesCommonDataModelAdapter.js +1 -1
- package/src/main/js/sap/ushell/adapters/cdm/PersonalizationAdapter.js +1 -1
- package/src/main/js/sap/ushell/adapters/cdm/Ui5ComponentLoaderAdapter.js +1 -1
- package/src/main/js/sap/ushell/adapters/cdm/_LaunchPage/modifyHome.js +1 -1
- package/src/main/js/sap/ushell/adapters/cdm/_LaunchPage/readCatalogs.js +1 -1
- package/src/main/js/sap/ushell/adapters/cdm/_LaunchPage/readHome.js +1 -1
- package/src/main/js/sap/ushell/adapters/cdm/_LaunchPage/uri.transform.js +1 -1
- package/src/main/js/sap/ushell/adapters/cdm/util/AppForInbound.js +1 -1
- package/src/main/js/sap/ushell/adapters/cdm/util/cdmSiteUtils.js +1 -1
- package/src/main/js/sap/ushell/adapters/cdm/v3/AdapterBase.js +1 -1
- package/src/main/js/sap/ushell/adapters/cdm/v3/LaunchPageAdapter.js +1 -1
- package/src/main/js/sap/ushell/adapters/cdm/v3/StaticGroupsAdapter.js +1 -1
- package/src/main/js/sap/ushell/adapters/cdm/v3/_LaunchPage/readApplications.js +1 -1
- package/src/main/js/sap/ushell/adapters/cdm/v3/_LaunchPage/readCatalogs.js +1 -1
- package/src/main/js/sap/ushell/adapters/cdm/v3/_LaunchPage/readHome.js +1 -1
- package/src/main/js/sap/ushell/adapters/cdm/v3/_LaunchPage/readPages.js +1 -1
- package/src/main/js/sap/ushell/adapters/cdm/v3/_LaunchPage/readUtils.js +1 -1
- package/src/main/js/sap/ushell/adapters/cdm/v3/_LaunchPage/readVisualizations.js +1 -1
- package/src/main/js/sap/ushell/adapters/cep/NavTargetResolutionAdapter.js +1 -1
- package/src/main/js/sap/ushell/adapters/cep/SearchCEPAdapter.js +1 -1
- package/src/main/js/sap/ushell/adapters/cflp/UserDefaultParameterPersistenceAdapter.js +1 -1
- package/src/main/js/sap/ushell/adapters/local/AdapterContainer.js +1 -1
- package/src/main/js/sap/ushell/adapters/local/AppStateAdapter.js +1 -1
- package/src/main/js/sap/ushell/adapters/local/ClientSideTargetResolutionAdapter.js +1 -1
- package/src/main/js/sap/ushell/adapters/local/ContainerAdapter.js +1 -1
- package/src/main/js/sap/ushell/adapters/local/LaunchPageAdapter.js +1 -1
- package/src/main/js/sap/ushell/adapters/local/NavTargetResolutionAdapter.js +1 -1
- package/src/main/js/sap/ushell/adapters/local/PageBuildingAdapter.js +1 -1
- package/src/main/js/sap/ushell/adapters/local/PagePersistenceAdapter.js +1 -1
- package/src/main/js/sap/ushell/adapters/local/PersonalizationAdapter.js +1 -1
- package/src/main/js/sap/ushell/adapters/local/SearchAdapter.js +1 -1
- package/src/main/js/sap/ushell/adapters/local/SearchCEPAdapter.js +1 -1
- package/src/main/js/sap/ushell/adapters/local/SupportTicketAdapter.js +1 -1
- package/src/main/js/sap/ushell/adapters/local/Ui5ComponentLoaderAdapter.js +1 -1
- package/src/main/js/sap/ushell/adapters/local/UserDefaultParameterPersistenceAdapter.js +1 -1
- package/src/main/js/sap/ushell/adapters/local/UserInfoAdapter.js +1 -1
- package/src/main/js/sap/ushell/appRuntime/ui5/AppRuntime.js +52 -30
- package/src/main/js/sap/ushell/appRuntime/ui5/services/adapters/Ui5ComponentLoaderAdapter.js +1 -1
- package/src/main/js/sap/ushell/bootstrap/_SchedulingAgent/logger.js +1 -1
- package/src/main/js/sap/ushell/bootstrap/_SchedulingAgent/state.js +1 -1
- package/src/main/js/sap/ushell/bootstrap/common/common.configure.ui5datetimeformat.js +1 -1
- package/src/main/js/sap/ushell/bootstrap/common/common.create.configcontract.core.js +1 -0
- package/src/main/js/sap/ushell/components/_HeaderManager/AddHeadEndItemsStrategy.js +19 -25
- package/src/main/js/sap/ushell/components/appfinder/manifest.json +1 -1
- package/src/main/js/sap/ushell/components/applicationIntegration/AppLifeCycle.js +14 -8
- package/src/main/js/sap/ushell/components/applicationIntegration/Storage.js +1 -1
- package/src/main/js/sap/ushell/components/applicationIntegration/application/Application.js +1 -1
- package/src/main/js/sap/ushell/components/applicationIntegration/application/BlueBoxHandler.js +1 -1
- package/src/main/js/sap/ushell/components/applicationIntegration/application/PostMessageAPI.js +1 -1
- package/src/main/js/sap/ushell/components/applicationIntegration/configuration/AppMeta.js +1 -1
- package/src/main/js/sap/ushell/components/applicationIntegration/elements/model.js +1 -1
- package/src/main/js/sap/ushell/components/applicationIntegration/relatedServices/RelatedServices.js +1 -1
- package/src/main/js/sap/ushell/components/applicationIntegration/relatedShellElements/RelatedShellElements.js +1 -1
- package/src/main/js/sap/ushell/components/container/ApplicationContainer.js +7 -2
- package/src/main/js/sap/ushell/components/contentFinder/Component.js +1 -1
- package/src/main/js/sap/ushell/components/contentFinder/controller/AppSearch.controller.js +1 -1
- package/src/main/js/sap/ushell/components/contentFinder/controller/ContentFinderDialog.controller.js +1 -1
- package/src/main/js/sap/ushell/components/contentFinder/controller/WidgetGallery.controller.js +1 -1
- package/src/main/js/sap/ushell/components/contentFinder/manifest.json +1 -1
- package/src/main/js/sap/ushell/components/factsheet/Component.js +1 -1
- package/src/main/js/sap/ushell/components/homepage/ActionMode.js +1 -1
- package/src/main/js/sap/ushell/components/homepage/DashboardContent.view.js +1 -1
- package/src/main/js/sap/ushell/components/homepage/DashboardGroupsBox.js +1 -1
- package/src/main/js/sap/ushell/components/homepage/DashboardUIActions.js +1 -1
- package/src/main/js/sap/ushell/components/homepage/manifest.json +1 -1
- package/src/main/js/sap/ushell/components/pages/ActionMode.js +1 -1
- package/src/main/js/sap/ushell/components/pages/Component.js +1 -1
- package/src/main/js/sap/ushell/components/pages/MyHomeImport.js +1 -1
- package/src/main/js/sap/ushell/components/pages/controller/PageRuntime.controller.js +1 -1
- package/src/main/js/sap/ushell/components/pages/manifest.json +1 -1
- package/src/main/js/sap/ushell/components/runtimeSwitcher/controller/RuntimeSwitcher.controller.js +1 -1
- package/src/main/js/sap/ushell/components/runtimeSwitcher/manifest.json +1 -1
- package/src/main/js/sap/ushell/components/shell/MenuBar/manifest.json +1 -1
- package/src/main/js/sap/ushell/components/shell/NavigationBarMenu/controller/NavigationBarMenu.controller.js +1 -1
- package/src/main/js/sap/ushell/components/shell/NavigationBarMenu/manifest.json +1 -1
- package/src/main/js/sap/ushell/components/shell/Notifications/Component.js +1 -1
- package/src/main/js/sap/ushell/components/shell/ProductSwitch/Component.js +1 -1
- package/src/main/js/sap/ushell/components/shell/Search/manifest.json +1 -1
- package/src/main/js/sap/ushell/components/shell/SearchCEP/Component.js +1 -1
- package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/FrequentActivityProvider.js +1 -1
- package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/NavigationSvcSearchProvider.js +1 -1
- package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/RecentSearchProvider.js +1 -1
- package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/SearchProvider.js +1 -1
- package/src/main/js/sap/ushell/components/shell/Settings/Component.js +1 -1
- package/src/main/js/sap/ushell/components/shell/UserActionsMenu/Component.js +1 -1
- package/src/main/js/sap/ushell/components/shell/UserImage/Component.js +1 -1
- package/src/main/js/sap/ushell/components/visualizationOrganizer/Component.js +1 -1
- package/src/main/js/sap/ushell/components/workPageBuilder/Component.js +1 -1
- package/src/main/js/sap/ushell/components/workPageBuilder/controller/WorkPageBuilder.accessibility.js +1 -1
- package/src/main/js/sap/ushell/components/workPageBuilder/controller/WorkPageBuilder.controller.js +1 -1
- package/src/main/js/sap/ushell/components/workPageBuilder/controls/WorkPage.js +1 -1
- package/src/main/js/sap/ushell/components/workPageBuilder/controls/WorkPageButton.js +1 -1
- package/src/main/js/sap/ushell/components/workPageBuilder/controls/WorkPageCell.js +1 -1
- package/src/main/js/sap/ushell/components/workPageBuilder/controls/WorkPageColumn.js +1 -1
- package/src/main/js/sap/ushell/components/workPageBuilder/controls/WorkPageColumnResizer.js +1 -1
- package/src/main/js/sap/ushell/components/workPageBuilder/controls/WorkPageRow.js +1 -1
- package/src/main/js/sap/ushell/components/workPageBuilder/manifest.json +1 -1
- package/src/main/js/sap/ushell/components/workPageRuntime/Component.js +1 -1
- package/src/main/js/sap/ushell/components/workPageRuntime/controller/WorkPageRuntime.controller.js +1 -1
- package/src/main/js/sap/ushell/components/workPageRuntime/manifest.json +1 -1
- package/src/main/js/sap/ushell/components/workPageRuntime/services/NavigationResolver.js +1 -1
- package/src/main/js/sap/ushell/components/workPageRuntime/services/WorkPage.js +1 -1
- package/src/main/js/sap/ushell/designtime/ApplicationContainer.designtime.js +1 -1
- package/src/main/js/sap/ushell/library.js +1 -1
- package/src/main/js/sap/ushell/navigationMode.js +1 -1
- package/src/main/js/sap/ushell/performance/ShellAnalytics.js +1 -1
- package/src/main/js/sap/ushell/performance/StatisticalRecord.js +1 -1
- package/src/main/js/sap/ushell/plugins/appwarmup/Component.js +1 -1
- package/src/main/js/sap/ushell/renderers/fiori2/Renderer.js +2 -2
- package/src/main/js/sap/ushell/renderers/fiori2/search/searchComponent/manifest.json +1 -1
- package/src/main/js/sap/ushell/services/AppLifeCycle.js +1 -1
- package/src/main/js/sap/ushell/services/AppState.js +1 -1
- package/src/main/js/sap/ushell/services/Bookmark.js +1 -1
- package/src/main/js/sap/ushell/services/ClientSideTargetResolution.js +1 -1
- package/src/main/js/sap/ushell/services/CommonDataModel.js +1 -1
- package/src/main/js/sap/ushell/services/Configuration.js +1 -1
- package/src/main/js/sap/ushell/services/ConfigurationDefaults.js +1 -1
- package/src/main/js/sap/ushell/services/ContentExtensionAdapterFactory.js +1 -1
- package/src/main/js/sap/ushell/services/CrossApplicationNavigation.js +1 -1
- package/src/main/js/sap/ushell/services/DarkModeSupport.js +1 -1
- package/src/main/js/sap/ushell/services/LaunchPage.js +1 -1
- package/src/main/js/sap/ushell/services/Menu.js +1 -1
- package/src/main/js/sap/ushell/services/Message.js +1 -1
- package/src/main/js/sap/ushell/services/MessageBroker.js +1 -1
- package/src/main/js/sap/ushell/services/NavigationDataProvider.js +1 -1
- package/src/main/js/sap/ushell/services/PageBuilding.js +1 -1
- package/src/main/js/sap/ushell/services/PagePersistence.js +1 -1
- package/src/main/js/sap/ushell/services/PageReferencing.js +1 -1
- package/src/main/js/sap/ushell/services/Pages.js +1 -1
- package/src/main/js/sap/ushell/services/Personalization.js +1 -1
- package/src/main/js/sap/ushell/services/PluginManager.js +1 -1
- package/src/main/js/sap/ushell/services/ReferenceResolver.js +1 -1
- package/src/main/js/sap/ushell/services/Search.js +1 -1
- package/src/main/js/sap/ushell/services/SearchCEP.js +1 -1
- package/src/main/js/sap/ushell/services/SearchableContent.js +26 -5
- package/src/main/js/sap/ushell/services/SmartNavigation.js +1 -1
- package/src/main/js/sap/ushell/services/SpaceContent.js +1 -1
- package/src/main/js/sap/ushell/services/URLShortening.js +1 -1
- package/src/main/js/sap/ushell/services/URLTemplate.js +1 -1
- package/src/main/js/sap/ushell/services/Ui5ComponentLoader.js +1 -1
- package/src/main/js/sap/ushell/services/UserDefaultParameterPersistence.js +1 -1
- package/src/main/js/sap/ushell/services/UserDefaultParameters.js +1 -1
- package/src/main/js/sap/ushell/services/UserInfo.js +1 -1
- package/src/main/js/sap/ushell/services/UserRecents.js +1 -1
- package/src/main/js/sap/ushell/services/VisualizationDataProvider.js +1 -1
- package/src/main/js/sap/ushell/services/VisualizationInstantiation.js +1 -1
- package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/Formatter.js +1 -1
- package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/InboundIndex.js +1 -1
- package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/InboundProvider.js +1 -1
- package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/PrelaunchOperations.js +1 -1
- package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/Search.js +1 -1
- package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/StagedLogger.js +1 -1
- package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/SystemContext.js +1 -1
- package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/Utils.js +1 -1
- package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/VirtualInbounds.js +1 -1
- package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/XAppStateProcessing.js +1 -1
- package/src/main/js/sap/ushell/services/_CommonDataModel/SiteConverter.js +1 -1
- package/src/main/js/sap/ushell/services/_ContentExtensionAdapterFactory/ContentExtensionAdapterConfig.js +1 -1
- package/src/main/js/sap/ushell/services/_ContentExtensionAdapterFactory/FeaturedGroupConfig.js +1 -1
- package/src/main/js/sap/ushell/services/_CrossApplicationNavigation/utils.js +1 -1
- package/src/main/js/sap/ushell/services/_MessageBroker/MessageBrokerEngine.js +1 -1
- package/src/main/js/sap/ushell/services/_PageReferencing/PageReferencer.js +1 -1
- package/src/main/js/sap/ushell/services/_PluginManager/Extensions.js +1 -1
- package/src/main/js/sap/ushell/services/_PluginManager/HeaderExtensions.js +1 -1
- package/src/main/js/sap/ushell/services/_PluginManager/MenuExtensions.js +1 -1
- package/src/main/js/sap/ushell/services/_Ui5ComponentLoader/utils.js +1 -1
- package/src/main/js/sap/ushell/services/_VisualizationInstantiation/VizInstanceLink.js +1 -1
- package/src/main/js/sap/ushell/support/plugins/flpConfig/FlpConfigurationPlugin.js +1 -1
- package/src/main/js/sap/ushell/ui/cards/RecentActivitiesExtension.js +1 -1
- package/src/main/js/sap/ushell/ui/contentFinder/AppBox.js +1 -1
- package/src/main/js/sap/ushell/ui/launchpad/ExtendedChangeDetection.js +1 -1
- package/src/main/js/sap/ushell/ui/launchpad/Page.js +1 -1
- package/src/main/js/sap/ushell/ui/launchpad/Section.js +2 -2
- package/src/main/js/sap/ushell/ui/launchpad/section/CompactArea.js +1 -1
- package/src/main/js/sap/ushell/ui/shell/ShellHeadItem.js +1 -1
- package/src/main/js/sap/ushell/ui/shell/SysInfoBar.js +12 -2
- package/src/main/js/sap/ushell/ui/shell/ToolAreaItem.js +1 -1
- package/src/main/js/sap/ushell/ui/utils.js +1 -1
- package/src/main/js/sap/ushell/ui5service/ShellUIService.js +1 -1
- package/src/main/js/sap/ushell/ui5service/UserStatus.js +1 -1
- package/src/main/js/sap/ushell/utils/UrlShortening.js +1 -1
- package/src/test/js/sap/ushell/bootstrap/sandbox.js +1 -1
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
|
|
2
|
+
prepareUshellConfig();
|
|
2
3
|
prepareModules();
|
|
3
4
|
sap.ui.define([
|
|
4
5
|
"sap/ui/core/Core",
|
|
@@ -81,7 +82,6 @@ sap.ui.define([
|
|
|
81
82
|
bPluginsLoaded = false,
|
|
82
83
|
bHashChangeRegistered = false,
|
|
83
84
|
bPopupCallbackRegistered = false,
|
|
84
|
-
bSpacesMode = false,
|
|
85
85
|
vGetFullWidthParamFromManifest = false,
|
|
86
86
|
oShellNavigationService;
|
|
87
87
|
|
|
@@ -325,9 +325,11 @@ sap.ui.define([
|
|
|
325
325
|
|
|
326
326
|
if (oTarget && oTarget.tagName === "A" && oTarget.href && oTarget.href.indexOf("#") > 0) {
|
|
327
327
|
if (oTarget.target === "_blank") {
|
|
328
|
-
var
|
|
329
|
-
if (
|
|
330
|
-
|
|
328
|
+
var sTargetUrlSplit = oTarget.href.split("#");
|
|
329
|
+
if (sTargetUrlSplit[0].length === 0 || sTargetUrlSplit[0] === document.URL.split("#")[0]) {
|
|
330
|
+
_that.rebuildNewAppUrl(oTarget.href, sFLPURL).then(function (sNewURL) {
|
|
331
|
+
WindowUtils.openURL(sNewURL);
|
|
332
|
+
});
|
|
331
333
|
//We're returning false to determine that the default browser behaviour should NOT take place
|
|
332
334
|
// and we will be the one to handle the opening of the link (with 'window.open').
|
|
333
335
|
event.preventDefault();
|
|
@@ -364,36 +366,31 @@ sap.ui.define([
|
|
|
364
366
|
* @private
|
|
365
367
|
*/
|
|
366
368
|
this.rebuildNewAppUrl = function (sTargetUrl, sFLPUrl) {
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
369
|
+
return new Promise(function (fnResolve) {
|
|
370
|
+
var sTargetUrlSplit = sTargetUrl.split("#");
|
|
371
|
+
//Check if the destination URL equals to the IFrame URL
|
|
372
|
+
if (sTargetUrlSplit[0].length === 0 || sTargetUrlSplit[0] === document.URL.split("#")[0]) {
|
|
373
|
+
//Replace the Iframe URL with the FLP URL or Add it before the #
|
|
374
|
+
if (AppRuntimeContext.getIsScube()) {
|
|
375
|
+
AppRuntimeContext.checkIntentsConversionForScube([{
|
|
376
|
+
intent: "#" + sTargetUrlSplit[1]
|
|
377
|
+
}]).then(function (aResult) {
|
|
378
|
+
fnResolve(sFLPUrl + aResult[0].intent);
|
|
379
|
+
});
|
|
380
|
+
} else {
|
|
381
|
+
fnResolve(sFLPUrl + "#" + sTargetUrlSplit[1]);
|
|
382
|
+
}
|
|
383
|
+
return;
|
|
384
|
+
}
|
|
385
|
+
fnResolve(sTargetUrl);
|
|
386
|
+
});
|
|
374
387
|
};
|
|
375
388
|
|
|
376
389
|
/**
|
|
377
390
|
* @private
|
|
378
391
|
*/
|
|
379
392
|
this.getPageConfig = function (oUrlData) {
|
|
380
|
-
|
|
381
|
-
shellConfig = {};
|
|
382
|
-
|
|
383
|
-
// Adds an entry to the config obj, if spaces mode is enables
|
|
384
|
-
bSpacesMode = (oPageUriParams["sap-spaces"] === "true");
|
|
385
|
-
|
|
386
|
-
metaData = jQuery("meta[name='sap.ushellConfig.ui5appruntime']")[0];
|
|
387
|
-
if (metaData !== undefined) {
|
|
388
|
-
shellConfig = JSON.parse(metaData.content);
|
|
389
|
-
if (bSpacesMode === true) {
|
|
390
|
-
shellConfig.ushell = shellConfig.ushell || {};
|
|
391
|
-
shellConfig.ushell.spaces = {
|
|
392
|
-
enabled: true
|
|
393
|
-
};
|
|
394
|
-
}
|
|
395
|
-
}
|
|
396
|
-
window["sap-ushell-config"] = deepExtend({}, getDefaultShellConfig(), shellConfig);
|
|
393
|
+
window["sap-ushell-config"] = deepExtend({}, getDefaultShellConfig(), window["sap-ushell-config"]);
|
|
397
394
|
|
|
398
395
|
//temp code for allways loading the web assistance plugin in the
|
|
399
396
|
//scube scenario. will be removed in the next release of s4 hana cloud
|
|
@@ -768,8 +765,9 @@ sap.ui.define([
|
|
|
768
765
|
URLHelper.redirect = function (sURL, bNewWindow) {
|
|
769
766
|
if (sURL && bNewWindow === true && sURL.indexOf("#") >= 0) {
|
|
770
767
|
sap.ushell.Container.getFLPUrlAsync().then(function (sFLPURL) {
|
|
771
|
-
|
|
772
|
-
|
|
768
|
+
_that.rebuildNewAppUrl(sURL, sFLPURL).then(function (sNewURL) {
|
|
769
|
+
fnOrigURLHelperRedirect.call(URLHelper, sNewURL, bNewWindow);
|
|
770
|
+
});
|
|
773
771
|
});
|
|
774
772
|
} else {
|
|
775
773
|
fnOrigURLHelperRedirect.call(URLHelper, sURL, bNewWindow);
|
|
@@ -874,6 +872,11 @@ sap.ui.define([
|
|
|
874
872
|
module: "sap.ushell.appRuntime.ui5.services.adapters.EmptyAdapter"
|
|
875
873
|
}
|
|
876
874
|
},
|
|
875
|
+
ClientSideTargetResolution: {
|
|
876
|
+
adapter: {
|
|
877
|
+
module: "sap.ushell.appRuntime.ui5.services.adapters.EmptyAdapter"
|
|
878
|
+
}
|
|
879
|
+
},
|
|
877
880
|
AppConfiguration: {
|
|
878
881
|
module: "sap.ushell.appRuntime.ui5.services.AppConfiguration"
|
|
879
882
|
},
|
|
@@ -933,11 +936,30 @@ sap.ui.define([
|
|
|
933
936
|
}
|
|
934
937
|
|
|
935
938
|
var appRuntime = new AppRuntime();
|
|
939
|
+
appRuntime._prepareUshellConfig = prepareUshellConfig;
|
|
936
940
|
_that = appRuntime;
|
|
937
941
|
appRuntime.main();
|
|
938
942
|
return appRuntime;
|
|
939
943
|
});
|
|
940
944
|
|
|
945
|
+
function prepareUshellConfig () {
|
|
946
|
+
"use strict";
|
|
947
|
+
|
|
948
|
+
var shellConfig = {};
|
|
949
|
+
var metaData = document.querySelector("meta[name='sap.ushellConfig.ui5appruntime']");
|
|
950
|
+
if (metaData) {
|
|
951
|
+
shellConfig = JSON.parse(metaData.content);
|
|
952
|
+
var oUriParameters = new URLSearchParams(window.location.search);
|
|
953
|
+
if (oUriParameters.has("sap-spaces") && oUriParameters.get("sap-spaces") === "true") {
|
|
954
|
+
shellConfig.ushell = shellConfig.ushell || {};
|
|
955
|
+
shellConfig.ushell.spaces = {
|
|
956
|
+
enabled: true
|
|
957
|
+
};
|
|
958
|
+
}
|
|
959
|
+
}
|
|
960
|
+
window["sap-ushell-config"] = shellConfig;
|
|
961
|
+
}
|
|
962
|
+
|
|
941
963
|
function prepareModules () {
|
|
942
964
|
"use strict";
|
|
943
965
|
|
|
@@ -261,6 +261,7 @@ sap.ui.define([
|
|
|
261
261
|
enableFiori3: true, // since 1.66, it is always "true"
|
|
262
262
|
sessionTimeoutIntervalInMinutes: getConfigValue("renderers/fiori2/componentData/config/sessionTimeoutIntervalInMinutes", -1),
|
|
263
263
|
enableFeaturePolicyInIframes: getConfigValue("renderers/fiori2/componentData/config/enableFeaturePolicyInIframes", true),
|
|
264
|
+
enableOpenIframeWithPost: getConfigValue("renderers/fiori2/componentData/config/enableOpenIframeWithPost", true),
|
|
264
265
|
favIcon: getConfigValue("renderers/fiori2/componentData/config/favIcon", undefined),
|
|
265
266
|
useAppTitleFromNavTargetResolution: csvToArray(getConfigValue("ushell/useAppTitleFromNavTargetResolution")),
|
|
266
267
|
model: {
|
|
@@ -1,28 +1,27 @@
|
|
|
1
1
|
// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
|
|
2
2
|
|
|
3
3
|
sap.ui.define([
|
|
4
|
-
"sap/base/Log"
|
|
5
|
-
|
|
4
|
+
"sap/base/Log",
|
|
5
|
+
"sap/ui/core/Core"
|
|
6
|
+
], function (Log, Core) {
|
|
6
7
|
"use strict";
|
|
7
8
|
|
|
8
|
-
|
|
9
|
-
var allocatedItemSpace = 0,
|
|
10
|
-
index,
|
|
11
|
-
sId;
|
|
9
|
+
/* global Set */
|
|
12
10
|
|
|
11
|
+
function fnValidateAddingHeadEndItems (aExistingIds, aIdsToAdd) {
|
|
13
12
|
if (!aExistingIds || !aIdsToAdd) {
|
|
14
13
|
return false;
|
|
15
14
|
}
|
|
16
15
|
|
|
17
16
|
// Check that the controls with the given ids exist
|
|
18
|
-
var
|
|
19
|
-
var
|
|
20
|
-
if (
|
|
17
|
+
var bFoundAllControls = aIdsToAdd.every(function (sId) {
|
|
18
|
+
var bFoundControl = !!Core.byId(sId);
|
|
19
|
+
if (!bFoundControl) {
|
|
21
20
|
Log.warning("Failed to find control with id '{id}'".replace("{id}", sId));
|
|
22
21
|
}
|
|
23
|
-
return
|
|
22
|
+
return bFoundControl;
|
|
24
23
|
});
|
|
25
|
-
if (
|
|
24
|
+
if (!bFoundAllControls) {
|
|
26
25
|
return false;
|
|
27
26
|
}
|
|
28
27
|
|
|
@@ -30,27 +29,22 @@ sap.ui.define([
|
|
|
30
29
|
if (aIdsToAdd.length === 1 && aIdsToAdd[0] === "endItemsOverflowBtn") {
|
|
31
30
|
return true;
|
|
32
31
|
}
|
|
33
|
-
for (index = 0; index < aExistingIds.length; index++) {
|
|
34
|
-
sId = aExistingIds[index];
|
|
35
|
-
if (sId !== "endItemsOverflowBtn") {
|
|
36
|
-
// Increment the counter but not consider the overflow button
|
|
37
|
-
allocatedItemSpace++;
|
|
38
|
-
}
|
|
39
32
|
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
33
|
+
// we only consider new ids
|
|
34
|
+
var aItemsCombined = Array.from(new Set(aExistingIds.concat(aIdsToAdd)));
|
|
35
|
+
|
|
36
|
+
var iMaxLength = aItemsCombined.includes("endItemsOverflowBtn") ? 11 : 10;
|
|
37
|
+
if (aItemsCombined.length > iMaxLength) {
|
|
38
|
+
Log.warning("maximum of six items has reached, cannot add more items.");
|
|
39
|
+
return false;
|
|
47
40
|
}
|
|
48
41
|
|
|
49
42
|
return true;
|
|
50
43
|
}
|
|
51
44
|
|
|
52
45
|
function fnAddHeadEndItems (aCurrentlyExistingItems, aIdsToAdd) {
|
|
53
|
-
var aNewItems = aCurrentlyExistingItems.concat(aIdsToAdd);
|
|
46
|
+
var aNewItems = Array.from(new Set(aCurrentlyExistingItems.concat(aIdsToAdd)));
|
|
47
|
+
|
|
54
48
|
/*
|
|
55
49
|
HeaderEndItems has the following order:
|
|
56
50
|
- search
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
|
|
2
2
|
/**
|
|
3
3
|
* @fileOverview handle all the resources for the different applications.
|
|
4
|
-
* @version 1.114.
|
|
4
|
+
* @version 1.114.11
|
|
5
5
|
*/
|
|
6
6
|
sap.ui.define([
|
|
7
7
|
"sap/ushell/components/applicationIntegration/elements/model",
|
|
@@ -651,7 +651,7 @@ sap.ui.define([
|
|
|
651
651
|
BlueBoxHandler.removeCapabilities(oTmpAppContainer);
|
|
652
652
|
this.destroy("application-" + sIntent, oTmpAppContainer);
|
|
653
653
|
BlueBoxHandler.deleteStateFul(sTmpUrl);
|
|
654
|
-
this.removeWebGuiV1StatefulContainer(
|
|
654
|
+
this.removeWebGuiV1StatefulContainer(oTmpAppContainer);
|
|
655
655
|
}
|
|
656
656
|
}
|
|
657
657
|
|
|
@@ -1764,13 +1764,19 @@ sap.ui.define([
|
|
|
1764
1764
|
};
|
|
1765
1765
|
|
|
1766
1766
|
this.removeWebGuiV1StatefulContainer = function (oApplicationContainer) {
|
|
1767
|
-
|
|
1768
|
-
|
|
1769
|
-
|
|
1770
|
-
|
|
1771
|
-
|
|
1772
|
-
|
|
1767
|
+
if (oApplicationContainer && oApplicationContainer.getUrl) {
|
|
1768
|
+
var sUrl = oApplicationContainer.getUrl(),
|
|
1769
|
+
sKey;
|
|
1770
|
+
|
|
1771
|
+
if (sUrl) {
|
|
1772
|
+
sKey = BlueBoxHandler._getBlueBoxCacheKey(sUrl);
|
|
1773
|
+
if (sKey && sKey.length > 0) {
|
|
1774
|
+
delete oWebGuiV1StatefulCache[sKey];
|
|
1775
|
+
return true;
|
|
1776
|
+
}
|
|
1777
|
+
}
|
|
1773
1778
|
}
|
|
1779
|
+
return false;
|
|
1774
1780
|
};
|
|
1775
1781
|
|
|
1776
1782
|
/**
|
package/src/main/js/sap/ushell/components/applicationIntegration/application/BlueBoxHandler.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
|
|
2
2
|
/**
|
|
3
3
|
* @fileOverview handle all the resources for the different applications.
|
|
4
|
-
* @version 1.114.
|
|
4
|
+
* @version 1.114.11
|
|
5
5
|
*/
|
|
6
6
|
sap.ui.define([
|
|
7
7
|
"sap/ushell/components/applicationIntegration/application/BlueBoxesCache",
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
/**
|
|
4
4
|
* @fileOverview The UI integration's SAPUI5 control which supports application embedding.
|
|
5
|
-
* @version 1.114.
|
|
5
|
+
* @version 1.114.11
|
|
6
6
|
*/
|
|
7
7
|
sap.ui.define([
|
|
8
8
|
"sap/base/Log",
|
|
@@ -1050,7 +1050,7 @@ sap.ui.define([
|
|
|
1050
1050
|
*/
|
|
1051
1051
|
function render (oRenderManager, oContainer, sApplicationType, sUrl, sAdditionalInformation) {
|
|
1052
1052
|
var fnLogout,
|
|
1053
|
-
bPostMechanismEnabled
|
|
1053
|
+
bPostMechanismEnabled,
|
|
1054
1054
|
bForceOpenWithPost = false;
|
|
1055
1055
|
|
|
1056
1056
|
// remove container from list of NWBC-containing containers
|
|
@@ -1160,6 +1160,11 @@ sap.ui.define([
|
|
|
1160
1160
|
}
|
|
1161
1161
|
oContainer.setProperty("currentAppUrl", sUrl, true);
|
|
1162
1162
|
|
|
1163
|
+
bPostMechanismEnabled = Config.last("/core/shell/enableOpenIframeWithPost");
|
|
1164
|
+
if (bPostMechanismEnabled === undefined) {
|
|
1165
|
+
bPostMechanismEnabled = true;
|
|
1166
|
+
}
|
|
1167
|
+
|
|
1163
1168
|
if (urlParams.get("sap-post") === "false") {
|
|
1164
1169
|
bPostMechanismEnabled = false;
|
|
1165
1170
|
} else if (window.QUnit !== undefined) {
|
|
@@ -17,7 +17,7 @@ sap.ui.define([
|
|
|
17
17
|
|
|
18
18
|
// use inline declaration instead of component.json to save 1 round trip
|
|
19
19
|
metadata: {
|
|
20
|
-
version: "1.114.
|
|
20
|
+
version: "1.114.11",
|
|
21
21
|
library: "sap.ushell",
|
|
22
22
|
dependencies: {
|
|
23
23
|
libs: ["sap.m", "sap.ui.vbm", "sap.suite.ui.commons", "sap.ui.layout", "sap.viz"],
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* with a header of type <code>sap.ushell.ui.launchpad.AnchorNavigationBar</code>
|
|
6
6
|
* and content of type <code>sap.ushell.ui.launchpad.DashboardGroupsContainer</code>.
|
|
7
7
|
*
|
|
8
|
-
* @version 1.114.
|
|
8
|
+
* @version 1.114.11
|
|
9
9
|
* @name sap.ushell.components.homepage.DashboardContent.view
|
|
10
10
|
* @private
|
|
11
11
|
*/
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* @fileOverview Controller for the NavigationBarMenu Popover. It is responsible for Popover handling, model binding, persistence
|
|
5
5
|
* logic to pin, unpin and rearrange pinned spaces as well as executing navigation.
|
|
6
6
|
*
|
|
7
|
-
* @version 1.114.
|
|
7
|
+
* @version 1.114.11
|
|
8
8
|
* @private
|
|
9
9
|
*/
|
|
10
10
|
sap.ui.define([
|