@sapui5/sap.fe.core 1.97.0 → 1.100.0

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

@@ -0,0 +1,313 @@
+import Service from "sap/ui/core/service/Service";
+import ServiceFactory from "sap/ui/core/service/ServiceFactory";
+import { ServiceContext } from "sap/ui/core/service";
+import { NavigationHandler } from "sap/fe/navigation";
+import SelectionVariant from "sap/fe/navigation/SelectionVariant";
+
+type NavigationServiceSettings = {};
+export class NavigationService extends Service<NavigationServiceSettings> {
+	initPromise!: Promise<any>;
+	oNavHandler!: NavigationHandler;
+	init() {
+		const oContext = this.getContext(),
+			oComponent = oContext && oContext.scopeObject;
+
+		this.oNavHandler = new NavigationHandler(oComponent);
+		this.oNavHandler.setModel(oComponent.getModel());
+		this.initPromise = Promise.resolve(this);
+	}
+	exit() {
+		this.oNavHandler.destroy();
+	}
+
+	/**
+	 * Triggers a cross-app navigation after saving the inner and the cross-app states.
+	 * @private
+	 * @ui5-restricted
+	 * @param {string} sSemanticObject Semantic object of the target app
+	 * @param {string} sActionName Action of the target app
+	 * @param {object | string } [vNavigationParameters] Navigation parameters as an object with key/value pairs or as a string representation of
+	 *        such an object. If passed as an object, the properties are not checked against the <code>IsPotentialSensitive</code> or
+	 *        <code>Measure</code> type.
+	 * @param {object} [oInnerAppData] Object for storing current state of the app
+	 * @param {Function} [fnOnError] Callback that is called if an error occurs during navigation <br>
+	 * @param {object} [oExternalAppData] Object for storing the state which will be forwarded to the target component.
+	 * @param {string} [sNavMode] Argument is used to overwrite the FLP-configured target for opening a URL. If used, only the
+	 *        <code>explace</code> or <code>inplace</code> values are allowed. Any other value will lead to an exception
+	 *        <code>NavigationHandler.INVALID_NAV_MODE</code>.
+	 **/
+	navigate(
+		sSemanticObject: string,
+		sActionName: string,
+		vNavigationParameters?: string | object,
+		oInnerAppData?: object,
+		fnOnError?: Function,
+		oExternalAppData?: object,
+		sNavMode?: string
+	) {
+		// TODO: Navigation Handler does not handle navigation without a context
+		// but in v4 DataFieldForIBN with requiresContext false can trigger a navigation without any context
+		// This should be handled
+		this.oNavHandler.navigate(
+			sSemanticObject,
+			sActionName,
+			vNavigationParameters,
+			oInnerAppData,
+			fnOnError,
+			oExternalAppData,
+			sNavMode
+		);
+	}
+	/**
+	 * Parses the incoming URL and returns a Promise.
+	 * @returns {object} A Promise object which returns the
+	 * extracted app state, the startup parameters, and the type of navigation when execution is successful,
+	 * @private
+	 * @ui5-restricted
+	 **/
+	parseNavigation() {
+		return this.oNavHandler.parseNavigation();
+	}
+	/**
+	 * Processes navigation-related tasks related to beforePopoverOpens event handling for the SmartLink control and returns a Promise object.
+	 *
+	 * @param {object} oTableEventParameters The parameters made available by the SmartTable control when the SmartLink control has been clicked,
+	 *        an instance of a PopOver object
+	 * @param {string} sSelectionVariant Stringified JSON object as returned, for example, from getDataSuiteFormat() of the SmartFilterBar control
+	 * @param {object} [mInnerAppData] Object containing the current state of the app. If provided, opening the Popover is deferred until the
+	 *        inner app data is saved in a consistent way.
+	 * @returns {Promise} A Promise object to monitor when all actions of the function have been executed; if the execution is successful, the
+	 *          modified oTableEventParameters is returned; if an error occurs, an error object of type
+	 *          {@link sap.fe.navigation.NavError} is returned
+	 * @private
+	 */
+	_processBeforeSmartLinkPopoverOpens(oTableEventParameters: object, sSelectionVariant: string, mInnerAppData: object | undefined) {
+		return this.oNavHandler.processBeforeSmartLinkPopoverOpens(oTableEventParameters, sSelectionVariant, mInnerAppData);
+	}
+
+	/**
+	 * Processes selectionVariant string and returns a Promise object (semanticAttributes and AppStateKey).
+	 * @param {string} sSelectionVariant Stringified JSON object
+	 * @returns {object} A Promise object to monitor when all actions of the function have been executed; if the execution is successful, the
+	 *          semanticAttributes as well as the appStateKey are returned; if an error occurs, an error object of type
+	 *          {@link sap.fe.navigation.NavError} is returned
+	 * <br>
+	 * @example <code>
+	 *
+	 * 		var oSelectionVariant = new sap.fe.navigation.SelectionVariant();
+	 * 		oSelectionVariant.addSelectOption("CompanyCode", "I", "EQ", "0001");
+	 * 		oSelectionVariant.addSelectOption("Customer", "I", "EQ", "C0001");
+	 * 		var sSelectionVariant= oSelectionVariant.toJSONString();
+	 *
+	 * 		var oNavigationHandler = new sap.fe.navigation.NavigationHandler(oController);
+	 * 		var oPromiseObject = oNavigationHandler._getAppStateKeyAndUrlParameters(sSelectionVariant);
+	 *
+	 * 		oPromiseObject.done(function(oSemanticAttributes, sAppStateKey){
+	 * 			// here you can add coding that should run after all app state and the semantic attributes have been returned.
+	 * 		});
+	 *
+	 * 		oPromiseObject.fail(function(oError){
+	 * 			//some error handling
+	 * 		});
+	 *
+	 * </code>
+	 * @private
+	 * @ui5-restricted
+	 */
+	getAppStateKeyAndUrlParameters(sSelectionVariant: string) {
+		return this.oNavHandler._getAppStateKeyAndUrlParameters(sSelectionVariant);
+	}
+
+	/**
+	 * Gets the application specific technical parameters.
+	 * @returns {Array} Containing the technical parameters.
+	 * @private
+	 * @ui5-restricted
+	 */
+	getTechnicalParameters() {
+		return this.oNavHandler.getTechnicalParameters();
+	}
+	/**
+	 * Sets the application specific technical parameters. Technical parameters will not be added to the selection variant passed to the
+	 * application.
+	 * As a default sap-system, sap-ushell-defaultedParameterNames and hcpApplicationId are considered as technical parameters.
+	 * @param {Array} aTechnicalParameters List of parameter names to be considered as technical parameters. <code>null</code> or
+	 *        <code>undefined</code> may be used to reset the complete list.
+	 * @private
+	 * @ui5-restricted
+	 */
+	setTechnicalParameters(aTechnicalParameters: any[]) {
+		this.oNavHandler.setTechnicalParameters(aTechnicalParameters);
+	}
+	/**
+	 * Sets the model that is used for verification of sensitive information. If the model is not set, the unnamed component model is used for the
+	 * verification of sensitive information.
+	 * @private
+	 * @ui5-restricted
+	 * @param {sap.ui.model.odata.v2.ODataModel} oModel Model For checking sensitive information
+	 */
+	setModel(oModel: any) {
+		this.oNavHandler.setModel(oModel);
+	}
+	/**
+	 * Changes the URL according to the current app state and stores the app state for later retrieval.
+	 * @private
+	 * @ui5-restricted
+	 * @param {object} mInnerAppData Object containing the current state of the app
+	 * @returns {object} A Promise object to monitor when all the actions of the function have been executed; if the execution is successful, the
+	 *          app state key is returned; if an error occurs, an object of type {@link sap.fe.navigation.NavError} is
+	 *          returned
+	 **/
+	storeInnerAppState(mInnerAppData: object) {
+		return this.oNavHandler.storeInnerAppState(mInnerAppData);
+	}
+	/**
+				* Changes the URL according to the current app state and stores the app state for later retrieval.
+				* @private
+				* @ui5-restricted
+				* @param {object} mInnerAppData Object containing the current state of the app
+				* @param {boolean} [bImmediateHashReplace=false] If set to false, the inner app hash will not be replaced until storing is successful; do not
+			 * @param bNotLegacy
+
+			 * @returns {object} An object containing the appStateId and a promise object to monitor when all the actions of the function have been
+				* executed; Please note that the appStateKey may be undefined or empty.
+				*/
+	storeInnerAppStateWithImmediateReturn(mInnerAppData: object, bImmediateHashReplace: boolean | undefined, bNotLegacy: any) {
+		return this.oNavHandler.storeInnerAppStateWithImmediateReturn(mInnerAppData, bImmediateHashReplace, bNotLegacy);
+	}
+	/**
+	 * Changes the URL according to the current sAppStateKey. As an reaction route change event will be triggered.
+	 * @private
+	 * @ui5-restricted
+	 * @param {string} sAppStateKey The new app state key.
+	 */
+	replaceHash(sAppStateKey: string) {
+		this.oNavHandler.replaceHash(sAppStateKey);
+	}
+	replaceInnerAppStateKey(sAppHash: any, sAppStateKey: any) {
+		return this.oNavHandler._replaceInnerAppStateKey(sAppHash, sAppStateKey);
+	}
+	/**
+	 * Get single values from SelectionVariant for url parameters.
+	 *
+	 * @private
+	 * @ui5-restricted
+	 * @param {object | string } [vSelectionVariant]
+	 * @param {object} [vSelectionVariant.oUrlParamaters]
+	 * @returns {pbject}
+	 */
+	getUrlParametersFromSelectionVariant(vSelectionVariant: string | object | undefined) {
+		return this.oNavHandler._getURLParametersFromSelectionVariant(vSelectionVariant);
+	}
+
+	/**
+	 * Save app state and return immediately without waiting for response.
+	 *
+	 * @private
+	 * @ui5-restricted
+	 * @param {object} oInSelectionVariant Instance of sap.fe.navigation.SelectionVariant
+	 * @returns {string} AppState key
+	 */
+	saveAppStateWithImmediateReturn(oInSelectionVariant: SelectionVariant) {
+		if (oInSelectionVariant) {
+			const sSelectionVariant = oInSelectionVariant.toJSONString(), // create an SV for app state in string format
+				oSelectionVariant = JSON.parse(sSelectionVariant), // convert string into JSON to store in AppState
+				oXAppStateObject = {
+					selectionVariant: oSelectionVariant
+				},
+				oReturn = this.oNavHandler._saveAppStateWithImmediateReturn(oXAppStateObject);
+			return oReturn.appStateKey ? oReturn.appStateKey : "";
+		}
+	}
+
+	/**
+	 * Mix Attributes and selectionVariant.
+	 *
+	 * @param {object|Array} vSemanticAttributes Object/(Array of Objects) containing key/value pairs
+	 * @param {string} sSelectionVariant The selection variant in string format as provided by the SmartFilterBar control
+	 * @param {int} [iSuppressionBehavior=sap.fe.navigation.SuppressionBehavior.standard] Indicates whether semantic
+	 *        attributes with special values (see {@link sap.fe.navigation.SuppressionBehavior suppression behavior}) must be
+	 *        suppressed before they are combined with the selection variant; several
+	 *        {@link sap.fe.navigation.SuppressionBehavior suppression behaviors} can be combined with the bitwise OR operator
+	 *        (|)
+	 * @returns {object} Instance of {@link sap.fe.navigation.SelectionVariant}
+	 */
+	mixAttributesAndSelectionVariant(vSemanticAttributes: object | any[], sSelectionVariant: string, iSuppressionBehavior?: number) {
+		return this.oNavHandler.mixAttributesAndSelectionVariant(vSemanticAttributes, sSelectionVariant, iSuppressionBehavior);
+	}
+
+	/**
+	 * The method creates a context url based on provided data. This context url can either be used as.
+	 *
+	 * @param {string} sEntitySetName Used for url determination
+	 * @param [oModel] The ODataModel used for url determination. If omitted, the NavigationHandler model is used.
+	 * @returns {string} The context url for the given entities
+	 */
+	constructContextUrl(sEntitySetName: string, oModel: any) {
+		return this.oNavHandler.constructContextUrl(sEntitySetName, oModel);
+	}
+	getInterface() {
+		return this;
+	}
+}
+function fnGetEmptyObject() {
+	return {};
+}
+
+function fnGetPromise() {
+	return Promise.resolve({});
+}
+
+function fnGetJQueryPromise() {
+	const oMyDeffered = jQuery.Deferred();
+	oMyDeffered.resolve({}, {}, "initial");
+	return oMyDeffered.promise();
+}
+
+function fnGetEmptyString() {
+	return "";
+}
+export class NavigationServicesMock {
+	initPromise: Promise<any>;
+	constructor() {
+		this.initPromise = Promise.resolve(this);
+	}
+
+	getInterface() {
+		return this;
+	}
+
+	// return empty object
+	createEmptyAppState = fnGetEmptyObject;
+	storeInnerAppStateWithImmediateReturn = fnGetEmptyObject;
+	mixAttributesAndSelectionVariant = fnGetEmptyObject;
+
+	// return promise
+	getAppState = fnGetPromise;
+	getStartupAppState = fnGetPromise;
+	parseNavigation = fnGetJQueryPromise;
+
+	// return empty string
+	constructContextUrl = fnGetEmptyString;
+
+	replaceInnerAppStateKey(sAppHash: any) {
+		return sAppHash ? sAppHash : "";
+	}
+
+	navigate() {
+		// Don't do anything
+	}
+}
+
+class NavigationServiceFactory extends ServiceFactory<NavigationServiceSettings> {
+	createInstance(oServiceContext: ServiceContext<NavigationServiceSettings>) {
+		const oNavigationService =
+			sap.ushell && sap.ushell.Container ? new NavigationService(oServiceContext) : new NavigationServicesMock();
+		// Wait For init
+		return oNavigationService.initPromise.then(function(oService: any) {
+			return oService;
+		});
+	}
+}
+
+export default NavigationServiceFactory;

package/src/sap/fe/core/services/ResourceModelServiceFactory.js

@@ -1,83 +1,116 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+ *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define(
-	[
-		"sap/ui/core/service/Service",
-		"sap/ui/core/service/ServiceFactory",
-		"sap/ui/model/resource/ResourceModel",
-		"sap/base/i18n/ResourceBundle"
-	],
-	function(Service, ServiceFactory, ResourceModel, ResourceBundle) {
-		"use strict";
-
-		var ResourceModelService = Service.extend("sap.fe.core.services.ResourceModelService", {
-			initPromise: Promise.resolve(),
-			init: function() {
-				var oContext = this.getContext();
-				var mSettings = oContext.settings;
-				this.oFactory = oContext.factory;
-
-				// When enhancing i18n keys the value in the last resource bundle takes precedence
-				// hence arrange various resource bundles so that enhanceI18n provided by the application is the last.
-				// The following order is used :
-				// 1. sap.fe bundle - sap.fe.core.messagebundle (passed with mSettings.bundles)
-				// 2. sap.fe bundle - sap.fe.templates.messagebundle (passed with mSettings.bundles)
-				// 3. Multiple bundles passed by the application as part of enhanceI18n
-				var aBundles = mSettings.bundles.concat(mSettings.enhanceI18n || []).map(function(vI18n) {
-					// if value passed for enhanceI18n is a Resource Model, return the associated bundle
-					// else the value is a bundleUrl, return Resource Bundle configuration so that a bundle can be created
-					return typeof vI18n.isA === "function" && vI18n.isA("sap.ui.model.resource.ResourceModel")
-						? vI18n.getResourceBundle()
-						: { bundleName: vI18n.replace(/\//g, ".") };
-				});
-
-				this.oResourceModel = new ResourceModel({
-					bundleName: aBundles[0].bundleName,
-					enhanceWith: aBundles.slice(1),
-					async: true
-				});
-
-				if (oContext.scopeType === "component") {
-					var oComponent = oContext.scopeObject;
-					oComponent.setModel(this.oResourceModel, mSettings.modelName);
-				}
-
-				this.initPromise = this.oResourceModel.getResourceBundle().then(
-					function(oBundle) {
-						this.oResourceModel.__bundle = oBundle;
-						return this;
-					}.bind(this)
-				);
-			},
-
-			getResourceModel: function() {
-				return this.oResourceModel;
-			},
-			exit: function() {
-				// Deregister global instance
-				this.oFactory.removeGlobalInstance();
-			}
-		});
-
-		return ServiceFactory.extend("sap.fe.core.services.ResourceModelServiceFactory", {
-			_oInstances: {},
-			createInstance: function(oServiceContext) {
-				var sKey =
-					oServiceContext.settings.bundles.join(",") +
-					(oServiceContext.settings.enhanceI18n ? "," + oServiceContext.settings.enhanceI18n.join(",") : "");
-
-				if (!this._oInstances[sKey]) {
-					this._oInstances[sKey] = new ResourceModelService(Object.assign({ factory: this }, oServiceContext));
-				}
-
-				return this._oInstances[sKey].initPromise;
-			},
-			removeGlobalInstance: function() {
-				this._oInstances = {};
-			}
-		});
-	},
-	true
-);
+sap.ui.define(["sap/ui/core/service/Service", "sap/ui/core/service/ServiceFactory", "sap/ui/model/resource/ResourceModel"], function (Service, ServiceFactory, ResourceModel) {
+  "use strict";
+
+  var _exports = {};
+
+  function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+  function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+  var ResourceModelService = /*#__PURE__*/function (_Service) {
+    _inherits(ResourceModelService, _Service);
+
+    function ResourceModelService() {
+      return _Service.apply(this, arguments) || this;
+    }
+
+    _exports.ResourceModelService = ResourceModelService;
+    var _proto = ResourceModelService.prototype;
+
+    _proto.init = function init() {
+      var _this = this;
+
+      var oContext = this.getContext();
+      var mSettings = oContext.settings;
+      this.oFactory = oContext.factory; // When enhancing i18n keys the value in the last resource bundle takes precedence
+      // hence arrange various resource bundles so that enhanceI18n provided by the application is the last.
+      // The following order is used :
+      // 1. sap.fe bundle - sap.fe.core.messagebundle (passed with mSettings.bundles)
+      // 2. sap.fe bundle - sap.fe.templates.messagebundle (passed with mSettings.bundles)
+      // 3. Multiple bundles passed by the application as part of enhanceI18n
+
+      var aBundles = mSettings.bundles.concat(mSettings.enhanceI18n || []).map(function (vI18n) {
+        // if value passed for enhanceI18n is a Resource Model, return the associated bundle
+        // else the value is a bundleUrl, return Resource Bundle configuration so that a bundle can be created
+        return typeof vI18n.isA === "function" && vI18n.isA("sap.ui.model.resource.ResourceModel") ? vI18n.getResourceBundle() : {
+          bundleName: vI18n.replace(/\//g, ".")
+        };
+      });
+      this.oResourceModel = new ResourceModel({
+        bundleName: aBundles[0].bundleName,
+        enhanceWith: aBundles.slice(1),
+        async: true
+      });
+
+      if (oContext.scopeType === "component") {
+        var oComponent = oContext.scopeObject;
+        oComponent.setModel(this.oResourceModel, mSettings.modelName);
+      }
+
+      this.initPromise = Promise.all([this.oResourceModel.getResourceBundle(), this.oResourceModel._pEnhanced || Promise.resolve()]).then(function (oBundle) {
+        _this.oResourceModel.__bundle = oBundle[0];
+        return _this;
+      });
+    };
+
+    _proto.getResourceModel = function getResourceModel() {
+      return this.oResourceModel;
+    };
+
+    _proto.getInterface = function getInterface() {
+      return this;
+    };
+
+    _proto.exit = function exit() {
+      // Deregister global instance
+      this.oFactory.removeGlobalInstance();
+    };
+
+    return ResourceModelService;
+  }(Service);
+
+  _exports.ResourceModelService = ResourceModelService;
+
+  var ResourceModelServiceFactory = /*#__PURE__*/function (_ServiceFactory) {
+    _inherits(ResourceModelServiceFactory, _ServiceFactory);
+
+    function ResourceModelServiceFactory() {
+      var _this2;
+
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+
+      _this2 = _ServiceFactory.call.apply(_ServiceFactory, [this].concat(args)) || this;
+      _this2._oInstances = {};
+      return _this2;
+    }
+
+    var _proto2 = ResourceModelServiceFactory.prototype;
+
+    _proto2.createInstance = function createInstance(oServiceContext) {
+      var sKey = oServiceContext.settings.bundles.join(",") + (oServiceContext.settings.enhanceI18n ? "," + oServiceContext.settings.enhanceI18n.join(",") : "");
+
+      if (!this._oInstances[sKey]) {
+        this._oInstances[sKey] = new ResourceModelService(Object.assign({
+          factory: this
+        }, oServiceContext));
+      }
+
+      return this._oInstances[sKey].initPromise;
+    };
+
+    _proto2.removeGlobalInstance = function removeGlobalInstance() {
+      this._oInstances = {};
+    };
+
+    return ResourceModelServiceFactory;
+  }(ServiceFactory);
+
+  return ResourceModelServiceFactory;
+}, false);
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["ResourceModelServiceFactory.ts"],"names":["ResourceModelService","init","oContext","getContext","mSettings","settings","oFactory","factory","aBundles","bundles","concat","enhanceI18n","map","vI18n","isA","getResourceBundle","bundleName","replace","oResourceModel","ResourceModel","enhanceWith","slice","async","scopeType","oComponent","scopeObject","setModel","modelName","initPromise","Promise","all","_pEnhanced","resolve","then","oBundle","__bundle","getResourceModel","getInterface","exit","removeGlobalInstance","Service","ResourceModelServiceFactory","_oInstances","createInstance","oServiceContext","sKey","join","Object","assign","ServiceFactory"],"mappings":";AAAA;AACA;AACA;;;;;;;;;;MAOaA,oB;;;;;;;;;;WAIZC,I,GAAA,gBAAO;AAAA;;AACN,UAAMC,QAAQ,GAAG,KAAKC,UAAL,EAAjB;AACA,UAAMC,SAAS,GAAGF,QAAQ,CAACG,QAA3B;AACA,WAAKC,QAAL,GAAgBJ,QAAQ,CAACK,OAAzB,CAHM,CAKN;AACA;AACA;AACA;AACA;AACA;;AACA,UAAMC,QAAQ,GAAGJ,SAAS,CAACK,OAAV,CAAkBC,MAAlB,CAAyBN,SAAS,CAACO,WAAV,IAAyB,EAAlD,EAAsDC,GAAtD,CAA0D,UAASC,KAAT,EAAqB;AAC/F;AACA;AACA,eAAO,OAAOA,KAAK,CAACC,GAAb,KAAqB,UAArB,IAAmCD,KAAK,CAACC,GAAN,CAAU,qCAAV,CAAnC,GACJD,KAAK,CAACE,iBAAN,EADI,GAEJ;AAAEC,UAAAA,UAAU,EAAEH,KAAK,CAACI,OAAN,CAAc,KAAd,EAAqB,GAArB;AAAd,SAFH;AAGA,OANgB,CAAjB;AAQA,WAAKC,cAAL,GAAsB,IAAIC,aAAJ,CAAkB;AACvCH,QAAAA,UAAU,EAAER,QAAQ,CAAC,CAAD,CAAR,CAAYQ,UADe;AAEvCI,QAAAA,WAAW,EAAEZ,QAAQ,CAACa,KAAT,CAAe,CAAf,CAF0B;AAGvCC,QAAAA,KAAK,EAAE;AAHgC,OAAlB,CAAtB;;AAMA,UAAIpB,QAAQ,CAACqB,SAAT,KAAuB,WAA3B,EAAwC;AACvC,YAAMC,UAAU,GAAGtB,QAAQ,CAACuB,WAA5B;AACAD,QAAAA,UAAU,CAACE,QAAX,CAAoB,KAAKR,cAAzB,EAAyCd,SAAS,CAACuB,SAAnD;AACA;;AAED,WAAKC,WAAL,GAAmBC,OAAO,CAACC,GAAR,CAAY,CAC9B,KAAKZ,cAAL,CAAoBH,iBAApB,EAD8B,EAE7B,KAAKG,cAAN,CAA6Ba,UAA7B,IAA2CF,OAAO,CAACG,OAAR,EAFb,CAAZ,EAGhBC,IAHgB,CAGX,UAACC,OAAD,EAAoB;AAC1B,QAAA,KAAI,CAAChB,cAAN,CAA6BiB,QAA7B,GAAwCD,OAAO,CAAC,CAAD,CAA/C;AACA,eAAO,KAAP;AACA,OANkB,CAAnB;AAOA,K;;WAEDE,gB,GAAA,4BAAmB;AAClB,aAAO,KAAKlB,cAAZ;AACA,K;;WACDmB,Y,GAAA,wBAAoB;AACnB,aAAO,IAAP;AACA,K;;WACDC,I,GAAA,gBAAO;AACN;AACA,WAAKhC,QAAL,CAAciC,oBAAd;AACA,K;;;IApDwCC,O;;;;MAuDpCC,2B;;;;;;;;;;;aACLC,W,GAAoD,E;;;;;;YACpDC,c,GAAA,wBAAeC,eAAf,EAA8E;AAC7E,UAAMC,IAAI,GACTD,eAAe,CAACvC,QAAhB,CAAyBI,OAAzB,CAAiCqC,IAAjC,CAAsC,GAAtC,KACCF,eAAe,CAACvC,QAAhB,CAAyBM,WAAzB,GAAuC,MAAMiC,eAAe,CAACvC,QAAhB,CAAyBM,WAAzB,CAAqCmC,IAArC,CAA0C,GAA1C,CAA7C,GAA8F,EAD/F,CADD;;AAIA,UAAI,CAAC,KAAKJ,WAAL,CAAiBG,IAAjB,CAAL,EAA6B;AAC5B,aAAKH,WAAL,CAAiBG,IAAjB,IAAyB,IAAI7C,oBAAJ,CAAyB+C,MAAM,CAACC,MAAP,CAAc;AAAEzC,UAAAA,OAAO,EAAE;AAAX,SAAd,EAAiCqC,eAAjC,CAAzB,CAAzB;AACA;;AAED,aAAO,KAAKF,WAAL,CAAiBG,IAAjB,EAAuBjB,WAA9B;AACA,K;;YACDW,oB,GAAA,gCAAuB;AACtB,WAAKG,WAAL,GAAmB,EAAnB;AACA,K;;;IAfwCO,c;;SAkB3BR,2B","sourceRoot":".","sourcesContent":["import Service from \"sap/ui/core/service/Service\";\nimport ServiceFactory from \"sap/ui/core/service/ServiceFactory\";\nimport ResourceModel from \"sap/ui/model/resource/ResourceModel\";\nimport ResourceBundle from \"sap/base/i18n/ResourceBundle\";\nimport { ServiceContext } from \"sap/ui/core/service\";\ntype ResourceModelServiceSettings = {\n\tbundles: ResourceBundle[];\n\tenhanceI18n: string[];\n};\nexport class ResourceModelService extends Service<ResourceModelServiceSettings> {\n\tinitPromise!: Promise<any>;\n\toFactory!: ResourceModelServiceFactory;\n\toResourceModel!: ResourceModel;\n\tinit() {\n\t\tconst oContext = this.getContext();\n\t\tconst mSettings = oContext.settings;\n\t\tthis.oFactory = oContext.factory;\n\n\t\t// When enhancing i18n keys the value in the last resource bundle takes precedence\n\t\t// hence arrange various resource bundles so that enhanceI18n provided by the application is the last.\n\t\t// The following order is used :\n\t\t// 1. sap.fe bundle - sap.fe.core.messagebundle (passed with mSettings.bundles)\n\t\t// 2. sap.fe bundle - sap.fe.templates.messagebundle (passed with mSettings.bundles)\n\t\t// 3. Multiple bundles passed by the application as part of enhanceI18n\n\t\tconst aBundles = mSettings.bundles.concat(mSettings.enhanceI18n || []).map(function(vI18n: any) {\n\t\t\t// if value passed for enhanceI18n is a Resource Model, return the associated bundle\n\t\t\t// else the value is a bundleUrl, return Resource Bundle configuration so that a bundle can be created\n\t\t\treturn typeof vI18n.isA === \"function\" && vI18n.isA(\"sap.ui.model.resource.ResourceModel\")\n\t\t\t\t? vI18n.getResourceBundle()\n\t\t\t\t: { bundleName: vI18n.replace(/\\//g, \".\") };\n\t\t});\n\n\t\tthis.oResourceModel = new ResourceModel({\n\t\t\tbundleName: aBundles[0].bundleName,\n\t\t\tenhanceWith: aBundles.slice(1),\n\t\t\tasync: true\n\t\t});\n\n\t\tif (oContext.scopeType === \"component\") {\n\t\t\tconst oComponent = oContext.scopeObject;\n\t\t\toComponent.setModel(this.oResourceModel, mSettings.modelName);\n\t\t}\n\n\t\tthis.initPromise = Promise.all([\n\t\t\tthis.oResourceModel.getResourceBundle() as Promise<ResourceBundle>,\n\t\t\t(this.oResourceModel as any)._pEnhanced || Promise.resolve()\n\t\t]).then((oBundle: any[]) => {\n\t\t\t(this.oResourceModel as any).__bundle = oBundle[0];\n\t\t\treturn this;\n\t\t});\n\t}\n\n\tgetResourceModel() {\n\t\treturn this.oResourceModel;\n\t}\n\tgetInterface(): any {\n\t\treturn this;\n\t}\n\texit() {\n\t\t// Deregister global instance\n\t\tthis.oFactory.removeGlobalInstance();\n\t}\n}\n\nclass ResourceModelServiceFactory extends ServiceFactory<ResourceModelServiceSettings> {\n\t_oInstances: Record<string, ResourceModelService> = {};\n\tcreateInstance(oServiceContext: ServiceContext<ResourceModelServiceSettings>) {\n\t\tconst sKey =\n\t\t\toServiceContext.settings.bundles.join(\",\") +\n\t\t\t(oServiceContext.settings.enhanceI18n ? \",\" + oServiceContext.settings.enhanceI18n.join(\",\") : \"\");\n\n\t\tif (!this._oInstances[sKey]) {\n\t\t\tthis._oInstances[sKey] = new ResourceModelService(Object.assign({ factory: this }, oServiceContext));\n\t\t}\n\n\t\treturn this._oInstances[sKey].initPromise;\n\t}\n\tremoveGlobalInstance() {\n\t\tthis._oInstances = {};\n\t}\n}\n\nexport default ResourceModelServiceFactory;\n"]}

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

@@ -0,0 +1,83 @@
+import Service from "sap/ui/core/service/Service";
+import ServiceFactory from "sap/ui/core/service/ServiceFactory";
+import ResourceModel from "sap/ui/model/resource/ResourceModel";
+import ResourceBundle from "sap/base/i18n/ResourceBundle";
+import { ServiceContext } from "sap/ui/core/service";
+type ResourceModelServiceSettings = {
+	bundles: ResourceBundle[];
+	enhanceI18n: string[];
+};
+export class ResourceModelService extends Service<ResourceModelServiceSettings> {
+	initPromise!: Promise<any>;
+	oFactory!: ResourceModelServiceFactory;
+	oResourceModel!: ResourceModel;
+	init() {
+		const oContext = this.getContext();
+		const mSettings = oContext.settings;
+		this.oFactory = oContext.factory;
+
+		// When enhancing i18n keys the value in the last resource bundle takes precedence
+		// hence arrange various resource bundles so that enhanceI18n provided by the application is the last.
+		// The following order is used :
+		// 1. sap.fe bundle - sap.fe.core.messagebundle (passed with mSettings.bundles)
+		// 2. sap.fe bundle - sap.fe.templates.messagebundle (passed with mSettings.bundles)
+		// 3. Multiple bundles passed by the application as part of enhanceI18n
+		const aBundles = mSettings.bundles.concat(mSettings.enhanceI18n || []).map(function(vI18n: any) {
+			// if value passed for enhanceI18n is a Resource Model, return the associated bundle
+			// else the value is a bundleUrl, return Resource Bundle configuration so that a bundle can be created
+			return typeof vI18n.isA === "function" && vI18n.isA("sap.ui.model.resource.ResourceModel")
+				? vI18n.getResourceBundle()
+				: { bundleName: vI18n.replace(/\//g, ".") };
+		});
+
+		this.oResourceModel = new ResourceModel({
+			bundleName: aBundles[0].bundleName,
+			enhanceWith: aBundles.slice(1),
+			async: true
+		});
+
+		if (oContext.scopeType === "component") {
+			const oComponent = oContext.scopeObject;
+			oComponent.setModel(this.oResourceModel, mSettings.modelName);
+		}
+
+		this.initPromise = Promise.all([
+			this.oResourceModel.getResourceBundle() as Promise<ResourceBundle>,
+			(this.oResourceModel as any)._pEnhanced || Promise.resolve()
+		]).then((oBundle: any[]) => {
+			(this.oResourceModel as any).__bundle = oBundle[0];
+			return this;
+		});
+	}
+
+	getResourceModel() {
+		return this.oResourceModel;
+	}
+	getInterface(): any {
+		return this;
+	}
+	exit() {
+		// Deregister global instance
+		this.oFactory.removeGlobalInstance();
+	}
+}
+
+class ResourceModelServiceFactory extends ServiceFactory<ResourceModelServiceSettings> {
+	_oInstances: Record<string, ResourceModelService> = {};
+	createInstance(oServiceContext: ServiceContext<ResourceModelServiceSettings>) {
+		const sKey =
+			oServiceContext.settings.bundles.join(",") +
+			(oServiceContext.settings.enhanceI18n ? "," + oServiceContext.settings.enhanceI18n.join(",") : "");
+
+		if (!this._oInstances[sKey]) {
+			this._oInstances[sKey] = new ResourceModelService(Object.assign({ factory: this }, oServiceContext));
+		}
+
+		return this._oInstances[sKey].initPromise;
+	}
+	removeGlobalInstance() {
+		this._oInstances = {};
+	}
+}
+
+export default ResourceModelServiceFactory;