@sapui5/sap.fe.core 1.113.0 → 1.115.0

package/src/sap/fe/core/AppStateHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"AppStateHandler.js","names":["sap","ui","define","Log","deepEqual","ClassSupport","toES6Promise","library","BaseObject","BusyLocker","ModelHelper","_dec","_class","defineUI5Class","_inheritsLoose","subClass","superClass","prototype","Object","create","constructor","_setPrototypeOf","o","p","setPrototypeOf","bind","__proto__","NavType","AppStateHandler","_BaseObject","oAppComponent","_this","call","this","_mCurrentAppState","sId","getId","nbSimultaneousCreateRequest","bNoRouteChange","info","_proto","createAppState","async","getEnvironmentCapabilities","getCapabilities","AppState","isLocked","oNavigationService","getNavigationService","oRouterProxy","getRouterProxy","sHash","getHash","oController","getRootControl","getController","bIsStickyMode","isStickySessionSupported","getMetaModel","viewState","Error","getMetadata","getName","mInnerAppState","retrieveViewState","oStoreData","appState","sAppStateKey","storeInnerAppStateAsync","sNewHash","replaceInnerAppStateKey","navToHash","undefined","oError","error","_createNavigationParameters","oAppData","sNavType","assign","selectionVariantDefaults","oDefaultedSelectionVariant","selectionVariant","oSelectionVariant","requiresStandardVariant","bNavSelVarHasDefaultsOnly","navigationType","_checkIfLastSeenRecord","view","internalModelContext","getBindingContext","getProperty","technicalKeysObject","bindingContext","path","getPath","metaModel","getModel","metaPath","getMetaPath","technicalKeys","getObject","i","length","keyValue","setProperty","_getAppStateData","viewId","key","keys","applyAppState","Promise","resolve","checkIfLastSeenRecord","lock","parseNavigation","catch","aErrorData","warning","then","aResults","initial","oRootController","appStateData","iAppState","applyViewState","finally","unlock","checkIfRouteChangedByIApp","resetRouteChangedByIApp"],"sources":["AppStateHandler-dbg.js"],"mappings":"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"}
+{"version":3,"file":"AppStateHandler.js","names":["sap","ui","define","Log","deepEqual","ClassSupport","toES6Promise","library","BaseObject","BusyLocker","ModelHelper","_dec","_class","defineUI5Class","_inheritsLoose","subClass","superClass","prototype","Object","create","constructor","_setPrototypeOf","o","p","setPrototypeOf","bind","__proto__","NavType","AppStateHandler","_BaseObject","oAppComponent","_this","call","this","_mCurrentAppState","sId","getId","nbSimultaneousCreateRequest","bNoRouteChange","info","_proto","createAppState","async","getEnvironmentCapabilities","getCapabilities","AppState","isLocked","oNavigationService","getNavigationService","oRouterProxy","getRouterProxy","sHash","getHash","oController","getRootControl","getController","bIsStickyMode","isStickySessionSupported","getMetaModel","viewState","Error","getMetadata","getName","mInnerAppState","retrieveViewState","oStoreData","appState","sAppStateKey","storeInnerAppStateAsync","sNewHash","replaceInnerAppStateKey","navToHash","undefined","oError","error","_createNavigationParameters","oAppData","sNavType","assign","selectionVariantDefaults","oDefaultedSelectionVariant","selectionVariant","oSelectionVariant","requiresStandardVariant","bNavSelVarHasDefaultsOnly","navigationType","_checkIfLastSeenRecord","view","internalModelContext","getBindingContext","getProperty","technicalKeysObject","bindingContext","path","getPath","metaModel","getModel","metaPath","getMetaPath","technicalKeys","getObject","i","length","keyValue","setProperty","_getAppStateData","viewId","navType","key","appStateData","hybrid","iAppState","keys","applyAppState","Promise","resolve","checkIfLastSeenRecord","lock","parseNavigation","catch","aErrorData","warning","then","aResults","initial","oRootController","_getInitialStateApplied","_setInitialStateApplied","applyViewState","finally","unlock","checkIfRouteChangedByIApp","resetRouteChangedByIApp"],"sources":["AppStateHandler-dbg.js"],"mappings":"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"}

package/src/sap/fe/core/AppStateHandler.ts

@@ -19,6 +19,9 @@ type AppData = {
 	oSelectionVariant: object;
 	bNavSelVarHasDefaultsOnly: boolean;
 	appState: AppState;
+	iAppState?: {
+		appState: AppState;
+	};
 };
 
 @defineUI5Class("sap.fe.core.AppStateHandler")
@@ -121,20 +124,22 @@ class AppStateHandler extends BaseObject {
 		return false;
 	}
 
-	_getAppStateData(oAppData: AppData, viewId?: string) {
+	_getAppStateData(oAppData: AppData, viewId?: string, navType?: string) {
 		let key = "",
 			i = 0;
-		if (oAppData && oAppData.appState) {
-			for (i = 0; i < Object.keys(oAppData.appState).length; i++) {
-				if (Object.keys(oAppData.appState)[i] === viewId) {
-					key = Object.keys(oAppData.appState)[i];
+		const appStateData = navType === NavType.hybrid ? oAppData.iAppState : oAppData;
+
+		if (appStateData?.appState) {
+			for (i = 0; i < Object.keys(appStateData.appState).length; i++) {
+				if (Object.keys(appStateData.appState)[i] === viewId) {
+					key = Object.keys(appStateData.appState)[i];
 					break;
 				}
 			}
 		}
-		if (oAppData.appState) {
+		if (appStateData?.appState) {
 			return {
-				[Object.keys(oAppData.appState)[i]]: oAppData.appState[key] || {}
+				[Object.keys(appStateData.appState)[i]]: appStateData.appState[key] || {}
 			};
 		}
 	}
@@ -164,7 +169,6 @@ class AppStateHandler extends BaseObject {
 		BusyLocker.lock(this);
 		// Done for busy indicator
 		BusyLocker.lock(this.oAppComponent.getRootControl());
-
 		const oNavigationService = this.oAppComponent.getNavigationService();
 		// TODO oNavigationService.parseNavigation() should return ES6 promise instead jQuery.promise
 		return toES6Promise(oNavigationService.parseNavigation())
@@ -189,14 +193,16 @@ class AppStateHandler extends BaseObject {
 					sNavType = (aResults[2] as string) || NavType.initial,
 					oRootController = this.oAppComponent.getRootControl().getController();
 				// apply the appstate depending upon the view (LR/OP)
-				const appStateData = this._getAppStateData(oAppData, viewId);
-
-				this._mCurrentAppState = sNavType === NavType.iAppState ? appStateData : undefined;
+				const appStateData = this._getAppStateData(oAppData, viewId, sNavType);
+				this._mCurrentAppState = sNavType === NavType.iAppState || sNavType === NavType.hybrid ? appStateData : undefined;
 
 				if (!oRootController.viewState) {
 					throw new Error(`viewState extension required for controller ${oRootController.getMetadata().getName()}`);
 				}
 				if ((!oAppData || Object.keys(oAppData).length === 0) && sNavType == NavType.iAppState) {
+					if (!oRootController.viewState._getInitialStateApplied()) {
+						oRootController.viewState._setInitialStateApplied();
+					}
 					return {};
 				}
 				return oRootController.viewState.applyViewState(

package/src/sap/fe/core/BaseController-dbg.js

@@ -73,4 +73,4 @@ sap.ui.define(["sap/fe/core/CommonUtils", "sap/fe/core/helpers/ClassSupport", "s
   }(Controller), (_applyDecoratedDescriptor(_class2.prototype, "getAppComponent", [_dec2], Object.getOwnPropertyDescriptor(_class2.prototype, "getAppComponent"), _class2.prototype)), _class2)) || _class);
   return BaseController;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJCYXNlQ29udHJvbGxlciIsImRlZmluZVVJNUNsYXNzIiwicHVibGljRXh0ZW5zaW9uIiwiZ2V0QXBwQ29tcG9uZW50IiwiX29BcHBDb21wb25lbnQiLCJDb21tb25VdGlscyIsImdldFZpZXciLCJnZXRNb2RlbCIsInNOYW1lIiwic2V0TW9kZWwiLCJvTW9kZWwiLCJnZXRSZXNvdXJjZUJ1bmRsZSIsInNJMThuTW9kZWxOYW1lIiwiQ29udHJvbGxlciJdLCJzb3VyY2VSb290IjoiLiIsInNvdXJjZXMiOlsiQmFzZUNvbnRyb2xsZXIudHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHR5cGUgQXBwQ29tcG9uZW50IGZyb20gXCJzYXAvZmUvY29yZS9BcHBDb21wb25lbnRcIjtcbmltcG9ydCBDb21tb25VdGlscyBmcm9tIFwic2FwL2ZlL2NvcmUvQ29tbW9uVXRpbHNcIjtcbmltcG9ydCB7IGRlZmluZVVJNUNsYXNzLCBwdWJsaWNFeHRlbnNpb24gfSBmcm9tIFwic2FwL2ZlL2NvcmUvaGVscGVycy9DbGFzc1N1cHBvcnRcIjtcbmltcG9ydCB0eXBlIFJlc291cmNlTW9kZWwgZnJvbSBcInNhcC9mZS9jb3JlL1Jlc291cmNlTW9kZWxcIjtcbmltcG9ydCB0eXBlIFRlbXBsYXRlQ29tcG9uZW50IGZyb20gXCJzYXAvZmUvY29yZS9UZW1wbGF0ZUNvbXBvbmVudFwiO1xuaW1wb3J0IENvbnRyb2xsZXIgZnJvbSBcInNhcC91aS9jb3JlL212Yy9Db250cm9sbGVyXCI7XG5pbXBvcnQgdHlwZSBWaWV3IGZyb20gXCJzYXAvdWkvY29yZS9tdmMvVmlld1wiO1xuaW1wb3J0IHR5cGUgTW9kZWwgZnJvbSBcInNhcC91aS9tb2RlbC9Nb2RlbFwiO1xuXG4vKipcbiAqIEludGVybmFsIGJhc2UgY29udHJvbGxlciBjbGFzcyBmb3IgU0FQIEZpb3JpIGVsZW1lbnRzIGFwcGxpY2F0aW9uLlxuICpcbiAqIElmIHlvdSB3YW50IHRvIGV4dGVuZCBhIGJhc2UgY29udHJvbGxlciBmb3IgeW91ciBjdXN0b20gcGFnZSwgcGxlYXNlIHVzZSBmb3Igc2FwLmZlLmNvcmUuUGFnZUNvbnRyb2xsZXIuXG4gKlxuICogQGhpZGVjb25zdHJ1Y3RvclxuICogQHB1YmxpY1xuICogQHNpbmNlIDEuOTAuMFxuICovXG5AZGVmaW5lVUk1Q2xhc3MoXCJzYXAuZmUuY29yZS5CYXNlQ29udHJvbGxlclwiKVxuY2xhc3MgQmFzZUNvbnRyb2xsZXIgZXh0ZW5kcyBDb250cm9sbGVyIHtcblx0cHJpdmF0ZSBfb0FwcENvbXBvbmVudD86IEFwcENvbXBvbmVudDtcblxuXHQvKipcblx0ICogUmV0dXJucyB0aGUgY3VycmVudCBhcHAgY29tcG9uZW50LlxuXHQgKlxuXHQgKiBAcmV0dXJucyBUaGUgYXBwIGNvbXBvbmVudCBvciwgaWYgbm90IGZvdW5kLCBudWxsXG5cdCAqIEBhbGlhcyBzYXAuZmUuY29yZS5CYXNlQ29udHJvbGxlciNnZXRBcHBDb21wb25lbnRcblx0ICogQHB1YmxpY1xuXHQgKiBAc2luY2UgMS45MS4wXG5cdCAqL1xuXHRAcHVibGljRXh0ZW5zaW9uKClcblx0Z2V0QXBwQ29tcG9uZW50KCk6IEFwcENvbXBvbmVudCB7XG5cdFx0aWYgKCF0aGlzLl9vQXBwQ29tcG9uZW50KSB7XG5cdFx0XHR0aGlzLl9vQXBwQ29tcG9uZW50ID0gQ29tbW9uVXRpbHMuZ2V0QXBwQ29tcG9uZW50KHRoaXMuZ2V0VmlldygpKTtcblx0XHR9XG5cdFx0cmV0dXJuIHRoaXMuX29BcHBDb21wb25lbnQ7XG5cdH1cblxuXHQvKipcblx0ICogQ29udmVuaWVuY2UgbWV0aG9kIHByb3ZpZGVkIGJ5IFNBUCBGaW9yaSBlbGVtZW50cyB0byBlbmFibGUgYXBwbGljYXRpb25zIHRvIGluY2x1ZGUgdGhlIHZpZXcgbW9kZWwgYnkgbmFtZSBpbnRvIGVhY2ggY29udHJvbGxlci5cblx0ICpcblx0ICogQHB1YmxpY1xuXHQgKiBAcGFyYW0gc05hbWUgVGhlIG1vZGVsIG5hbWVcblx0ICogQHJldHVybnMgVGhlIG1vZGVsIGluc3RhbmNlXG5cdCAqL1xuXHRnZXRNb2RlbChzTmFtZT86IHN0cmluZykge1xuXHRcdHJldHVybiB0aGlzLmdldFZpZXcoKS5nZXRNb2RlbChzTmFtZSk7XG5cdH1cblxuXHQvKipcblx0ICogQ29udmVuaWVuY2UgbWV0aG9kIGZvciBzZXR0aW5nIHRoZSB2aWV3IG1vZGVsIGluIGV2ZXJ5IGNvbnRyb2xsZXIgb2YgdGhlIGFwcGxpY2F0aW9uLlxuXHQgKlxuXHQgKiBAcHVibGljXG5cdCAqIEBwYXJhbSBvTW9kZWwgVGhlIG1vZGVsIGluc3RhbmNlXG5cdCAqIEBwYXJhbSBzTmFtZSBUaGUgbW9kZWwgbmFtZVxuXHQgKiBAcmV0dXJucyBUaGUgdmlldyBpbnN0YW5jZVxuXHQgKi9cblx0c2V0TW9kZWwob01vZGVsOiBNb2RlbCwgc05hbWU6IHN0cmluZyk6IFZpZXcge1xuXHRcdHJldHVybiB0aGlzLmdldFZpZXcoKS5zZXRNb2RlbChvTW9kZWwsIHNOYW1lKTtcblx0fVxuXG5cdGdldFJlc291cmNlQnVuZGxlKHNJMThuTW9kZWxOYW1lOiBzdHJpbmcpIHtcblx0XHRpZiAoIXNJMThuTW9kZWxOYW1lKSB7XG5cdFx0XHRzSTE4bk1vZGVsTmFtZSA9IFwiaTE4blwiO1xuXHRcdH1cblx0XHRyZXR1cm4gKHRoaXMuZ2V0QXBwQ29tcG9uZW50KCkuZ2V0TW9kZWwoc0kxOG5Nb2RlbE5hbWUpIGFzIFJlc291cmNlTW9kZWwpLmdldFJlc291cmNlQnVuZGxlKCk7XG5cdH1cbn1cbmludGVyZmFjZSBCYXNlQ29udHJvbGxlciB7XG5cdGdldE93bmVyQ29tcG9uZW50KCk6IFRlbXBsYXRlQ29tcG9uZW50O1xuXG5cdC8qKlxuXHQgKiBSZXR1cm5zIHRoZSB2aWV3IGFzc29jaWF0ZWQgd2l0aCB0aGlzIGNvbnRyb2xsZXIuXG5cdCAqXG5cdCAqIEByZXR1cm5zIFZpZXcgY29ubmVjdGVkIHRvIHRoaXMgY29udHJvbGxlci5cblx0ICovXG5cdGdldFZpZXcoKTogVmlldztcbn1cbmV4cG9ydCBkZWZhdWx0IEJhc2VDb250cm9sbGVyO1xuIl0sIm1hcHBpbmdzIjoiO0FBQUE7QUFBQTtBQUFBOzs7Ozs7Ozs7O0VBU0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0VBUkEsSUFVTUEsY0FBYyxXQURuQkMsY0FBYyxDQUFDLDRCQUE0QixDQUFDLFVBWTNDQyxlQUFlLEVBQUU7SUFBQTtJQUFBO01BQUE7SUFBQTtJQUFBO0lBUmxCO0FBQ0Q7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7SUFQQyxPQVNBQyxlQUFlLEdBRGYsMkJBQ2dDO01BQy9CLElBQUksQ0FBQyxJQUFJLENBQUNDLGNBQWMsRUFBRTtRQUN6QixJQUFJLENBQUNBLGNBQWMsR0FBR0MsV0FBVyxDQUFDRixlQUFlLENBQUMsSUFBSSxDQUFDRyxPQUFPLEVBQUUsQ0FBQztNQUNsRTtNQUNBLE9BQU8sSUFBSSxDQUFDRixjQUFjO0lBQzNCOztJQUVBO0FBQ0Q7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBLE9BTkM7SUFBQSxPQU9BRyxRQUFRLEdBQVIsa0JBQVNDLEtBQWMsRUFBRTtNQUN4QixPQUFPLElBQUksQ0FBQ0YsT0FBTyxFQUFFLENBQUNDLFFBQVEsQ0FBQ0MsS0FBSyxDQUFDO0lBQ3RDOztJQUVBO0FBQ0Q7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EsT0FQQztJQUFBLE9BUUFDLFFBQVEsR0FBUixrQkFBU0MsTUFBYSxFQUFFRixLQUFhLEVBQVE7TUFDNUMsT0FBTyxJQUFJLENBQUNGLE9BQU8sRUFBRSxDQUFDRyxRQUFRLENBQUNDLE1BQU0sRUFBRUYsS0FBSyxDQUFDO0lBQzlDLENBQUM7SUFBQSxPQUVERyxpQkFBaUIsR0FBakIsMkJBQWtCQyxjQUFzQixFQUFFO01BQ3pDLElBQUksQ0FBQ0EsY0FBYyxFQUFFO1FBQ3BCQSxjQUFjLEdBQUcsTUFBTTtNQUN4QjtNQUNBLE9BQVEsSUFBSSxDQUFDVCxlQUFlLEVBQUUsQ0FBQ0ksUUFBUSxDQUFDSyxjQUFjLENBQUMsQ0FBbUJELGlCQUFpQixFQUFFO0lBQzlGLENBQUM7SUFBQTtFQUFBLEVBL0MyQkUsVUFBVTtFQUFBLE9BMkR4QmIsY0FBYztBQUFBIn0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJCYXNlQ29udHJvbGxlciIsImRlZmluZVVJNUNsYXNzIiwicHVibGljRXh0ZW5zaW9uIiwiZ2V0QXBwQ29tcG9uZW50IiwiX29BcHBDb21wb25lbnQiLCJDb21tb25VdGlscyIsImdldFZpZXciLCJnZXRNb2RlbCIsInNOYW1lIiwic2V0TW9kZWwiLCJvTW9kZWwiLCJnZXRSZXNvdXJjZUJ1bmRsZSIsInNJMThuTW9kZWxOYW1lIiwiQ29udHJvbGxlciJdLCJzb3VyY2VSb290IjoiLiIsInNvdXJjZXMiOlsiQmFzZUNvbnRyb2xsZXIudHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHR5cGUgQXBwQ29tcG9uZW50IGZyb20gXCJzYXAvZmUvY29yZS9BcHBDb21wb25lbnRcIjtcbmltcG9ydCBDb21tb25VdGlscyBmcm9tIFwic2FwL2ZlL2NvcmUvQ29tbW9uVXRpbHNcIjtcbmltcG9ydCB7IGRlZmluZVVJNUNsYXNzLCBwdWJsaWNFeHRlbnNpb24gfSBmcm9tIFwic2FwL2ZlL2NvcmUvaGVscGVycy9DbGFzc1N1cHBvcnRcIjtcbmltcG9ydCB0eXBlIFJlc291cmNlTW9kZWwgZnJvbSBcInNhcC9mZS9jb3JlL1Jlc291cmNlTW9kZWxcIjtcbmltcG9ydCB0eXBlIFRlbXBsYXRlQ29tcG9uZW50IGZyb20gXCJzYXAvZmUvY29yZS9UZW1wbGF0ZUNvbXBvbmVudFwiO1xuaW1wb3J0IENvbnRyb2xsZXIgZnJvbSBcInNhcC91aS9jb3JlL212Yy9Db250cm9sbGVyXCI7XG5pbXBvcnQgdHlwZSBWaWV3IGZyb20gXCJzYXAvdWkvY29yZS9tdmMvVmlld1wiO1xuaW1wb3J0IHR5cGUgSlNPTk1vZGVsIGZyb20gXCJzYXAvdWkvbW9kZWwvanNvbi9KU09OTW9kZWxcIjtcbmltcG9ydCB0eXBlIE1vZGVsIGZyb20gXCJzYXAvdWkvbW9kZWwvTW9kZWxcIjtcbmltcG9ydCB0eXBlIE9EYXRhTW9kZWwgZnJvbSBcInNhcC91aS9tb2RlbC9vZGF0YS92NC9PRGF0YU1vZGVsXCI7XG5cbi8qKlxuICogSW50ZXJuYWwgYmFzZSBjb250cm9sbGVyIGNsYXNzIGZvciBTQVAgRmlvcmkgZWxlbWVudHMgYXBwbGljYXRpb24uXG4gKlxuICogSWYgeW91IHdhbnQgdG8gZXh0ZW5kIGEgYmFzZSBjb250cm9sbGVyIGZvciB5b3VyIGN1c3RvbSBwYWdlLCBwbGVhc2UgdXNlIGZvciBzYXAuZmUuY29yZS5QYWdlQ29udHJvbGxlci5cbiAqXG4gKiBAaGlkZWNvbnN0cnVjdG9yXG4gKiBAcHVibGljXG4gKiBAc2luY2UgMS45MC4wXG4gKi9cbkBkZWZpbmVVSTVDbGFzcyhcInNhcC5mZS5jb3JlLkJhc2VDb250cm9sbGVyXCIpXG5jbGFzcyBCYXNlQ29udHJvbGxlciBleHRlbmRzIENvbnRyb2xsZXIge1xuXHRwcml2YXRlIF9vQXBwQ29tcG9uZW50PzogQXBwQ29tcG9uZW50O1xuXG5cdC8qKlxuXHQgKiBSZXR1cm5zIHRoZSBjdXJyZW50IGFwcCBjb21wb25lbnQuXG5cdCAqXG5cdCAqIEByZXR1cm5zIFRoZSBhcHAgY29tcG9uZW50IG9yLCBpZiBub3QgZm91bmQsIG51bGxcblx0ICogQGFsaWFzIHNhcC5mZS5jb3JlLkJhc2VDb250cm9sbGVyI2dldEFwcENvbXBvbmVudFxuXHQgKiBAcHVibGljXG5cdCAqIEBzaW5jZSAxLjkxLjBcblx0ICovXG5cdEBwdWJsaWNFeHRlbnNpb24oKVxuXHRnZXRBcHBDb21wb25lbnQoKTogQXBwQ29tcG9uZW50IHtcblx0XHRpZiAoIXRoaXMuX29BcHBDb21wb25lbnQpIHtcblx0XHRcdHRoaXMuX29BcHBDb21wb25lbnQgPSBDb21tb25VdGlscy5nZXRBcHBDb21wb25lbnQodGhpcy5nZXRWaWV3KCkpO1xuXHRcdH1cblx0XHRyZXR1cm4gdGhpcy5fb0FwcENvbXBvbmVudDtcblx0fVxuXG5cdC8qKlxuXHQgKiBDb252ZW5pZW5jZSBtZXRob2QgcHJvdmlkZWQgYnkgU0FQIEZpb3JpIGVsZW1lbnRzIHRvIGVuYWJsZSBhcHBsaWNhdGlvbnMgdG8gaW5jbHVkZSB0aGUgdmlldyBtb2RlbCBieSBuYW1lIGludG8gZWFjaCBjb250cm9sbGVyLlxuXHQgKlxuXHQgKiBAcHVibGljXG5cdCAqIEBwYXJhbSBzTmFtZSBUaGUgbW9kZWwgbmFtZVxuXHQgKiBAcmV0dXJucyBUaGUgbW9kZWwgaW5zdGFuY2Vcblx0ICovXG5cdGdldE1vZGVsKHNOYW1lPzogc3RyaW5nKSB7XG5cdFx0cmV0dXJuIHRoaXMuZ2V0VmlldygpLmdldE1vZGVsKHNOYW1lKTtcblx0fVxuXG5cdC8qKlxuXHQgKiBDb252ZW5pZW5jZSBtZXRob2QgZm9yIHNldHRpbmcgdGhlIHZpZXcgbW9kZWwgaW4gZXZlcnkgY29udHJvbGxlciBvZiB0aGUgYXBwbGljYXRpb24uXG5cdCAqXG5cdCAqIEBwdWJsaWNcblx0ICogQHBhcmFtIG9Nb2RlbCBUaGUgbW9kZWwgaW5zdGFuY2Vcblx0ICogQHBhcmFtIHNOYW1lIFRoZSBtb2RlbCBuYW1lXG5cdCAqIEByZXR1cm5zIFRoZSB2aWV3IGluc3RhbmNlXG5cdCAqL1xuXHRzZXRNb2RlbChvTW9kZWw6IE1vZGVsLCBzTmFtZTogc3RyaW5nKTogVmlldyB7XG5cdFx0cmV0dXJuIHRoaXMuZ2V0VmlldygpLnNldE1vZGVsKG9Nb2RlbCwgc05hbWUpO1xuXHR9XG5cblx0Z2V0UmVzb3VyY2VCdW5kbGUoc0kxOG5Nb2RlbE5hbWU6IHN0cmluZykge1xuXHRcdGlmICghc0kxOG5Nb2RlbE5hbWUpIHtcblx0XHRcdHNJMThuTW9kZWxOYW1lID0gXCJpMThuXCI7XG5cdFx0fVxuXHRcdHJldHVybiAodGhpcy5nZXRBcHBDb21wb25lbnQoKS5nZXRNb2RlbChzSTE4bk1vZGVsTmFtZSkgYXMgUmVzb3VyY2VNb2RlbCkuZ2V0UmVzb3VyY2VCdW5kbGUoKTtcblx0fVxufVxuZXhwb3J0IHR5cGUgRkVWaWV3ID0ge1xuXHRnZXRNb2RlbCgpOiBPRGF0YU1vZGVsO1xuXHRnZXRNb2RlbChtb2RlbE5hbWU6IFwic2FwLmZlLmkxOG5cIik6IFJlc291cmNlTW9kZWw7XG5cdGdldE1vZGVsKG1vZGVsTmFtZTogXCJ1aVwiKTogSlNPTk1vZGVsO1xuXHRnZXRNb2RlbChtb2RlbE5hbWU6IFwiaW50ZXJuYWxcIik6IEpTT05Nb2RlbDtcblx0Z2V0TW9kZWwobW9kZWxOYW1lOiBcIl9wYWdlTW9kZWxcIik6IEpTT05Nb2RlbDtcbn0gJiBWaWV3O1xuXG5pbnRlcmZhY2UgQmFzZUNvbnRyb2xsZXIge1xuXHRnZXRPd25lckNvbXBvbmVudCgpOiBUZW1wbGF0ZUNvbXBvbmVudDtcblx0Z2V0TW9kZWwoKTogT0RhdGFNb2RlbDtcblx0Z2V0TW9kZWwobW9kZWxOYW1lOiBcInVpXCIpOiBKU09OTW9kZWw7XG5cdC8qKlxuXHQgKiBSZXR1cm5zIHRoZSB2aWV3IGFzc29jaWF0ZWQgd2l0aCB0aGlzIGNvbnRyb2xsZXIuXG5cdCAqXG5cdCAqIEByZXR1cm5zIFZpZXcgY29ubmVjdGVkIHRvIHRoaXMgY29udHJvbGxlci5cblx0ICovXG5cdGdldFZpZXcoKTogRkVWaWV3O1xufVxuZXhwb3J0IGRlZmF1bHQgQmFzZUNvbnRyb2xsZXI7XG4iXSwibWFwcGluZ3MiOiI7QUFBQTtBQUFBO0FBQUE7Ozs7Ozs7Ozs7RUFXQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7RUFSQSxJQVVNQSxjQUFjLFdBRG5CQyxjQUFjLENBQUMsNEJBQTRCLENBQUMsVUFZM0NDLGVBQWUsRUFBRTtJQUFBO0lBQUE7TUFBQTtJQUFBO0lBQUE7SUFSbEI7QUFDRDtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtJQVBDLE9BU0FDLGVBQWUsR0FEZiwyQkFDZ0M7TUFDL0IsSUFBSSxDQUFDLElBQUksQ0FBQ0MsY0FBYyxFQUFFO1FBQ3pCLElBQUksQ0FBQ0EsY0FBYyxHQUFHQyxXQUFXLENBQUNGLGVBQWUsQ0FBQyxJQUFJLENBQUNHLE9BQU8sRUFBRSxDQUFDO01BQ2xFO01BQ0EsT0FBTyxJQUFJLENBQUNGLGNBQWM7SUFDM0I7O0lBRUE7QUFDRDtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EsT0FOQztJQUFBLE9BT0FHLFFBQVEsR0FBUixrQkFBU0MsS0FBYyxFQUFFO01BQ3hCLE9BQU8sSUFBSSxDQUFDRixPQUFPLEVBQUUsQ0FBQ0MsUUFBUSxDQUFDQyxLQUFLLENBQUM7SUFDdEM7O0lBRUE7QUFDRDtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSxPQVBDO0lBQUEsT0FRQUMsUUFBUSxHQUFSLGtCQUFTQyxNQUFhLEVBQUVGLEtBQWEsRUFBUTtNQUM1QyxPQUFPLElBQUksQ0FBQ0YsT0FBTyxFQUFFLENBQUNHLFFBQVEsQ0FBQ0MsTUFBTSxFQUFFRixLQUFLLENBQUM7SUFDOUMsQ0FBQztJQUFBLE9BRURHLGlCQUFpQixHQUFqQiwyQkFBa0JDLGNBQXNCLEVBQUU7TUFDekMsSUFBSSxDQUFDQSxjQUFjLEVBQUU7UUFDcEJBLGNBQWMsR0FBRyxNQUFNO01BQ3hCO01BQ0EsT0FBUSxJQUFJLENBQUNULGVBQWUsRUFBRSxDQUFDSSxRQUFRLENBQUNLLGNBQWMsQ0FBQyxDQUFtQkQsaUJBQWlCLEVBQUU7SUFDOUYsQ0FBQztJQUFBO0VBQUEsRUEvQzJCRSxVQUFVO0VBQUEsT0FvRXhCYixjQUFjO0FBQUEifQ==

package/src/sap/fe/core/BaseController.ts

@@ -5,7 +5,9 @@ import type ResourceModel from "sap/fe/core/ResourceModel";
 import type TemplateComponent from "sap/fe/core/TemplateComponent";
 import Controller from "sap/ui/core/mvc/Controller";
 import type View from "sap/ui/core/mvc/View";
+import type JSONModel from "sap/ui/model/json/JSONModel";
 import type Model from "sap/ui/model/Model";
+import type ODataModel from "sap/ui/model/odata/v4/ODataModel";
 
 /**
  * Internal base controller class for SAP Fiori elements application.
@@ -66,14 +68,23 @@ class BaseController extends Controller {
 		return (this.getAppComponent().getModel(sI18nModelName) as ResourceModel).getResourceBundle();
 	}
 }
+export type FEView = {
+	getModel(): ODataModel;
+	getModel(modelName: "sap.fe.i18n"): ResourceModel;
+	getModel(modelName: "ui"): JSONModel;
+	getModel(modelName: "internal"): JSONModel;
+	getModel(modelName: "_pageModel"): JSONModel;
+} & View;
+
 interface BaseController {
 	getOwnerComponent(): TemplateComponent;
-
+	getModel(): ODataModel;
+	getModel(modelName: "ui"): JSONModel;
 	/**
 	 * Returns the view associated with this controller.
 	 *
 	 * @returns View connected to this controller.
 	 */
-	getView(): View;
+	getView(): FEView;
 }
 export default BaseController;