@sapui5/sap.fe.core 1.99.0 → 1.100.0

package/src/sap/fe/core/services/RoutingServiceFactory.ts

@@ -9,11 +9,11 @@ import BusyLocker from "sap/fe/core/BusyLocker";
 import ModelHelper from "sap/fe/core/helpers/ModelHelper";
 import EditState from "sap/fe/core/helpers/EditState";
 import messageHandling from "sap/fe/core/actions/messageHandling";
-import { Placeholder } from "sap/fe/core/controllerextensions";
+import Placeholder from "sap/fe/core/controllerextensions/Placeholder";
 import AppStartupHelper from "sap/fe/core/helpers/AppStartupHelper";
 import ODataUtils from "sap/ui/model/odata/v4/ODataUtils";
 import { ServiceContext } from "sap/ui/core/service";
-import { AppComponent } from "sap/fe/core";
+import AppComponent from "sap/fe/core/AppComponent";
 import ODataModel from "sap/ui/model/odata/v4/ODataModel";
 import ODataMetaModel from "sap/ui/model/odata/v4/ODataMetaModel";
 import Router from "sap/ui/core/routing/Router";
@@ -28,7 +28,7 @@ const RoutingServiceEventing = EventProvider.extend("sap.fe.core.services.Routin
 		}
 	}
 });
-class RoutingService extends Service<RoutingServiceSettings> {
+export class RoutingService extends Service<RoutingServiceSettings> {
 	oAppComponent!: AppComponent;
 	oModel!: ODataModel;
 	oMetaModel!: ODataMetaModel;
@@ -51,7 +51,7 @@ class RoutingService extends Service<RoutingServiceSettings> {
 		const oContext = this.getContext();
 		if (oContext.scopeType === "component") {
 			this.oAppComponent = oContext.scopeObject;
-			this.oModel = this.oAppComponent.getModel();
+			this.oModel = this.oAppComponent.getModel() as ODataModel;
 			this.oMetaModel = this.oModel.getMetaModel();
 			this.oRouter = this.oAppComponent.getRouter();
 			this.oRouterProxy = this.oAppComponent.getRouterProxy();
@@ -440,7 +440,7 @@ class RoutingService extends Service<RoutingServiceSettings> {
 			| undefined,
 		oViewData: any | undefined,
 		oCurrentTargetInfo: any | undefined
-	) {
+	): Promise<void> {
 		let sTargetRoute: string = "",
 			oRouteParametersPromise,
 			bIsStickyMode: boolean = false;
@@ -462,7 +462,7 @@ class RoutingService extends Service<RoutingServiceSettings> {
 		// If the path is empty, we're supposed to navigate to the first page of the app
 		// Check if we need to exit from the app instead
 		if (sTargetPath.length === 0 && this.bExitOnNavigateBackToRoot) {
-			return this.oRouterProxy.exitFromApp();
+			return Promise.resolve(this.oRouterProxy.exitFromApp());
 		}
 
 		// If the context is deferred or async, we add (...) to the path
@@ -560,14 +560,14 @@ class RoutingService extends Service<RoutingServiceSettings> {
 	 * @name sap.fe.core.controllerextensions.Routing#navigateToRoute
 	 * @memberof sap.fe.core.controllerextensions.Routing
 	 * @static
-	 * @param {string} [sTargetRouteName] Name of the target route
+	 * @param {string} sTargetRouteName Name of the target route
 	 * @param {object} [oRouteParameters] Parameters to be used with route to create the target hash
 	 * @returns {Promise} Promise that is resolved when the navigation is finalized
 	 *
 	 * @ui5-restricted
 	 * @final
 	 */
-	navigateToRoute(sTargetRouteName: string, oRouteParameters: any | undefined) {
+	navigateToRoute(sTargetRouteName: string, oRouteParameters?: any) {
 		const sTargetURL = this.oRouter.getURL(sTargetRouteName, oRouteParameters);
 		return this.oRouterProxy.navToHash(sTargetURL, undefined, undefined, undefined, !oRouteParameters.bIsStickyMode);
 	}
@@ -682,7 +682,7 @@ class RoutingService extends Service<RoutingServiceSettings> {
 			}
 		}
 
-		return this.oAppComponent.getRootViewController().calculateLayout(FCLLevel, sPath, mParameters.sLayout);
+		return (this.oAppComponent.getRootViewController() as any).calculateLayout(FCLLevel, sPath, mParameters.sLayout);
 	}
 
 	/**
@@ -748,10 +748,10 @@ class RoutingService extends Service<RoutingServiceSettings> {
 		}
 	}
 
-	attachRouteMatched(oData: any, fnFunction: any, oListener: any) {
+	attachRouteMatched(oData: any, fnFunction?: any, oListener?: any) {
 		this.eventProvider.attachEvent("routeMatched", oData, fnFunction, oListener);
 	}
-	detachRouteMatched(fnFunction: any, oListener: any) {
+	detachRouteMatched(fnFunction: any, oListener?: any) {
 		this.eventProvider.detachEvent("routeMatched", fnFunction, oListener);
 	}
 	attachAfterRouteMatched(oData: any, fnFunction: any, oListener: any) {
@@ -825,7 +825,7 @@ class RoutingService extends Service<RoutingServiceSettings> {
 		return initPromise;
 	}
 
-	getDefaultCreateHash(oStartupParameters: any) {
+	getDefaultCreateHash(oStartupParameters?: any) {
 		return AppStartupHelper.getDefaultCreateHash(oStartupParameters, this.getContextPath(), this.oRouter);
 	}
 
@@ -842,7 +842,7 @@ class RoutingService extends Service<RoutingServiceSettings> {
 
 	_manageDeepLinkStartup(oStartupParameters: any) {
 		return AppStartupHelper.getDeepLinkStartupHash(
-			this.oAppComponent.getManifest()["sap.ui5"].routing,
+			(this.oAppComponent.getManifest() as any)["sap.ui5"].routing,
 			oStartupParameters,
 			this.oModel
 		).then((oDeepLink: any) => {