@sapui5/sap.fe.core 1.102.2 → 1.104.1

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

@@ -2,35 +2,32 @@
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/base/Log", "sap/base/util/deepEqual", "sap/fe/core/helpers/ClassSupport", "sap/fe/navigation/library", "sap/ui/base/Object", "./controllerextensions/BusyLocker", "./helpers/ModelHelper"], function (Log, deepEqual, ClassSupport, library, BaseObject, BusyLocker, ModelHelper) {
+sap.ui.define(["sap/base/Log", "sap/base/util/deepEqual", "sap/fe/core/helpers/ClassSupport", "sap/fe/core/helpers/ToES6Promise", "sap/fe/navigation/library", "sap/ui/base/Object", "./controllerextensions/BusyLocker", "./helpers/ModelHelper"], function (Log, deepEqual, ClassSupport, toES6Promise, library, BaseObject, BusyLocker, ModelHelper) {
   "use strict";
 
   var _dec, _class;
 
   var defineUI5Class = ClassSupport.defineUI5Class;
 
-  function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
-
-  function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+  function _catch(body, recover) {
+    try {
+      var result = body();
+    } catch (e) {
+      return recover(e);
+    }
 
-  var NavType = library.NavType;
+    if (result && result.then) {
+      return result.then(void 0, recover);
+    }
 
-  function _toES6Promise(oThenable) {
-    return Promise.resolve(oThenable.then(function () {
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
+    return result;
+  }
 
-      return Array.prototype.slice.call(args);
-    }).catch(function () {
-      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-        args[_key2] = arguments[_key2];
-      }
+  function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
 
-      return Array.prototype.slice.call(args);
-    }));
-  }
+  function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
+  var NavType = library.NavType;
   var AppStateHandler = (_dec = defineUI5Class("sap.fe.core.AppStateHandler"), _dec(_class = /*#__PURE__*/function (_BaseObject) {
     _inheritsLoose(AppStateHandler, _BaseObject);
 
@@ -41,7 +38,7 @@ sap.ui.define(["sap/base/Log", "sap/base/util/deepEqual", "sap/fe/core/helpers/C
       _this = _BaseObject.call(this) || this;
       _this._mCurrentAppState = {};
       _this.oAppComponent = oAppComponent;
-      _this.sId = oAppComponent.getId() + "/AppStateHandler";
+      _this.sId = "".concat(oAppComponent.getId(), "/AppStateHandler");
       _this.bNoRouteChange = false;
       Log.info("APPSTATE : Appstate handler initialized");
       return _this;
@@ -55,50 +52,65 @@ sap.ui.define(["sap/base/Log", "sap/base/util/deepEqual", "sap/fe/core/helpers/C
     /**
      * Creates/updates the appstate.
      *
-     * @returns {Promise} A promise resolving the stored data
+     * @returns A promise resolving the stored data
      * @ui5-restricted
      */
     ;
 
     _proto.createAppState = function createAppState() {
-      var _this2 = this;
+      try {
+        var _this3 = this;
 
-      if (!this.oAppComponent.getEnvironmentCapabilities().getCapabilities().AppState || BusyLocker.isLocked(this)) {
-        return Promise.resolve();
-      }
-
-      var oNavigationService = this.oAppComponent.getNavigationService(),
-          oRouterProxy = this.oAppComponent.getRouterProxy(),
-          sHash = oRouterProxy.getHash(),
-          oController = this.oAppComponent.getRootControl().getController(),
-          bIsStickyMode = ModelHelper.isStickySessionSupported(this.oAppComponent.getMetaModel());
-
-      if (!oController.viewState) {
-        return Promise.reject("viewState controller extension not available for controller: " + oController.getMetadata().getName());
-      }
-
-      return oController.viewState.retrieveViewState().then(function (mInnerAppState) {
-        var oStoreData = {
-          appState: mInnerAppState
-        };
-
-        if (mInnerAppState && !deepEqual(_this2._mCurrentAppState, mInnerAppState)) {
-          _this2._mCurrentAppState = mInnerAppState;
-          var oAppState = oNavigationService.storeInnerAppStateWithImmediateReturn(oStoreData, true);
-          Log.info("APPSTATE: Appstate stored");
-          var sAppStateKey = oAppState.appStateKey;
-          var sNewHash = oNavigationService.replaceInnerAppStateKey(sHash, sAppStateKey);
+        if (!_this3.oAppComponent.getEnvironmentCapabilities().getCapabilities().AppState || BusyLocker.isLocked(_this3)) {
+          return Promise.resolve();
+        }
 
-          if (sNewHash !== sHash) {
-            oRouterProxy.navToHash(sNewHash, null, null, null, !bIsStickyMode);
-            _this2.bNoRouteChange = true;
-          }
+        var oNavigationService = _this3.oAppComponent.getNavigationService(),
+            oRouterProxy = _this3.oAppComponent.getRouterProxy(),
+            sHash = oRouterProxy.getHash(),
+            oController = _this3.oAppComponent.getRootControl().getController(),
+            bIsStickyMode = ModelHelper.isStickySessionSupported(_this3.oAppComponent.getMetaModel());
 
-          Log.info("APPSTATE: navToHash");
+        if (!oController.viewState) {
+          throw new Error("viewState controller extension not available for controller: ".concat(oController.getMetadata().getName()));
         }
 
-        return oStoreData;
-      });
+        return Promise.resolve(oController.viewState.retrieveViewState()).then(function (mInnerAppState) {
+          var oStoreData = {
+            appState: mInnerAppState
+          };
+
+          var _temp2 = function () {
+            if (mInnerAppState && !deepEqual(_this3._mCurrentAppState, mInnerAppState)) {
+              _this3._mCurrentAppState = mInnerAppState;
+
+              var _temp3 = _catch(function () {
+                return Promise.resolve(oNavigationService.storeInnerAppState(oStoreData, true, true)).then(function (sAppStateKey) {
+                  Log.info("APPSTATE: Appstate stored");
+                  var sNewHash = oNavigationService.replaceInnerAppStateKey(sHash, sAppStateKey);
+
+                  if (sNewHash !== sHash) {
+                    oRouterProxy.navToHash(sNewHash, null, null, null, !bIsStickyMode);
+                    _this3.bNoRouteChange = true;
+                  }
+
+                  Log.info("APPSTATE: navToHash");
+                });
+              }, function (oError) {
+                Log.error(oError);
+              });
+
+              if (_temp3 && _temp3.then) return _temp3.then(function () {});
+            }
+          }();
+
+          return _temp2 && _temp2.then ? _temp2.then(function () {
+            return oStoreData;
+          }) : oStoreData;
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
     };
 
     _proto._createNavigationParameters = function _createNavigationParameters(oAppData, sNavType) {
@@ -115,14 +127,14 @@ sap.ui.define(["sap/base/Log", "sap/base/util/deepEqual", "sap/fe/core/helpers/C
      * @function
      * @static
      * @memberof sap.fe.core.AppStateHandler
-     * @returns {Promise} A promise for async handling
+     * @returns A promise for async handling
      * @private
      * @ui5-restricted
-     **/
+     */
     ;
 
     _proto.applyAppState = function applyAppState() {
-      var _this3 = this;
+      var _this4 = this;
 
       if (!this.oAppComponent.getEnvironmentCapabilities().getCapabilities().AppState || BusyLocker.isLocked(this)) {
         return Promise.resolve();
@@ -133,7 +145,7 @@ sap.ui.define(["sap/base/Log", "sap/base/util/deepEqual", "sap/fe/core/helpers/C
       BusyLocker.lock(this.oAppComponent.getRootControl());
       var oNavigationService = this.oAppComponent.getNavigationService(); // TODO oNavigationService.parseNavigation() should return ES6 promise instead jQuery.promise
 
-      return _toES6Promise(oNavigationService.parseNavigation()).catch(function (aErrorData) {
+      return toES6Promise(oNavigationService.parseNavigation()).catch(function (aErrorData) {
         if (!aErrorData) {
           aErrorData = [];
         }
@@ -147,28 +159,28 @@ sap.ui.define(["sap/base/Log", "sap/base/util/deepEqual", "sap/fe/core/helpers/C
 
         var oAppData = aResults[0] || {},
             sNavType = aResults[2] || NavType.initial,
-            oRootController = _this3.oAppComponent.getRootControl().getController();
+            oRootController = _this4.oAppComponent.getRootControl().getController();
 
-        _this3._mCurrentAppState = sNavType === NavType.iAppState ? oAppData && oAppData.appState : undefined;
+        _this4._mCurrentAppState = sNavType === NavType.iAppState ? oAppData && oAppData.appState : undefined;
 
         if (!oRootController.viewState) {
-          throw new Error("viewState extension required for controller " + oRootController.getMetadata().getName());
+          throw new Error("viewState extension required for controller ".concat(oRootController.getMetadata().getName()));
         }
 
-        return oRootController.viewState.applyViewState(_this3._mCurrentAppState, _this3._createNavigationParameters(oAppData, sNavType)).catch(function (oError) {
-          Log.error("appState could not be applied", oError);
-          throw oError;
-        });
+        return oRootController.viewState.applyViewState(_this4._mCurrentAppState, _this4._createNavigationParameters(oAppData, sNavType));
+      }).catch(function (oError) {
+        Log.error("appState could not be applied", oError);
+        throw oError;
       }).finally(function () {
-        BusyLocker.unlock(_this3);
-        BusyLocker.unlock(_this3.oAppComponent.getRootControl());
+        BusyLocker.unlock(_this4);
+        BusyLocker.unlock(_this4.oAppComponent.getRootControl());
       });
     }
     /**
      * To check is route is changed by change in the iAPPState.
      *
-     * @returns {boolean}
-     **/
+     * @returns `true` if the route has chnaged
+     */
     ;
 
     _proto.checkIfRouteChangedByIApp = function checkIfRouteChangedByIApp() {
@@ -176,7 +188,7 @@ sap.ui.define(["sap/base/Log", "sap/base/util/deepEqual", "sap/fe/core/helpers/C
     }
     /**
      * Reset the route changed by iAPPState.
-     **/
+     */
     ;
 
     _proto.resetRouteChangedByIApp = function resetRouteChangedByIApp() {
@@ -197,4 +209,4 @@ sap.ui.define(["sap/base/Log", "sap/base/util/deepEqual", "sap/fe/core/helpers/C
 
   return AppStateHandler;
 }, true);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["AppStateHandler.ts"],"names":["NavType","library","_toES6Promise","oThenable","Promise","resolve","then","args","Array","prototype","slice","call","catch","AppStateHandler","defineUI5Class","oAppComponent","_mCurrentAppState","sId","getId","bNoRouteChange","Log","info","createAppState","getEnvironmentCapabilities","getCapabilities","AppState","BusyLocker","isLocked","oNavigationService","getNavigationService","oRouterProxy","getRouterProxy","sHash","getHash","oController","getRootControl","getController","bIsStickyMode","ModelHelper","isStickySessionSupported","getMetaModel","viewState","reject","getMetadata","getName","retrieveViewState","mInnerAppState","oStoreData","appState","deepEqual","oAppState","storeInnerAppStateWithImmediateReturn","sAppStateKey","appStateKey","sNewHash","replaceInnerAppStateKey","navToHash","_createNavigationParameters","oAppData","sNavType","Object","assign","selectionVariantDefaults","oDefaultedSelectionVariant","selectionVariant","oSelectionVariant","requiresStandardVariant","bNavSelVarHasDefaultsOnly","navigationType","applyAppState","lock","parseNavigation","aErrorData","warning","aResults","initial","oRootController","iAppState","undefined","Error","applyViewState","oError","error","finally","unlock","checkIfRouteChangedByIApp","resetRouteChangedByIApp","_isListBasedComponent","oComponent","isA","BaseObject"],"mappings":"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","sourceRoot":".","sourcesContent":["import Log from \"sap/base/Log\";\nimport deepEqual from \"sap/base/util/deepEqual\";\nimport { defineUI5Class } from \"sap/fe/core/helpers/ClassSupport\";\nimport library from \"sap/fe/navigation/library\";\nimport BaseObject from \"sap/ui/base/Object\";\nimport BusyLocker from \"./controllerextensions/BusyLocker\";\nimport ModelHelper from \"./helpers/ModelHelper\";\n\nconst NavType = library.NavType;\nfunction _toES6Promise(oThenable: any) {\n\treturn Promise.resolve(\n\t\toThenable\n\t\t\t.then(function (...args: any[]) {\n\t\t\t\treturn Array.prototype.slice.call(args);\n\t\t\t})\n\t\t\t.catch(function (...args: any[]) {\n\t\t\t\treturn Array.prototype.slice.call(args);\n\t\t\t})\n\t);\n}\n\n@defineUI5Class(\"sap.fe.core.AppStateHandler\")\nclass AppStateHandler extends BaseObject {\n\tpublic sId: string;\n\tpublic oAppComponent: any; // AppComponent\n\tpublic bNoRouteChange: boolean;\n\tprivate _mCurrentAppState: Record<string, any> = {};\n\tconstructor(oAppComponent: any) {\n\t\tsuper();\n\t\tthis.oAppComponent = oAppComponent;\n\t\tthis.sId = oAppComponent.getId() + \"/AppStateHandler\";\n\n\t\tthis.bNoRouteChange = false;\n\t\tLog.info(\"APPSTATE : Appstate handler initialized\");\n\t}\n\tgetId() {\n\t\treturn this.sId;\n\t}\n\t/**\n\t * Creates/updates the appstate.\n\t *\n\t * @returns {Promise} A promise resolving the stored data\n\t * @ui5-restricted\n\t */\n\tcreateAppState() {\n\t\tif (!this.oAppComponent.getEnvironmentCapabilities().getCapabilities().AppState || BusyLocker.isLocked(this)) {\n\t\t\treturn Promise.resolve();\n\t\t}\n\n\t\tconst oNavigationService = this.oAppComponent.getNavigationService(),\n\t\t\toRouterProxy = this.oAppComponent.getRouterProxy(),\n\t\t\tsHash = oRouterProxy.getHash(),\n\t\t\toController = this.oAppComponent.getRootControl().getController(),\n\t\t\tbIsStickyMode = ModelHelper.isStickySessionSupported(this.oAppComponent.getMetaModel());\n\n\t\tif (!oController.viewState) {\n\t\t\treturn Promise.reject(\"viewState controller extension not available for controller: \" + oController.getMetadata().getName());\n\t\t}\n\n\t\treturn oController.viewState.retrieveViewState().then((mInnerAppState: any) => {\n\t\t\tconst oStoreData = { appState: mInnerAppState };\n\t\t\tif (mInnerAppState && !deepEqual(this._mCurrentAppState, mInnerAppState)) {\n\t\t\t\tthis._mCurrentAppState = mInnerAppState;\n\t\t\t\tconst oAppState = oNavigationService.storeInnerAppStateWithImmediateReturn(oStoreData, true);\n\t\t\t\tLog.info(\"APPSTATE: Appstate stored\");\n\t\t\t\tconst sAppStateKey = oAppState.appStateKey;\n\t\t\t\tconst sNewHash = oNavigationService.replaceInnerAppStateKey(sHash, sAppStateKey);\n\t\t\t\tif (sNewHash !== sHash) {\n\t\t\t\t\toRouterProxy.navToHash(sNewHash, null, null, null, !bIsStickyMode);\n\t\t\t\t\tthis.bNoRouteChange = true;\n\t\t\t\t}\n\t\t\t\tLog.info(\"APPSTATE: navToHash\");\n\t\t\t}\n\t\t\treturn oStoreData;\n\t\t});\n\t}\n\n\t_createNavigationParameters(oAppData: any, sNavType: any) {\n\t\treturn Object.assign({}, oAppData, {\n\t\t\tselectionVariantDefaults: oAppData.oDefaultedSelectionVariant,\n\t\t\tselectionVariant: oAppData.oSelectionVariant,\n\t\t\trequiresStandardVariant: !oAppData.bNavSelVarHasDefaultsOnly,\n\t\t\tnavigationType: sNavType\n\t\t});\n\t}\n\n\t/**\n\t * Applies an appstate by fetching appdata and passing it to _applyAppstateToPage.\n\t *\n\t * @function\n\t * @static\n\t * @memberof sap.fe.core.AppStateHandler\n\t * @returns {Promise} A promise for async handling\n\t * @private\n\t * @ui5-restricted\n\t **/\n\tapplyAppState() {\n\t\tif (!this.oAppComponent.getEnvironmentCapabilities().getCapabilities().AppState || BusyLocker.isLocked(this)) {\n\t\t\treturn Promise.resolve();\n\t\t}\n\t\tBusyLocker.lock(this);\n\t\t// Done for busy indicator\n\t\tBusyLocker.lock(this.oAppComponent.getRootControl());\n\n\t\tconst oNavigationService = this.oAppComponent.getNavigationService();\n\t\t// TODO oNavigationService.parseNavigation() should return ES6 promise instead jQuery.promise\n\t\treturn _toES6Promise(oNavigationService.parseNavigation())\n\t\t\t.catch(function (aErrorData: any) {\n\t\t\t\tif (!aErrorData) {\n\t\t\t\t\taErrorData = [];\n\t\t\t\t}\n\t\t\t\tLog.warning(\"APPSTATE: Parse Navigation failed\", aErrorData[0]);\n\t\t\t\treturn [\n\t\t\t\t\t{\n\t\t\t\t\t\t/* app data */\n\t\t\t\t\t},\n\t\t\t\t\taErrorData[1],\n\t\t\t\t\taErrorData[2]\n\t\t\t\t];\n\t\t\t})\n\t\t\t.then((aResults: any) => {\n\t\t\t\tLog.info(\"APPSTATE: Parse Navigation done\");\n\n\t\t\t\t// aResults[1] => oStartupParameters (not evaluated)\n\t\t\t\tconst oAppData = aResults[0] || {},\n\t\t\t\t\tsNavType = aResults[2] || NavType.initial,\n\t\t\t\t\toRootController = this.oAppComponent.getRootControl().getController();\n\n\t\t\t\tthis._mCurrentAppState = sNavType === NavType.iAppState ? oAppData && oAppData.appState : undefined;\n\n\t\t\t\tif (!oRootController.viewState) {\n\t\t\t\t\tthrow new Error(\"viewState extension required for controller \" + oRootController.getMetadata().getName());\n\t\t\t\t}\n\n\t\t\t\treturn oRootController.viewState\n\t\t\t\t\t.applyViewState(this._mCurrentAppState, this._createNavigationParameters(oAppData, sNavType))\n\t\t\t\t\t.catch(function (oError: any) {\n\t\t\t\t\t\tLog.error(\"appState could not be applied\", oError);\n\t\t\t\t\t\tthrow oError;\n\t\t\t\t\t});\n\t\t\t})\n\t\t\t.finally(() => {\n\t\t\t\tBusyLocker.unlock(this);\n\t\t\t\tBusyLocker.unlock(this.oAppComponent.getRootControl());\n\t\t\t});\n\t}\n\t/**\n\t * To check is route is changed by change in the iAPPState.\n\t *\n\t * @returns {boolean}\n\t **/\n\tcheckIfRouteChangedByIApp() {\n\t\treturn this.bNoRouteChange;\n\t}\n\t/**\n\t * Reset the route changed by iAPPState.\n\t **/\n\tresetRouteChangedByIApp() {\n\t\tif (this.bNoRouteChange) {\n\t\t\tthis.bNoRouteChange = false;\n\t\t}\n\t}\n\t_isListBasedComponent(oComponent: any) {\n\t\treturn oComponent.isA(\"sap.fe.templates.ListComponent\");\n\t}\n}\n\n/**\n * @global\n */\nexport default AppStateHandler;\n"]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["AppStateHandler.ts"],"names":["body","recover","result","e","then","NavType","library","AppStateHandler","defineUI5Class","oAppComponent","_mCurrentAppState","sId","getId","bNoRouteChange","Log","info","createAppState","getEnvironmentCapabilities","getCapabilities","AppState","BusyLocker","isLocked","oNavigationService","getNavigationService","oRouterProxy","getRouterProxy","sHash","getHash","oController","getRootControl","getController","bIsStickyMode","ModelHelper","isStickySessionSupported","getMetaModel","viewState","Error","getMetadata","getName","retrieveViewState","mInnerAppState","oStoreData","appState","deepEqual","storeInnerAppState","sAppStateKey","sNewHash","replaceInnerAppStateKey","navToHash","oError","error","_createNavigationParameters","oAppData","sNavType","Object","assign","selectionVariantDefaults","oDefaultedSelectionVariant","selectionVariant","oSelectionVariant","requiresStandardVariant","bNavSelVarHasDefaultsOnly","navigationType","applyAppState","Promise","resolve","lock","toES6Promise","parseNavigation","catch","aErrorData","warning","aResults","initial","oRootController","iAppState","undefined","applyViewState","finally","unlock","checkIfRouteChangedByIApp","resetRouteChangedByIApp","_isListBasedComponent","oComponent","isA","BaseObject"],"mappings":"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","sourceRoot":".","sourcesContent":["import Log from \"sap/base/Log\";\nimport deepEqual from \"sap/base/util/deepEqual\";\nimport { defineUI5Class } from \"sap/fe/core/helpers/ClassSupport\";\nimport toES6Promise from \"sap/fe/core/helpers/ToES6Promise\";\nimport library from \"sap/fe/navigation/library\";\nimport BaseObject from \"sap/ui/base/Object\";\nimport BusyLocker from \"./controllerextensions/BusyLocker\";\nimport ModelHelper from \"./helpers/ModelHelper\";\n\nconst NavType = library.NavType;\n\n@defineUI5Class(\"sap.fe.core.AppStateHandler\")\nclass AppStateHandler extends BaseObject {\n\tpublic sId: string;\n\tpublic oAppComponent: any; // AppComponent\n\tpublic bNoRouteChange: boolean;\n\tprivate _mCurrentAppState: Record<string, any> = {};\n\tconstructor(oAppComponent: any) {\n\t\tsuper();\n\t\tthis.oAppComponent = oAppComponent;\n\t\tthis.sId = `${oAppComponent.getId()}/AppStateHandler`;\n\n\t\tthis.bNoRouteChange = false;\n\t\tLog.info(\"APPSTATE : Appstate handler initialized\");\n\t}\n\tgetId() {\n\t\treturn this.sId;\n\t}\n\t/**\n\t * Creates/updates the appstate.\n\t *\n\t * @returns A promise resolving the stored data\n\t * @ui5-restricted\n\t */\n\tasync createAppState(): Promise<void | any> {\n\t\tif (!this.oAppComponent.getEnvironmentCapabilities().getCapabilities().AppState || BusyLocker.isLocked(this)) {\n\t\t\treturn;\n\t\t}\n\n\t\tconst oNavigationService = this.oAppComponent.getNavigationService(),\n\t\t\toRouterProxy = this.oAppComponent.getRouterProxy(),\n\t\t\tsHash = oRouterProxy.getHash(),\n\t\t\toController = this.oAppComponent.getRootControl().getController(),\n\t\t\tbIsStickyMode = ModelHelper.isStickySessionSupported(this.oAppComponent.getMetaModel());\n\n\t\tif (!oController.viewState) {\n\t\t\tthrow new Error(`viewState controller extension not available for controller: ${oController.getMetadata().getName()}`);\n\t\t}\n\n\t\tconst mInnerAppState = await oController.viewState.retrieveViewState();\n\t\tconst oStoreData = { appState: mInnerAppState };\n\t\tif (mInnerAppState && !deepEqual(this._mCurrentAppState, mInnerAppState)) {\n\t\t\tthis._mCurrentAppState = mInnerAppState;\n\t\t\ttry {\n\t\t\t\tconst sAppStateKey = await oNavigationService.storeInnerAppState(oStoreData, true, true);\n\t\t\t\tLog.info(\"APPSTATE: Appstate stored\");\n\t\t\t\tconst sNewHash = oNavigationService.replaceInnerAppStateKey(sHash, sAppStateKey);\n\t\t\t\tif (sNewHash !== sHash) {\n\t\t\t\t\toRouterProxy.navToHash(sNewHash, null, null, null, !bIsStickyMode);\n\t\t\t\t\tthis.bNoRouteChange = true;\n\t\t\t\t}\n\t\t\t\tLog.info(\"APPSTATE: navToHash\");\n\t\t\t} catch (oError: any) {\n\t\t\t\tLog.error(oError);\n\t\t\t}\n\t\t}\n\n\t\treturn oStoreData;\n\t}\n\n\t_createNavigationParameters(oAppData: any, sNavType: any) {\n\t\treturn Object.assign({}, oAppData, {\n\t\t\tselectionVariantDefaults: oAppData.oDefaultedSelectionVariant,\n\t\t\tselectionVariant: oAppData.oSelectionVariant,\n\t\t\trequiresStandardVariant: !oAppData.bNavSelVarHasDefaultsOnly,\n\t\t\tnavigationType: sNavType\n\t\t});\n\t}\n\n\t/**\n\t * Applies an appstate by fetching appdata and passing it to _applyAppstateToPage.\n\t *\n\t * @function\n\t * @static\n\t * @memberof sap.fe.core.AppStateHandler\n\t * @returns A promise for async handling\n\t * @private\n\t * @ui5-restricted\n\t */\n\tapplyAppState() {\n\t\tif (!this.oAppComponent.getEnvironmentCapabilities().getCapabilities().AppState || BusyLocker.isLocked(this)) {\n\t\t\treturn Promise.resolve();\n\t\t}\n\t\tBusyLocker.lock(this);\n\t\t// Done for busy indicator\n\t\tBusyLocker.lock(this.oAppComponent.getRootControl());\n\n\t\tconst oNavigationService = this.oAppComponent.getNavigationService();\n\t\t// TODO oNavigationService.parseNavigation() should return ES6 promise instead jQuery.promise\n\t\treturn toES6Promise(oNavigationService.parseNavigation())\n\t\t\t.catch(function (aErrorData: any) {\n\t\t\t\tif (!aErrorData) {\n\t\t\t\t\taErrorData = [];\n\t\t\t\t}\n\t\t\t\tLog.warning(\"APPSTATE: Parse Navigation failed\", aErrorData[0]);\n\t\t\t\treturn [\n\t\t\t\t\t{\n\t\t\t\t\t\t/* app data */\n\t\t\t\t\t},\n\t\t\t\t\taErrorData[1],\n\t\t\t\t\taErrorData[2]\n\t\t\t\t];\n\t\t\t})\n\t\t\t.then((aResults: any) => {\n\t\t\t\tLog.info(\"APPSTATE: Parse Navigation done\");\n\n\t\t\t\t// aResults[1] => oStartupParameters (not evaluated)\n\t\t\t\tconst oAppData = aResults[0] || {},\n\t\t\t\t\tsNavType = aResults[2] || NavType.initial,\n\t\t\t\t\toRootController = this.oAppComponent.getRootControl().getController();\n\n\t\t\t\tthis._mCurrentAppState = sNavType === NavType.iAppState ? oAppData && oAppData.appState : undefined;\n\n\t\t\t\tif (!oRootController.viewState) {\n\t\t\t\t\tthrow new Error(`viewState extension required for controller ${oRootController.getMetadata().getName()}`);\n\t\t\t\t}\n\n\t\t\t\treturn oRootController.viewState.applyViewState(\n\t\t\t\t\tthis._mCurrentAppState,\n\t\t\t\t\tthis._createNavigationParameters(oAppData, sNavType)\n\t\t\t\t);\n\t\t\t})\n\t\t\t.catch(function (oError: any) {\n\t\t\t\tLog.error(\"appState could not be applied\", oError);\n\t\t\t\tthrow oError;\n\t\t\t})\n\t\t\t.finally(() => {\n\t\t\t\tBusyLocker.unlock(this);\n\t\t\t\tBusyLocker.unlock(this.oAppComponent.getRootControl());\n\t\t\t});\n\t}\n\t/**\n\t * To check is route is changed by change in the iAPPState.\n\t *\n\t * @returns `true` if the route has chnaged\n\t */\n\tcheckIfRouteChangedByIApp() {\n\t\treturn this.bNoRouteChange;\n\t}\n\t/**\n\t * Reset the route changed by iAPPState.\n\t */\n\tresetRouteChangedByIApp() {\n\t\tif (this.bNoRouteChange) {\n\t\t\tthis.bNoRouteChange = false;\n\t\t}\n\t}\n\t_isListBasedComponent(oComponent: any) {\n\t\treturn oComponent.isA(\"sap.fe.templates.ListComponent\");\n\t}\n}\n\n/**\n * @global\n */\nexport default AppStateHandler;\n"]}

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

@@ -1,23 +1,13 @@
 import Log from "sap/base/Log";
 import deepEqual from "sap/base/util/deepEqual";
 import { defineUI5Class } from "sap/fe/core/helpers/ClassSupport";
+import toES6Promise from "sap/fe/core/helpers/ToES6Promise";
 import library from "sap/fe/navigation/library";
 import BaseObject from "sap/ui/base/Object";
 import BusyLocker from "./controllerextensions/BusyLocker";
 import ModelHelper from "./helpers/ModelHelper";
 
 const NavType = library.NavType;
-function _toES6Promise(oThenable: any) {
-	return Promise.resolve(
-		oThenable
-			.then(function (...args: any[]) {
-				return Array.prototype.slice.call(args);
-			})
-			.catch(function (...args: any[]) {
-				return Array.prototype.slice.call(args);
-			})
-	);
-}
 
 @defineUI5Class("sap.fe.core.AppStateHandler")
 class AppStateHandler extends BaseObject {
@@ -28,7 +18,7 @@ class AppStateHandler extends BaseObject {
 	constructor(oAppComponent: any) {
 		super();
 		this.oAppComponent = oAppComponent;
-		this.sId = oAppComponent.getId() + "/AppStateHandler";
+		this.sId = `${oAppComponent.getId()}/AppStateHandler`;
 
 		this.bNoRouteChange = false;
 		Log.info("APPSTATE : Appstate handler initialized");
@@ -39,12 +29,12 @@ class AppStateHandler extends BaseObject {
 	/**
 	 * Creates/updates the appstate.
 	 *
-	 * @returns {Promise} A promise resolving the stored data
+	 * @returns A promise resolving the stored data
 	 * @ui5-restricted
 	 */
-	createAppState() {
+	async createAppState(): Promise<void | any> {
 		if (!this.oAppComponent.getEnvironmentCapabilities().getCapabilities().AppState || BusyLocker.isLocked(this)) {
-			return Promise.resolve();
+			return;
 		}
 
 		const oNavigationService = this.oAppComponent.getNavigationService(),
@@ -54,25 +44,28 @@ class AppStateHandler extends BaseObject {
 			bIsStickyMode = ModelHelper.isStickySessionSupported(this.oAppComponent.getMetaModel());
 
 		if (!oController.viewState) {
-			return Promise.reject("viewState controller extension not available for controller: " + oController.getMetadata().getName());
+			throw new Error(`viewState controller extension not available for controller: ${oController.getMetadata().getName()}`);
 		}
 
-		return oController.viewState.retrieveViewState().then((mInnerAppState: any) => {
-			const oStoreData = { appState: mInnerAppState };
-			if (mInnerAppState && !deepEqual(this._mCurrentAppState, mInnerAppState)) {
-				this._mCurrentAppState = mInnerAppState;
-				const oAppState = oNavigationService.storeInnerAppStateWithImmediateReturn(oStoreData, true);
+		const mInnerAppState = await oController.viewState.retrieveViewState();
+		const oStoreData = { appState: mInnerAppState };
+		if (mInnerAppState && !deepEqual(this._mCurrentAppState, mInnerAppState)) {
+			this._mCurrentAppState = mInnerAppState;
+			try {
+				const sAppStateKey = await oNavigationService.storeInnerAppState(oStoreData, true, true);
 				Log.info("APPSTATE: Appstate stored");
-				const sAppStateKey = oAppState.appStateKey;
 				const sNewHash = oNavigationService.replaceInnerAppStateKey(sHash, sAppStateKey);
 				if (sNewHash !== sHash) {
 					oRouterProxy.navToHash(sNewHash, null, null, null, !bIsStickyMode);
 					this.bNoRouteChange = true;
 				}
 				Log.info("APPSTATE: navToHash");
+			} catch (oError: any) {
+				Log.error(oError);
 			}
-			return oStoreData;
-		});
+		}
+
+		return oStoreData;
 	}
 
 	_createNavigationParameters(oAppData: any, sNavType: any) {
@@ -90,10 +83,10 @@ class AppStateHandler extends BaseObject {
 	 * @function
 	 * @static
 	 * @memberof sap.fe.core.AppStateHandler
-	 * @returns {Promise} A promise for async handling
+	 * @returns A promise for async handling
 	 * @private
 	 * @ui5-restricted
-	 **/
+	 */
 	applyAppState() {
 		if (!this.oAppComponent.getEnvironmentCapabilities().getCapabilities().AppState || BusyLocker.isLocked(this)) {
 			return Promise.resolve();
@@ -104,7 +97,7 @@ class AppStateHandler extends BaseObject {
 
 		const oNavigationService = this.oAppComponent.getNavigationService();
 		// TODO oNavigationService.parseNavigation() should return ES6 promise instead jQuery.promise
-		return _toES6Promise(oNavigationService.parseNavigation())
+		return toES6Promise(oNavigationService.parseNavigation())
 			.catch(function (aErrorData: any) {
 				if (!aErrorData) {
 					aErrorData = [];
@@ -129,15 +122,17 @@ class AppStateHandler extends BaseObject {
 				this._mCurrentAppState = sNavType === NavType.iAppState ? oAppData && oAppData.appState : undefined;
 
 				if (!oRootController.viewState) {
-					throw new Error("viewState extension required for controller " + oRootController.getMetadata().getName());
+					throw new Error(`viewState extension required for controller ${oRootController.getMetadata().getName()}`);
 				}
 
-				return oRootController.viewState
-					.applyViewState(this._mCurrentAppState, this._createNavigationParameters(oAppData, sNavType))
-					.catch(function (oError: any) {
-						Log.error("appState could not be applied", oError);
-						throw oError;
-					});
+				return oRootController.viewState.applyViewState(
+					this._mCurrentAppState,
+					this._createNavigationParameters(oAppData, sNavType)
+				);
+			})
+			.catch(function (oError: any) {
+				Log.error("appState could not be applied", oError);
+				throw oError;
 			})
 			.finally(() => {
 				BusyLocker.unlock(this);
@@ -147,14 +142,14 @@ class AppStateHandler extends BaseObject {
 	/**
 	 * To check is route is changed by change in the iAPPState.
 	 *
-	 * @returns {boolean}
-	 **/
+	 * @returns `true` if the route has chnaged
+	 */
 	checkIfRouteChangedByIApp() {
 		return this.bNoRouteChange;
 	}
 	/**
 	 * Reset the route changed by iAPPState.
-	 **/
+	 */
 	resetRouteChangedByIApp() {
 		if (this.bNoRouteChange) {
 			this.bNoRouteChange = false;

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

@@ -2,13 +2,13 @@
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/ui/core/mvc/Controller", "sap/fe/core/CommonUtils", "sap/fe/core/helpers/ClassSupport"], function (Controller, CommonUtils, ClassSupport) {
+sap.ui.define(["sap/fe/core/CommonUtils", "sap/fe/core/helpers/ClassSupport", "sap/ui/core/mvc/Controller"], function (CommonUtils, ClassSupport, Controller) {
   "use strict";
 
   var _dec, _dec2, _class, _class2;
 
-  var defineUI5Class = ClassSupport.defineUI5Class;
   var publicExtension = ClassSupport.publicExtension;
+  var defineUI5Class = ClassSupport.defineUI5Class;
 
   function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
 
@@ -38,7 +38,7 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "sap/fe/core/CommonUtils", "sap/fe/
     /**
      * Returns the current app component.
      *
-     * @returns {sap.fe.core.AppComponent} The app component or, if not found, null
+     * @returns The app component or, if not found, null
      * @alias sap.fe.core.BaseController#getAppComponent
      * @public
      * @since 1.91.0
@@ -52,9 +52,10 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "sap/fe/core/CommonUtils", "sap/fe/
     }
     /**
      * Convenience method provided by SAP Fiori elements to enable applications to include the view model by name into each controller.
+     *
      * @public
-     * @param {string} sName The model name
-     * @returns {sap.ui.model.Model} The model instance
+     * @param sName The model name
+     * @returns The model instance
      */
     ;
 
@@ -63,10 +64,11 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "sap/fe/core/CommonUtils", "sap/fe/
     }
     /**
      * Convenience method for setting the view model in every controller of the application.
+     *
      * @public
-     * @param {sap.ui.model.Model} oModel The model instance
-     * @param {string} sName The model name
-     * @returns {sap.ui.mvc.View} The view instance
+     * @param oModel The model instance
+     * @param sName The model name
+     * @returns The view instance
      */
     ;
 
@@ -86,4 +88,4 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "sap/fe/core/CommonUtils", "sap/fe/
   }(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,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkJhc2VDb250cm9sbGVyLnRzIl0sIm5hbWVzIjpbIkJhc2VDb250cm9sbGVyIiwiZGVmaW5lVUk1Q2xhc3MiLCJwdWJsaWNFeHRlbnNpb24iLCJnZXRBcHBDb21wb25lbnQiLCJfb0FwcENvbXBvbmVudCIsIkNvbW1vblV0aWxzIiwiZ2V0VmlldyIsImdldE1vZGVsIiwic05hbWUiLCJzZXRNb2RlbCIsIm9Nb2RlbCIsImdldFJlc291cmNlQnVuZGxlIiwic0kxOG5Nb2RlbE5hbWUiLCJDb250cm9sbGVyIl0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7Ozs7Ozs7Ozs7Ozs7QUFNQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtNQUVNQSxjLFdBRExDLGNBQWMsQ0FBQyw0QkFBRCxDLFVBV2JDLGVBQWUsRTs7Ozs7Ozs7O0FBUmhCO0FBQ0Q7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7V0FFQ0MsZSxHQURBLDJCQUNnQztBQUMvQixVQUFJLENBQUMsS0FBS0MsY0FBVixFQUEwQjtBQUN6QixhQUFLQSxjQUFMLEdBQXNCQyxXQUFXLENBQUNGLGVBQVosQ0FBNEIsS0FBS0csT0FBTCxFQUE1QixDQUF0QjtBQUNBOztBQUNELGFBQU8sS0FBS0YsY0FBWjtBQUNBO0FBRUQ7QUFDRDtBQUNBO0FBQ0E7QUFDQTtBQUNBOzs7V0FDQ0csUSxHQUFBLGtCQUFTQyxLQUFULEVBQXlCO0FBQ3hCLGFBQU8sS0FBS0YsT0FBTCxHQUFlQyxRQUFmLENBQXdCQyxLQUF4QixDQUFQO0FBQ0E7QUFFRDtBQUNEO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTs7O1dBQ0NDLFEsR0FBQSxrQkFBU0MsTUFBVCxFQUF3QkYsS0FBeEIsRUFBNkM7QUFDNUMsYUFBTyxLQUFLRixPQUFMLEdBQWVHLFFBQWYsQ0FBd0JDLE1BQXhCLEVBQWdDRixLQUFoQyxDQUFQO0FBQ0EsSzs7V0FFREcsaUIsR0FBQSwyQkFBa0JDLGNBQWxCLEVBQXVDO0FBQ3RDLFVBQUksQ0FBQ0EsY0FBTCxFQUFxQjtBQUNwQkEsUUFBQUEsY0FBYyxHQUFHLE1BQWpCO0FBQ0E7O0FBQ0QsYUFBUSxLQUFLVCxlQUFMLEdBQXVCSSxRQUF2QixDQUFnQ0ssY0FBaEMsQ0FBRCxDQUFtRUQsaUJBQW5FLEVBQVA7QUFDQSxLOzs7SUE1QzJCRSxVO1NBK0NkYixjIiwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgQ29udHJvbGxlciBmcm9tIFwic2FwL3VpL2NvcmUvbXZjL0NvbnRyb2xsZXJcIjtcbmltcG9ydCBDb21tb25VdGlscyBmcm9tIFwic2FwL2ZlL2NvcmUvQ29tbW9uVXRpbHNcIjtcbmltcG9ydCB7IHB1YmxpY0V4dGVuc2lvbiwgZGVmaW5lVUk1Q2xhc3MgfSBmcm9tIFwic2FwL2ZlL2NvcmUvaGVscGVycy9DbGFzc1N1cHBvcnRcIjtcbmltcG9ydCBBcHBDb21wb25lbnQgZnJvbSBcInNhcC9mZS9jb3JlL0FwcENvbXBvbmVudFwiO1xuaW1wb3J0IFJlc291cmNlTW9kZWwgZnJvbSBcInNhcC91aS9tb2RlbC9yZXNvdXJjZS9SZXNvdXJjZU1vZGVsXCI7XG5pbXBvcnQgVmlldyBmcm9tIFwic2FwL3VpL2NvcmUvbXZjL1ZpZXdcIjtcbmltcG9ydCBNb2RlbCBmcm9tIFwic2FwL3VpL21vZGVsL01vZGVsXCI7XG5cbi8qKlxuICogSW50ZXJuYWwgYmFzZSBjb250cm9sbGVyIGNsYXNzIGZvciBTQVAgRmlvcmkgZWxlbWVudHMgYXBwbGljYXRpb24uXG4gKlxuICogSWYgeW91IHdhbnQgdG8gZXh0ZW5kIGEgYmFzZSBjb250cm9sbGVyIGZvciB5b3VyIGN1c3RvbSBwYWdlLCBwbGVhc2UgdXNlIGZvciBzYXAuZmUuY29yZS5QYWdlQ29udHJvbGxlci5cbiAqXG4gKiBAaGlkZWNvbnN0cnVjdG9yXG4gKiBAcHVibGljXG4gKiBAbmFtZSBzYXAuZmUuY29yZS5CYXNlQ29udHJvbGxlclxuICogQHNpbmNlIDEuOTAuMFxuICovXG5AZGVmaW5lVUk1Q2xhc3MoXCJzYXAuZmUuY29yZS5CYXNlQ29udHJvbGxlclwiKVxuY2xhc3MgQmFzZUNvbnRyb2xsZXIgZXh0ZW5kcyBDb250cm9sbGVyIHtcblx0cHJpdmF0ZSBfb0FwcENvbXBvbmVudD86IEFwcENvbXBvbmVudDtcblx0LyoqXG5cdCAqIFJldHVybnMgdGhlIGN1cnJlbnQgYXBwIGNvbXBvbmVudC5cblx0ICpcblx0ICogQHJldHVybnMge3NhcC5mZS5jb3JlLkFwcENvbXBvbmVudH0gVGhlIGFwcCBjb21wb25lbnQgb3IsIGlmIG5vdCBmb3VuZCwgbnVsbFxuXHQgKiBAYWxpYXMgc2FwLmZlLmNvcmUuQmFzZUNvbnRyb2xsZXIjZ2V0QXBwQ29tcG9uZW50XG5cdCAqIEBwdWJsaWNcblx0ICogQHNpbmNlIDEuOTEuMFxuXHQgKi9cblx0QHB1YmxpY0V4dGVuc2lvbigpXG5cdGdldEFwcENvbXBvbmVudCgpOiBBcHBDb21wb25lbnQge1xuXHRcdGlmICghdGhpcy5fb0FwcENvbXBvbmVudCkge1xuXHRcdFx0dGhpcy5fb0FwcENvbXBvbmVudCA9IENvbW1vblV0aWxzLmdldEFwcENvbXBvbmVudCh0aGlzLmdldFZpZXcoKSk7XG5cdFx0fVxuXHRcdHJldHVybiB0aGlzLl9vQXBwQ29tcG9uZW50IGFzIEFwcENvbXBvbmVudDtcblx0fVxuXG5cdC8qKlxuXHQgKiBDb252ZW5pZW5jZSBtZXRob2QgcHJvdmlkZWQgYnkgU0FQIEZpb3JpIGVsZW1lbnRzIHRvIGVuYWJsZSBhcHBsaWNhdGlvbnMgdG8gaW5jbHVkZSB0aGUgdmlldyBtb2RlbCBieSBuYW1lIGludG8gZWFjaCBjb250cm9sbGVyLlxuXHQgKiBAcHVibGljXG5cdCAqIEBwYXJhbSB7c3RyaW5nfSBzTmFtZSBUaGUgbW9kZWwgbmFtZVxuXHQgKiBAcmV0dXJucyB7c2FwLnVpLm1vZGVsLk1vZGVsfSBUaGUgbW9kZWwgaW5zdGFuY2Vcblx0ICovXG5cdGdldE1vZGVsKHNOYW1lPzogc3RyaW5nKSB7XG5cdFx0cmV0dXJuIHRoaXMuZ2V0VmlldygpLmdldE1vZGVsKHNOYW1lKTtcblx0fVxuXG5cdC8qKlxuXHQgKiBDb252ZW5pZW5jZSBtZXRob2QgZm9yIHNldHRpbmcgdGhlIHZpZXcgbW9kZWwgaW4gZXZlcnkgY29udHJvbGxlciBvZiB0aGUgYXBwbGljYXRpb24uXG5cdCAqIEBwdWJsaWNcblx0ICogQHBhcmFtIHtzYXAudWkubW9kZWwuTW9kZWx9IG9Nb2RlbCBUaGUgbW9kZWwgaW5zdGFuY2Vcblx0ICogQHBhcmFtIHtzdHJpbmd9IHNOYW1lIFRoZSBtb2RlbCBuYW1lXG5cdCAqIEByZXR1cm5zIHtzYXAudWkubXZjLlZpZXd9IFRoZSB2aWV3IGluc3RhbmNlXG5cdCAqL1xuXHRzZXRNb2RlbChvTW9kZWw6IE1vZGVsLCBzTmFtZTogc3RyaW5nKTogVmlldyB7XG5cdFx0cmV0dXJuIHRoaXMuZ2V0VmlldygpLnNldE1vZGVsKG9Nb2RlbCwgc05hbWUpO1xuXHR9XG5cblx0Z2V0UmVzb3VyY2VCdW5kbGUoc0kxOG5Nb2RlbE5hbWU6IGFueSkge1xuXHRcdGlmICghc0kxOG5Nb2RlbE5hbWUpIHtcblx0XHRcdHNJMThuTW9kZWxOYW1lID0gXCJpMThuXCI7XG5cdFx0fVxuXHRcdHJldHVybiAodGhpcy5nZXRBcHBDb21wb25lbnQoKS5nZXRNb2RlbChzSTE4bk1vZGVsTmFtZSkgYXMgUmVzb3VyY2VNb2RlbCkuZ2V0UmVzb3VyY2VCdW5kbGUoKTtcblx0fVxufVxuXG5leHBvcnQgZGVmYXVsdCBCYXNlQ29udHJvbGxlcjtcbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkJhc2VDb250cm9sbGVyLnRzIl0sIm5hbWVzIjpbIkJhc2VDb250cm9sbGVyIiwiZGVmaW5lVUk1Q2xhc3MiLCJwdWJsaWNFeHRlbnNpb24iLCJnZXRBcHBDb21wb25lbnQiLCJfb0FwcENvbXBvbmVudCIsIkNvbW1vblV0aWxzIiwiZ2V0VmlldyIsImdldE1vZGVsIiwic05hbWUiLCJzZXRNb2RlbCIsIm9Nb2RlbCIsImdldFJlc291cmNlQnVuZGxlIiwic0kxOG5Nb2RlbE5hbWUiLCJDb250cm9sbGVyIl0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7Ozs7Ozs7Ozs7Ozs7QUFNQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtNQUVNQSxjLFdBRExDLGNBQWMsQ0FBQyw0QkFBRCxDLFVBV2JDLGVBQWUsRTs7Ozs7Ozs7O0FBUmhCO0FBQ0Q7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7V0FFQ0MsZSxHQURBLDJCQUNnQztBQUMvQixVQUFJLENBQUMsS0FBS0MsY0FBVixFQUEwQjtBQUN6QixhQUFLQSxjQUFMLEdBQXNCQyxXQUFXLENBQUNGLGVBQVosQ0FBNEIsS0FBS0csT0FBTCxFQUE1QixDQUF0QjtBQUNBOztBQUNELGFBQU8sS0FBS0YsY0FBWjtBQUNBO0FBRUQ7QUFDRDtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7OztXQUNDRyxRLEdBQUEsa0JBQVNDLEtBQVQsRUFBeUI7QUFDeEIsYUFBTyxLQUFLRixPQUFMLEdBQWVDLFFBQWYsQ0FBd0JDLEtBQXhCLENBQVA7QUFDQTtBQUVEO0FBQ0Q7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7OztXQUNDQyxRLEdBQUEsa0JBQVNDLE1BQVQsRUFBd0JGLEtBQXhCLEVBQTZDO0FBQzVDLGFBQU8sS0FBS0YsT0FBTCxHQUFlRyxRQUFmLENBQXdCQyxNQUF4QixFQUFnQ0YsS0FBaEMsQ0FBUDtBQUNBLEs7O1dBRURHLGlCLEdBQUEsMkJBQWtCQyxjQUFsQixFQUF1QztBQUN0QyxVQUFJLENBQUNBLGNBQUwsRUFBcUI7QUFDcEJBLFFBQUFBLGNBQWMsR0FBRyxNQUFqQjtBQUNBOztBQUNELGFBQVEsS0FBS1QsZUFBTCxHQUF1QkksUUFBdkIsQ0FBZ0NLLGNBQWhDLENBQUQsQ0FBbUVELGlCQUFuRSxFQUFQO0FBQ0EsSzs7O0lBOUMyQkUsVTtTQWlEZGIsYyIsInNvdXJjZVJvb3QiOiIuIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHR5cGUgQXBwQ29tcG9uZW50IGZyb20gXCJzYXAvZmUvY29yZS9BcHBDb21wb25lbnRcIjtcbmltcG9ydCBDb21tb25VdGlscyBmcm9tIFwic2FwL2ZlL2NvcmUvQ29tbW9uVXRpbHNcIjtcbmltcG9ydCB7IGRlZmluZVVJNUNsYXNzLCBwdWJsaWNFeHRlbnNpb24gfSBmcm9tIFwic2FwL2ZlL2NvcmUvaGVscGVycy9DbGFzc1N1cHBvcnRcIjtcbmltcG9ydCBDb250cm9sbGVyIGZyb20gXCJzYXAvdWkvY29yZS9tdmMvQ29udHJvbGxlclwiO1xuaW1wb3J0IHR5cGUgVmlldyBmcm9tIFwic2FwL3VpL2NvcmUvbXZjL1ZpZXdcIjtcbmltcG9ydCB0eXBlIE1vZGVsIGZyb20gXCJzYXAvdWkvbW9kZWwvTW9kZWxcIjtcbmltcG9ydCB0eXBlIFJlc291cmNlTW9kZWwgZnJvbSBcInNhcC91aS9tb2RlbC9yZXNvdXJjZS9SZXNvdXJjZU1vZGVsXCI7XG5cbi8qKlxuICogSW50ZXJuYWwgYmFzZSBjb250cm9sbGVyIGNsYXNzIGZvciBTQVAgRmlvcmkgZWxlbWVudHMgYXBwbGljYXRpb24uXG4gKlxuICogSWYgeW91IHdhbnQgdG8gZXh0ZW5kIGEgYmFzZSBjb250cm9sbGVyIGZvciB5b3VyIGN1c3RvbSBwYWdlLCBwbGVhc2UgdXNlIGZvciBzYXAuZmUuY29yZS5QYWdlQ29udHJvbGxlci5cbiAqXG4gKiBAaGlkZWNvbnN0cnVjdG9yXG4gKiBAcHVibGljXG4gKiBAbmFtZSBzYXAuZmUuY29yZS5CYXNlQ29udHJvbGxlclxuICogQHNpbmNlIDEuOTAuMFxuICovXG5AZGVmaW5lVUk1Q2xhc3MoXCJzYXAuZmUuY29yZS5CYXNlQ29udHJvbGxlclwiKVxuY2xhc3MgQmFzZUNvbnRyb2xsZXIgZXh0ZW5kcyBDb250cm9sbGVyIHtcblx0cHJpdmF0ZSBfb0FwcENvbXBvbmVudD86IEFwcENvbXBvbmVudDtcblx0LyoqXG5cdCAqIFJldHVybnMgdGhlIGN1cnJlbnQgYXBwIGNvbXBvbmVudC5cblx0ICpcblx0ICogQHJldHVybnMgVGhlIGFwcCBjb21wb25lbnQgb3IsIGlmIG5vdCBmb3VuZCwgbnVsbFxuXHQgKiBAYWxpYXMgc2FwLmZlLmNvcmUuQmFzZUNvbnRyb2xsZXIjZ2V0QXBwQ29tcG9uZW50XG5cdCAqIEBwdWJsaWNcblx0ICogQHNpbmNlIDEuOTEuMFxuXHQgKi9cblx0QHB1YmxpY0V4dGVuc2lvbigpXG5cdGdldEFwcENvbXBvbmVudCgpOiBBcHBDb21wb25lbnQge1xuXHRcdGlmICghdGhpcy5fb0FwcENvbXBvbmVudCkge1xuXHRcdFx0dGhpcy5fb0FwcENvbXBvbmVudCA9IENvbW1vblV0aWxzLmdldEFwcENvbXBvbmVudCh0aGlzLmdldFZpZXcoKSk7XG5cdFx0fVxuXHRcdHJldHVybiB0aGlzLl9vQXBwQ29tcG9uZW50O1xuXHR9XG5cblx0LyoqXG5cdCAqIENvbnZlbmllbmNlIG1ldGhvZCBwcm92aWRlZCBieSBTQVAgRmlvcmkgZWxlbWVudHMgdG8gZW5hYmxlIGFwcGxpY2F0aW9ucyB0byBpbmNsdWRlIHRoZSB2aWV3IG1vZGVsIGJ5IG5hbWUgaW50byBlYWNoIGNvbnRyb2xsZXIuXG5cdCAqXG5cdCAqIEBwdWJsaWNcblx0ICogQHBhcmFtIHNOYW1lIFRoZSBtb2RlbCBuYW1lXG5cdCAqIEByZXR1cm5zIFRoZSBtb2RlbCBpbnN0YW5jZVxuXHQgKi9cblx0Z2V0TW9kZWwoc05hbWU/OiBzdHJpbmcpIHtcblx0XHRyZXR1cm4gdGhpcy5nZXRWaWV3KCkuZ2V0TW9kZWwoc05hbWUpO1xuXHR9XG5cblx0LyoqXG5cdCAqIENvbnZlbmllbmNlIG1ldGhvZCBmb3Igc2V0dGluZyB0aGUgdmlldyBtb2RlbCBpbiBldmVyeSBjb250cm9sbGVyIG9mIHRoZSBhcHBsaWNhdGlvbi5cblx0ICpcblx0ICogQHB1YmxpY1xuXHQgKiBAcGFyYW0gb01vZGVsIFRoZSBtb2RlbCBpbnN0YW5jZVxuXHQgKiBAcGFyYW0gc05hbWUgVGhlIG1vZGVsIG5hbWVcblx0ICogQHJldHVybnMgVGhlIHZpZXcgaW5zdGFuY2Vcblx0ICovXG5cdHNldE1vZGVsKG9Nb2RlbDogTW9kZWwsIHNOYW1lOiBzdHJpbmcpOiBWaWV3IHtcblx0XHRyZXR1cm4gdGhpcy5nZXRWaWV3KCkuc2V0TW9kZWwob01vZGVsLCBzTmFtZSk7XG5cdH1cblxuXHRnZXRSZXNvdXJjZUJ1bmRsZShzSTE4bk1vZGVsTmFtZTogYW55KSB7XG5cdFx0aWYgKCFzSTE4bk1vZGVsTmFtZSkge1xuXHRcdFx0c0kxOG5Nb2RlbE5hbWUgPSBcImkxOG5cIjtcblx0XHR9XG5cdFx0cmV0dXJuICh0aGlzLmdldEFwcENvbXBvbmVudCgpLmdldE1vZGVsKHNJMThuTW9kZWxOYW1lKSBhcyBSZXNvdXJjZU1vZGVsKS5nZXRSZXNvdXJjZUJ1bmRsZSgpO1xuXHR9XG59XG5cbmV4cG9ydCBkZWZhdWx0IEJhc2VDb250cm9sbGVyO1xuIl19

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

@@ -1,10 +1,10 @@
-import Controller from "sap/ui/core/mvc/Controller";
+import type AppComponent from "sap/fe/core/AppComponent";
 import CommonUtils from "sap/fe/core/CommonUtils";
-import { publicExtension, defineUI5Class } from "sap/fe/core/helpers/ClassSupport";
-import AppComponent from "sap/fe/core/AppComponent";
-import ResourceModel from "sap/ui/model/resource/ResourceModel";
-import View from "sap/ui/core/mvc/View";
-import Model from "sap/ui/model/Model";
+import { defineUI5Class, publicExtension } from "sap/fe/core/helpers/ClassSupport";
+import Controller from "sap/ui/core/mvc/Controller";
+import type View from "sap/ui/core/mvc/View";
+import type Model from "sap/ui/model/Model";
+import type ResourceModel from "sap/ui/model/resource/ResourceModel";
 
 /**
  * Internal base controller class for SAP Fiori elements application.
@@ -22,7 +22,7 @@ class BaseController extends Controller {
 	/**
 	 * Returns the current app component.
 	 *
-	 * @returns {sap.fe.core.AppComponent} The app component or, if not found, null
+	 * @returns The app component or, if not found, null
 	 * @alias sap.fe.core.BaseController#getAppComponent
 	 * @public
 	 * @since 1.91.0
@@ -32,14 +32,15 @@ class BaseController extends Controller {
 		if (!this._oAppComponent) {
 			this._oAppComponent = CommonUtils.getAppComponent(this.getView());
 		}
-		return this._oAppComponent as AppComponent;
+		return this._oAppComponent;
 	}
 
 	/**
 	 * Convenience method provided by SAP Fiori elements to enable applications to include the view model by name into each controller.
+	 *
 	 * @public
-	 * @param {string} sName The model name
-	 * @returns {sap.ui.model.Model} The model instance
+	 * @param sName The model name
+	 * @returns The model instance
 	 */
 	getModel(sName?: string) {
 		return this.getView().getModel(sName);
@@ -47,10 +48,11 @@ class BaseController extends Controller {
 
 	/**
 	 * Convenience method for setting the view model in every controller of the application.
+	 *
 	 * @public
-	 * @param {sap.ui.model.Model} oModel The model instance
-	 * @param {string} sName The model name
-	 * @returns {sap.ui.mvc.View} The view instance
+	 * @param oModel The model instance
+	 * @param sName The model name
+	 * @returns The view instance
 	 */
 	setModel(oModel: Model, sName: string): View {
 		return this.getView().setModel(oModel, sName);