@sap/open.fe 1.99.0 → 1.100.0

package/packages/sap.fe.core/src/sap/fe/core/services/TemplatedViewServiceFactory.js

@@ -2,4 +2,4 @@
  * 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/core/service/ServiceFactoryRegistry","sap/ui/model/base/ManagedObjectModel","sap/ui/core/mvc/View","sap/ui/core/Component","sap/ui/model/json/JSONModel","sap/base/Log","sap/fe/core/TemplateModel","sap/fe/core/helpers/DynamicAnnotationPathHelper","sap/ui/core/cache/CacheManager","sap/ui/VersionInfo","sap/ui/Device","sap/base/util/UriParameters"],function(S,a,b,M,V,C,J,L,T,D,c,d,f,U){"use strict";function _(o,e,v){if(e in o){Object.defineProperty(o,e,{value:v,enumerable:true,configurable:true,writable:true});}else{o[e]=v;}return o;}function g(i,e){if(!(i instanceof e)){throw new TypeError("Cannot call a class as a function");}}function h(e,p){for(var i=0;i<p.length;i++){var o=p[i];o.enumerable=o.enumerable||false;o.configurable=true;if("value"in o)o.writable=true;Object.defineProperty(e,o.key,o);}}function j(e,p,i){if(p)h(e.prototype,p);if(i)h(e,i);return e;}function k(e,i){if(typeof i!=="function"&&i!==null){throw new TypeError("Super expression must either be null or a function");}e.prototype=Object.create(i&&i.prototype,{constructor:{value:e,writable:true,configurable:true}});if(i)l(e,i);}function l(o,p){l=Object.setPrototypeOf||function l(o,p){o.__proto__=p;return o;};return l(o,p);}function m(e){var i=r();return function v(){var o=s(e),p;if(i){var N=s(this).constructor;p=Reflect.construct(o,arguments,N);}else{p=o.apply(this,arguments);}return n(this,p);};}function n(e,i){if(i&&(typeof i==="object"||typeof i==="function")){return i;}else if(i!==void 0){throw new TypeError("Derived constructors may only return object or undefined");}return q(e);}function q(e){if(e===void 0){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return e;}function r(){if(typeof Reflect==="undefined"||!Reflect.construct)return false;if(Reflect.construct.sham)return false;if(typeof Proxy==="function")return true;try{Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}));return true;}catch(e){return false;}}function s(o){s=Object.setPrototypeOf?Object.getPrototypeOf:function s(o){return o.__proto__||Object.getPrototypeOf(o);};return s(o);}var t=function(e){k(t,e);var o=m(t);function t(){g(this,t);return o.apply(this,arguments);}j(t,[{key:"init",value:function G(){var p=this;var v=[];var w=this.getContext();var x=w.scopeObject;var A=C.getOwnerComponentFor(x);var y=A.getMetaModel();var z=A.getMetadata().getComponentName()+"::"+A.getLocalId(x.getId());var E=x.getEnhanceI18n()||[];var B;this.oFactory=w.factory;if(E){B=A.getMetadata().getComponentName();for(var i=0;i<E.length;i++){var R=A.getModel(E[i]);if(R&&R.isA("sap.ui.model.resource.ResourceModel")){E[i]=R;}else{E[i]=B+"."+E[i].replace(".properties","");}}}var F=A.getMetadata().getName()+"_"+z+"_"+sap.ui.getCore().getConfiguration().getLanguageTag();v.push(b.get("sap.fe.core.services.ResourceModelService").createInstance({scopeType:"component",scopeObject:x,settings:{bundles:["sap.fe.core.messagebundle","sap.fe.macros.messagebundle","sap.fe.templates.messagebundle"],enhanceI18n:E,modelName:"sap.fe.i18n"}}).then(function(H){p.oResourceModelService=H;return H.getResourceModel();}));v.push(b.get("sap.fe.core.services.CacheHandlerService").createInstance({settings:{metaModel:y,appComponent:A,component:x}}).then(function(H){p.oCacheHandlerService=H;return H.validateCacheKey(F);}));v.push(d.load().then(function(I){var H="";if(!I.libraries){H=sap.ui.buildinfo.buildtime;}else{I.libraries.forEach(function(K){H+=K.buildTimestamp;});}return H;}).catch(function(){return"<NOVALUE>";}));var P="";this.initPromise=Promise.all(v).then(function(H){var I=H[1];var K=H[2];var N=A.getShellServices();var O=A.getSideEffectsService();O.initializeSideEffects(A.getEnvironmentCapabilities().getCapabilities());P=I+"-"+K+"-"+z+"-"+N.instanceType+"-pageModel";return Promise.all(H.concat([p._getCachedModel(P)]));}).then(function(H){var R=H[0];var I=H[1];var K=H[3];return new Promise(function(N){sap.ui.require(["sap/fe/core/converters/TemplateConverter","sap/fe/core/converters/MetaModelConverter"],function(O,Q){N(p.createView(R,z,I,P,K,O,Q));});});}).then(function(H){var I=b.get("sap.fe.core.services.CacheHandlerService").getInstance(y);I.invalidateIfNeeded(H,F);});}},{key:"_getCachedModel",value:function p(i){if(sap.ui.getCore().getConfiguration().getViewCache()){return c.get(i);}return undefined;}},{key:"_setCachedModel",value:function v(i,p){if(sap.ui.getCore().getConfiguration().getViewCache()){c.set(i,p);}return undefined;}},{key:"refreshView",value:function p(i){var R=i.getRootControl();if(R){R.destroy();}else if(this.oView){this.oView.destroy();}return this.createView(this.resourceModel,this.stableId,"","",undefined,this.TemplateConverter,this.MetaModelConverter).then(function(){i.oContainer.invalidate();}).catch(function(E){i.oContainer.invalidate();L.error(E);});}},{key:"createView",value:function a1(R,i,p,P,v,w,x){var y=this;this.resourceModel=R;this.stableId=i;this.TemplateConverter=w;this.MetaModelConverter=x;var z=this.getContext();var A=z.settings;var B=A.converterType;var E=z.scopeObject;var F=C.getOwnerComponentFor(E);var G=F.getRoutingService().getTargetInformationFor(E).options.settings.fullContextPath;var H=F.getMetaModel();var I=F.getManifest();var K=new J(sap.ui.Device).setDefaultBindingMode("OneWay");var N=new J(I);var O=false;var Q,W,X,Y;function Z(){var b1=G.split("/");var c1=b1.reduce(function(d1,e1){if(e1===""){return d1;}if(d1===""){d1="/"+e1;}else{var f1=H.getObject(d1+"/$NavigationPropertyBinding/"+e1);if(f1&&Object.keys(f1).length>0){d1+="/$NavigationPropertyBinding";}d1+="/"+e1;}return d1;},"");var X={type:"XML",preprocessors:{xml:{bindingContexts:{entitySet:c1?H.createBindingContext(c1):null,fullContextPath:G?H.createBindingContext(G):null,contextPath:G?H.createBindingContext(G):null,converterContext:Q.createBindingContext("/",undefined,{noResolve:true}),viewData:Y?W.createBindingContext("/"):null},models:{entitySet:H,fullContextPath:H,contextPath:H,"sap.fe.i18n":R,metaModel:H,"device":K,manifest:N,converterContext:Q,viewData:W},appComponent:F}},id:i,viewName:A.viewName||E.getViewName(),viewData:Y,cache:{keys:[p]},models:{"sap.fe.i18n":R},height:"100%"};return X;}var $=function(b1){L.error(b1.message,b1);X.viewName=A.errorViewName||"sap.fe.core.services.view.TemplatingErrorPage";X.preprocessors.xml.models["error"]=new J(b1);return E.runAsOwner(function(){return V.create(X).then(function(c1){y.oView=c1;y.oView.setModel(new M(y.oView),"$view");E.setAggregation("rootControl",y.oView);return p;});});};return F.getService("routingService").then(function(b1){var c1=b1.getTargetInformationFor(E);var d1=I["sap.app"]&&I["sap.app"].crossNavigation&&I["sap.app"].crossNavigation.outbounds;var e1=E.getNavigation()||{};Object.keys(e1).forEach(function(g1){var h1=e1[g1];var i1;if(h1.detail&&h1.detail.outbound&&d1[h1.detail.outbound]){i1=d1[h1.detail.outbound];h1.detail.outboundDetail={semanticObject:i1.semanticObject,action:i1.action,parameters:i1.parameters};}if(h1.create&&h1.create.outbound&&d1[h1.create.outbound]){i1=d1[h1.create.outbound];h1.create.outboundDetail={semanticObject:i1.semanticObject,action:i1.action,parameters:i1.parameters};}});Y={navigation:e1,viewLevel:c1.viewLevel,stableId:i,contentDensities:I["sap.ui5"].contentDensities,resourceBundle:R.__bundle,fullContextPath:G,isDesktop:f.system.desktop,isPhone:f.system.phone};if(E.getViewData){Object.assign(Y,E.getViewData());}var f1=F.getShellServices();Y.converterType=B;Y.shellContentDensity=f1.getContentDensity();Y.useNewLazyLoading=U.fromQuery(window.location.search).get("sap-fe-xx-lazyloadingtest")==="true";Y.retrieveTextFromValueList=I["sap.fe"]&&I["sap.fe"].form?I["sap.fe"].form.retrieveTextFromValueList:undefined;W=new J(Y);if(Y&&Y.controlConfiguration){Object.keys(Y.controlConfiguration).forEach(function(g1){if(g1.indexOf("[")!==-1){var h1=D.resolveDynamicExpression(g1,H);Y.controlConfiguration[h1]=Y.controlConfiguration[g1];}});}x.convertTypes(H,F.getEnvironmentCapabilities().getCapabilities());Q=new T(function(){try{if(!!v){return v;}else{var g1=F.getDiagnostics();var h1=g1.getIssues().length;var i1=w.convertPage(B,H,Y,g1,G,F.getEnvironmentCapabilities().getCapabilities());var j1=g1.getIssues();var k1=j1.slice(h1);if(k1.length>0){L.warning("Some issues have been detected in your project, please check the UI5 support assistant rule for sap.fe.core");}y._setCachedModel(P,i1);return i1;}}catch(l1){L.error(l1,l1);return{};}},H);if(!O){X=Z();E.setModel(Q,"_pageModel");return E.runAsOwner(function(){return V.create(X).catch($).then(function(g1){y.oView=g1;y.oView.setModel(new M(y.oView),"$view");y.oView.setModel(W,"viewData");E.setAggregation("rootControl",y.oView);return p;}).catch(L.error);});}}).catch(function(b1){L.error(b1.message,b1);throw new Error("Error while creating view : "+b1);});}},{key:"getView",value:function i(){return this.oView;}},{key:"getInterface",value:function i(){return this;}},{key:"exit",value:function i(){this.oResourceModelService&&this.oResourceModelService.destroy();this.oCacheHandlerService&&this.oCacheHandlerService.destroy();this.oFactory.removeGlobalInstance();}}]);return t;}(S);var u=function(e){k(u,e);var i=m(u);function u(){var o;g(this,u);for(var p=arguments.length,v=new Array(p),w=0;w<p;w++){v[w]=arguments[w];}o=i.call.apply(i,[this].concat(v));_(q(o),"_oInstanceRegistry",{});return o;}j(u,[{key:"createInstance",value:function v(o){u.iCreatingViews++;var p=new t(Object.assign({factory:this},o));return p.initPromise.then(function(){u.iCreatingViews--;return p;});}},{key:"removeGlobalInstance",value:function o(){this._oInstanceRegistry={};}}],[{key:"getNumberOfViewsInCreationState",value:function o(){return u.iCreatingViews;}}]);return u;}(a);return u;},false);
+sap.ui.define(["sap/ui/core/service/Service","sap/ui/core/service/ServiceFactory","sap/ui/core/service/ServiceFactoryRegistry","sap/ui/model/base/ManagedObjectModel","sap/ui/core/mvc/View","sap/ui/core/Component","sap/ui/model/json/JSONModel","sap/base/Log","sap/fe/core/TemplateModel","sap/ui/core/cache/CacheManager","sap/ui/VersionInfo","sap/ui/Device","sap/base/util/UriParameters","../helpers/DynamicAnnotationPathHelper"],function(S,a,b,M,V,C,J,L,T,c,d,D,U,f){"use strict";var r=f.resolveDynamicExpression;function _(s,e){if(typeof e!=="function"&&e!==null){throw new TypeError("Super expression must either be null or a function");}s.prototype=Object.create(e&&e.prototype,{constructor:{value:s,writable:true,configurable:true}});if(e)g(s,e);}function g(o,p){g=Object.setPrototypeOf||function g(o,p){o.__proto__=p;return o;};return g(o,p);}var h=function(k){_(h,k);function h(){return k.apply(this,arguments)||this;}var l=h.prototype;l.init=function u(){var e=this;var s=[];var o=this.getContext();var m=o.scopeObject;var A=C.getOwnerComponentFor(m);var n=A.getMetaModel();var p=A.getMetadata().getComponentName()+"::"+A.getLocalId(m.getId());var E=m.getEnhanceI18n()||[];var q;this.oFactory=o.factory;if(E){q=A.getMetadata().getComponentName();for(var i=0;i<E.length;i++){var R=A.getModel(E[i]);if(R&&R.isA("sap.ui.model.resource.ResourceModel")){E[i]=R;}else{E[i]=q+"."+E[i].replace(".properties","");}}}var t=A.getMetadata().getName()+"_"+p+"_"+sap.ui.getCore().getConfiguration().getLanguageTag();s.push(b.get("sap.fe.core.services.ResourceModelService").createInstance({scopeType:"component",scopeObject:m,settings:{bundles:["sap.fe.core.messagebundle","sap.fe.macros.messagebundle","sap.fe.templates.messagebundle"],enhanceI18n:E,modelName:"sap.fe.i18n"}}).then(function(v){e.oResourceModelService=v;return v.getResourceModel();}));s.push(b.get("sap.fe.core.services.CacheHandlerService").createInstance({settings:{metaModel:n,appComponent:A,component:m}}).then(function(v){e.oCacheHandlerService=v;return v.validateCacheKey(t);}));s.push(d.load().then(function(I){var v="";if(!I.libraries){v=sap.ui.buildinfo.buildtime;}else{I.libraries.forEach(function(w){v+=w.buildTimestamp;});}return v;}).catch(function(){return"<NOVALUE>";}));var P;this.initPromise=Promise.all(s).then(function(v){var w=v[1];var x=v[2];var y=A.getShellServices();var z=A.getSideEffectsService();z.initializeSideEffects(A.getEnvironmentCapabilities().getCapabilities());P=w?w+"-"+x+"-"+p+"-"+y.instanceType+"-pageModel":undefined;return Promise.all(v.concat([e._getCachedModel(P)]));}).then(function(v){var R=v[0];var w=v[1];var x=v[3];return new Promise(function(y){sap.ui.require(["sap/fe/core/converters/TemplateConverter","sap/fe/core/converters/MetaModelConverter"],function(z,B){y(e.createView(R,p,w,P,x,z,B));});});}).then(function(v){var w=b.get("sap.fe.core.services.CacheHandlerService").getInstance(n);w.invalidateIfNeeded(v,t);});};l._getCachedModel=function e(s){if(s&&sap.ui.getCore().getConfiguration().getViewCache()){return c.get(s);}return undefined;};l._setCachedModel=function e(s,o){if(s&&sap.ui.getCore().getConfiguration().getViewCache()){c.set(s,o);}return undefined;};l.refreshView=function e(o){var R=o.getRootControl();if(R){R.destroy();}else if(this.oView){this.oView.destroy();}return this.createView(this.resourceModel,this.stableId,"","",undefined,this.TemplateConverter,this.MetaModelConverter).then(function(){o.oContainer.invalidate();}).catch(function(E){o.oContainer.invalidate();L.error(E);});};l.createView=function O(R,s,i,p,P,m,n){var o=this;this.resourceModel=R;this.stableId=s;this.TemplateConverter=m;this.MetaModelConverter=n;var q=this.getContext();var t=q.settings;var u=t.converterType;var v=q.scopeObject;var A=C.getOwnerComponentFor(v);var F=A.getRoutingService().getTargetInformationFor(v).options.settings.fullContextPath;var w=A.getMetaModel();var x=A.getManifest();var y=new J(sap.ui.Device).setDefaultBindingMode("OneWay");var z=new J(x);var E=false;var B,G,H,I;function K(){var e=F.split("/");var Q=e.reduce(function(W,X){if(X===""){return W;}if(W===""){W="/"+X;}else{var Y=w.getObject(W+"/$NavigationPropertyBinding/"+X);if(Y&&Object.keys(Y).length>0){W+="/$NavigationPropertyBinding";}W+="/"+X;}return W;},"");var H={type:"XML",preprocessors:{xml:{bindingContexts:{entitySet:Q?w.createBindingContext(Q):null,fullContextPath:F?w.createBindingContext(F):null,contextPath:F?w.createBindingContext(F):null,converterContext:B.createBindingContext("/",undefined,{noResolve:true}),viewData:I?G.createBindingContext("/"):null},models:{entitySet:w,fullContextPath:w,contextPath:w,"sap.fe.i18n":R,metaModel:w,"device":y,manifest:z,converterContext:B,viewData:G},appComponent:A}},id:s,viewName:t.viewName||v.getViewName(),viewData:I,cache:{keys:[i]},models:{"sap.fe.i18n":R},height:"100%"};return H;}var N=function(e){L.error(e.message,e);H.viewName=t.errorViewName||"sap.fe.core.services.view.TemplatingErrorPage";H.preprocessors.xml.models["error"]=new J(e);return v.runAsOwner(function(){return V.create(H).then(function(Q){o.oView=Q;o.oView.setModel(new M(o.oView),"$view");v.setAggregation("rootControl",o.oView);return i;});});};return A.getService("routingService").then(function(Q){var W=Q.getTargetInformationFor(v);var X=x["sap.app"]&&x["sap.app"].crossNavigation&&x["sap.app"].crossNavigation.outbounds;var Y=v.getNavigation()||{};Object.keys(Y).forEach(function(e){var $=Y[e];var a1;if($.detail&&$.detail.outbound&&X[$.detail.outbound]){a1=X[$.detail.outbound];$.detail.outboundDetail={semanticObject:a1.semanticObject,action:a1.action,parameters:a1.parameters};}if($.create&&$.create.outbound&&X[$.create.outbound]){a1=X[$.create.outbound];$.create.outboundDetail={semanticObject:a1.semanticObject,action:a1.action,parameters:a1.parameters};}});I={navigation:Y,viewLevel:W.viewLevel,stableId:s,contentDensities:x["sap.ui5"].contentDensities,resourceBundle:R.__bundle,fullContextPath:F,isDesktop:D.system.desktop,isPhone:D.system.phone};if(v.getViewData){Object.assign(I,v.getViewData());}var Z=A.getShellServices();I.converterType=u;I.shellContentDensity=Z.getContentDensity();I.useNewLazyLoading=U.fromQuery(window.location.search).get("sap-fe-xx-lazyloadingtest")==="true";I.retrieveTextFromValueList=x["sap.fe"]&&x["sap.fe"].form?x["sap.fe"].form.retrieveTextFromValueList:undefined;G=new J(I);if(I&&I.controlConfiguration){Object.keys(I.controlConfiguration).forEach(function(e){if(e.indexOf("[")!==-1){var $=r(e,w);I.controlConfiguration[$]=I.controlConfiguration[e];}});}n.convertTypes(w,A.getEnvironmentCapabilities().getCapabilities());B=new T(function(){try{if(!!P){return P;}else{var e=A.getDiagnostics();var $=e.getIssues().length;var a1=m.convertPage(u,w,I,e,F,A.getEnvironmentCapabilities().getCapabilities());var b1=e.getIssues();var c1=b1.slice($);if(c1.length>0){L.warning("Some issues have been detected in your project, please check the UI5 support assistant rule for sap.fe.core");}return a1;}}catch(d1){L.error(d1,d1);return{};}},w);if(!E){H=K();v.setModel(B,"_pageModel");return v.runAsOwner(function(){return V.create(H).catch(N).then(function(e){o.oView=e;o.oView.setModel(new M(o.oView),"$view");o.oView.setModel(G,"viewData");v.setAggregation("rootControl",o.oView);if(!P){o._setCachedModel(p,B.getData());}return i;}).catch(function(e){return L.error(e.message,e);});});}}).catch(function(e){L.error(e.message,e);throw new Error("Error while creating view : "+e);});};l.getView=function e(){return this.oView;};l.getInterface=function e(){return this;};l.exit=function e(){this.oResourceModelService&&this.oResourceModelService.destroy();this.oCacheHandlerService&&this.oCacheHandlerService.destroy();this.oFactory.removeGlobalInstance();};return h;}(S);var j=function(e){_(j,e);function j(){var k;for(var l=arguments.length,m=new Array(l),n=0;n<l;n++){m[n]=arguments[n];}k=e.call.apply(e,[this].concat(m))||this;k._oInstanceRegistry={};return k;}var i=j.prototype;i.createInstance=function k(s){j.iCreatingViews++;var t=new h(Object.assign({factory:this},s));return t.initPromise.then(function(){j.iCreatingViews--;return t;});};i.removeGlobalInstance=function k(){this._oInstanceRegistry={};};j.getNumberOfViewsInCreationState=function k(){return j.iCreatingViews;};return j;}(a);return j;},false);

package/packages/sap.fe.core/src/sap/fe/core/services/TemplatedViewServiceFactory.ts

@@ -7,17 +7,17 @@ import Component from "sap/ui/core/Component";
 import JSONModel from "sap/ui/model/json/JSONModel";
 import Log from "sap/base/Log";
 import TemplateModel from "sap/fe/core/TemplateModel";
-import DynamicAnnotationPathHelper from "sap/fe/core/helpers/DynamicAnnotationPathHelper";
 import CacheManager from "sap/ui/core/cache/CacheManager";
 import VersionInfo from "sap/ui/VersionInfo";
 import Device from "sap/ui/Device";
 import UriParameters from "sap/base/util/UriParameters";
 import { ServiceContext } from "sap/ui/core/service";
 import { ResourceModelService } from "./ResourceModelServiceFactory";
-import { AppComponent } from "sap/fe/core";
+import AppComponent from "sap/fe/core/AppComponent";
 import { CacheHandlerService } from "sap/fe/core/services/CacheHandlerServiceFactory";
-import { ResourceModel } from "sap/fe/macros";
+import ResourceModel from "sap/fe/macros/ResourceModel";
 import Model from "sap/ui/model/Model";
+import { resolveDynamicExpression } from "../helpers/DynamicAnnotationPathHelper";
 
 type TemplatedViewServiceSettings = {};
 
@@ -27,7 +27,7 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 	oResourceModelService!: ResourceModelService;
 	oCacheHandlerService!: CacheHandlerService;
 	oFactory!: TemplatedViewServiceFactory;
-	resourceModel!: ResourceModel;
+	resourceModel!: typeof ResourceModel;
 	stableId!: string;
 	TemplateConverter: any;
 	MetaModelConverter: any;
@@ -116,7 +116,7 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 				})
 		);
 
-		let sPageModelCacheKey = "";
+		let sPageModelCacheKey: string | undefined;
 		this.initPromise = Promise.all(aServiceDependencies)
 			.then((aDependenciesResult: any[]) => {
 				const sCacheKey = aDependenciesResult[1];
@@ -126,7 +126,10 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 
 				oSideEffectsServices.initializeSideEffects(oAppComponent.getEnvironmentCapabilities().getCapabilities());
 
-				sPageModelCacheKey = sCacheKey + "-" + sVersionInfo + "-" + sStableId + "-" + oShellServices.instanceType + "-pageModel";
+				// In case there is no cache key we ignore the view cache
+				sPageModelCacheKey = sCacheKey
+					? sCacheKey + "-" + sVersionInfo + "-" + sStableId + "-" + oShellServices.instanceType + "-pageModel"
+					: undefined;
 				return Promise.all(aDependenciesResult.concat([this._getCachedModel(sPageModelCacheKey)]));
 			})
 			.then((aDependenciesResult: any[]) => {
@@ -157,8 +160,9 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 				oCacheHandlerService.invalidateIfNeeded(sCacheKey, sCacheIdentifier);
 			});
 	}
-	_getCachedModel(sCacheKey: any) {
+	_getCachedModel(sCacheKey: string | undefined) {
 		if (
+			sCacheKey &&
 			sap.ui
 				.getCore()
 				.getConfiguration()
@@ -168,8 +172,9 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 		}
 		return undefined;
 	}
-	_setCachedModel(sCacheKey: string, oCacheModel: any) {
+	_setCachedModel(sCacheKey: string | undefined, oCacheModel: any) {
 		if (
+			sCacheKey &&
 			sap.ui
 				.getCore()
 				.getConfiguration()
@@ -207,7 +212,7 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 		oResourceModel: any,
 		sStableId: any,
 		sCacheKey: any,
-		sPageModelCacheKey: any,
+		sPageModelCacheKey: string | undefined,
 		oPageModelCache: any,
 		TemplateConverter: any,
 		MetaModelConverter: any
@@ -220,7 +225,7 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 		const mServiceSettings = oContext.settings;
 		const sConverterType = mServiceSettings.converterType;
 		const oComponent = oContext.scopeObject;
-		const oAppComponent: AppComponent = Component.getOwnerComponentFor(oComponent);
+		const oAppComponent: AppComponent = Component.getOwnerComponentFor(oComponent) as AppComponent;
 		const sFullContextPath = oAppComponent.getRoutingService().getTargetInformationFor(oComponent).options.settings.fullContextPath;
 		const oMetaModel = oAppComponent.getMetaModel();
 		const oManifestContent: any = oAppComponent.getManifest();
@@ -355,7 +360,7 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 				if (mViewData && mViewData.controlConfiguration) {
 					Object.keys(mViewData.controlConfiguration).forEach(function(sAnnotationPath: string) {
 						if (sAnnotationPath.indexOf("[") !== -1) {
-							const sTargetAnnotationPath = DynamicAnnotationPathHelper.resolveDynamicExpression(sAnnotationPath, oMetaModel);
+							const sTargetAnnotationPath = resolveDynamicExpression(sAnnotationPath, oMetaModel);
 							mViewData.controlConfiguration[sTargetAnnotationPath] = mViewData.controlConfiguration[sAnnotationPath];
 						}
 					});
@@ -384,8 +389,6 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 									"Some issues have been detected in your project, please check the UI5 support assistant rule for sap.fe.core"
 								);
 							}
-							// Fire and forget in the cache
-							this._setCachedModel(sPageModelCacheKey, oConverterPageModel);
 							return oConverterPageModel;
 						}
 					} catch (error) {
@@ -406,9 +409,13 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 								this.oView.setModel(new ManagedObjectModel(this.oView), "$view");
 								this.oView.setModel(oViewDataModel, "viewData");
 								oComponent.setAggregation("rootControl", this.oView);
+								// Fire and forget in the cache
+								if (!oPageModelCache) {
+									this._setCachedModel(sPageModelCacheKey, (oPageModel as any).getData());
+								}
 								return sCacheKey;
 							})
-							.catch(Log.error);
+							.catch(e => Log.error(e.message, e));
 					});
 				}
 			})

package/packages/sap.fe.core/src/sap/fe/core/services/view/TemplatingErrorPage-dbg.controller.js

@@ -10,4 +10,4 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "sap/fe/core/controllerextensions/I
   });
   return TemplatingErrorPage;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIlRlbXBsYXRpbmdFcnJvclBhZ2UuY29udHJvbGxlci50cyJdLCJuYW1lcyI6WyJUZW1wbGF0aW5nRXJyb3JQYWdlIiwiQ29udHJvbGxlciIsImV4dGVuZCIsIl9yb3V0aW5nIiwiSW50ZXJuYWxSb3V0aW5nIl0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7O0FBQ0EsTUFBTUEsbUJBQW1CLEdBQUdDLFVBQVUsQ0FBQ0MsTUFBWCxDQUFrQiwrQ0FBbEIsRUFBbUU7QUFDOUZDLElBQUFBLFFBQVEsRUFBRUM7QUFEb0YsR0FBbkUsQ0FBNUI7U0FJZUosbUIiLCJzb3VyY2VSb290IjoiLiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBDb250cm9sbGVyIGZyb20gXCJzYXAvdWkvY29yZS9tdmMvQ29udHJvbGxlclwiO1xuaW1wb3J0IHsgSW50ZXJuYWxSb3V0aW5nIH0gZnJvbSBcInNhcC9mZS9jb3JlL2NvbnRyb2xsZXJleHRlbnNpb25zXCI7XG5cbmNvbnN0IFRlbXBsYXRpbmdFcnJvclBhZ2UgPSBDb250cm9sbGVyLmV4dGVuZChcInNhcC5mZS5jb3JlLnNlcnZpY2VzLnZpZXcuVGVtcGxhdGluZ0Vycm9yUGFnZVwiLCB7XG5cdF9yb3V0aW5nOiBJbnRlcm5hbFJvdXRpbmdcbn0pO1xuXG5leHBvcnQgZGVmYXVsdCBUZW1wbGF0aW5nRXJyb3JQYWdlO1xuIl19
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIlRlbXBsYXRpbmdFcnJvclBhZ2UuY29udHJvbGxlci50cyJdLCJuYW1lcyI6WyJUZW1wbGF0aW5nRXJyb3JQYWdlIiwiQ29udHJvbGxlciIsImV4dGVuZCIsIl9yb3V0aW5nIiwiSW50ZXJuYWxSb3V0aW5nIl0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7O0FBQ0EsTUFBTUEsbUJBQW1CLEdBQUdDLFVBQVUsQ0FBQ0MsTUFBWCxDQUFrQiwrQ0FBbEIsRUFBbUU7QUFDOUZDLElBQUFBLFFBQVEsRUFBRUM7QUFEb0YsR0FBbkUsQ0FBNUI7U0FJZUosbUIiLCJzb3VyY2VSb290IjoiLiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBDb250cm9sbGVyIGZyb20gXCJzYXAvdWkvY29yZS9tdmMvQ29udHJvbGxlclwiO1xuaW1wb3J0IEludGVybmFsUm91dGluZyBmcm9tIFwic2FwL2ZlL2NvcmUvY29udHJvbGxlcmV4dGVuc2lvbnMvSW50ZXJuYWxSb3V0aW5nXCI7XG5cbmNvbnN0IFRlbXBsYXRpbmdFcnJvclBhZ2UgPSBDb250cm9sbGVyLmV4dGVuZChcInNhcC5mZS5jb3JlLnNlcnZpY2VzLnZpZXcuVGVtcGxhdGluZ0Vycm9yUGFnZVwiLCB7XG5cdF9yb3V0aW5nOiBJbnRlcm5hbFJvdXRpbmdcbn0pO1xuXG5leHBvcnQgZGVmYXVsdCBUZW1wbGF0aW5nRXJyb3JQYWdlO1xuIl19

package/packages/sap.fe.core/src/sap/fe/core/services/view/TemplatingErrorPage.controller.ts

@@ -1,5 +1,5 @@
 import Controller from "sap/ui/core/mvc/Controller";
-import { InternalRouting } from "sap/fe/core/controllerextensions";
+import InternalRouting from "sap/fe/core/controllerextensions/InternalRouting";
 
 const TemplatingErrorPage = Controller.extend("sap.fe.core.services.view.TemplatingErrorPage", {
 	_routing: InternalRouting

package/packages/sap.fe.core/src/sap/fe/core/support/CommonHelper-dbg.js

@@ -68,4 +68,4 @@ sap.ui.define(["sap/ui/support/library", "sap/fe/core/converters/helpers/IssueMa
   _exports.getIssueByCategory = getIssueByCategory;
   return _exports;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkNvbW1vbkhlbHBlci50cyJdLCJuYW1lcyI6WyJDYXRlZ29yaWVzIiwiU3VwcG9ydExpYiIsIlNldmVyaXR5IiwiQXVkaWVuY2VzIiwiZ2V0U2V2ZXJpdHkiLCJvU2V2ZXJpdHkiLCJJc3N1ZVNldmVyaXR5IiwiTG93IiwiSGlnaCIsIk1lZGl1bSIsImdldElzc3VlQnlDYXRlZ29yeSIsIm9Jc3N1ZU1hbmFnZXIiLCJvQ29yZUZhY2FkZSIsImlzc3VlQ2F0ZWdvcnlUeXBlIiwiaXNzdWVTdWJDYXRlZ29yeVR5cGUiLCJtQ29tcG9uZW50cyIsImdldENvbXBvbmVudHMiLCJvQXBwQ29tcG9uZW50IiwiT2JqZWN0Iiwia2V5cyIsImZvckVhY2giLCJzS2V5Iiwib0NvbXBvbmVudCIsImdldE1ldGFkYXRhIiwiZ2V0UGFyZW50IiwiZ2V0TmFtZSIsImFJc3N1ZXMiLCJnZXREaWFnbm9zdGljcyIsImdldElzc3Vlc0J5Q2F0ZWdvcnkiLCJJc3N1ZUNhdGVnb3J5Iiwib0VsZW1lbnQiLCJhZGRJc3N1ZSIsInNldmVyaXR5IiwiZGV0YWlscyIsImNvbnRleHQiLCJpZCIsImNhdGVnb3J5Il0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7Ozs7OztBQVNPLE1BQU1BLFVBQVUsR0FBR0MsVUFBVSxDQUFDRCxVQUE5QjtBQUFBLE1BQTBDO0FBQ2hERSxFQUFBQSxRQUFRLEdBQUdELFVBQVUsQ0FBQ0MsUUFEaEI7QUFBQSxNQUMwQjtBQUNoQ0MsRUFBQUEsU0FBUyxHQUFHRixVQUFVLENBQUNFLFNBRmpCLEMsQ0FFNEI7QUFFbkM7QUFDQTtBQUNBO0FBRUE7Ozs7OztBQUVPLE1BQU1DLFdBQVcsR0FBRyxVQUFTQyxTQUFULEVBQW1DO0FBQzdELFlBQVFBLFNBQVI7QUFDQyxXQUFLQyxhQUFhLENBQUNDLEdBQW5CO0FBQ0MsZUFBT0wsUUFBUSxDQUFDSyxHQUFoQjs7QUFDRCxXQUFLRCxhQUFhLENBQUNFLElBQW5CO0FBQ0MsZUFBT04sUUFBUSxDQUFDTSxJQUFoQjs7QUFDRCxXQUFLRixhQUFhLENBQUNHLE1BQW5CO0FBQ0MsZUFBT1AsUUFBUSxDQUFDTyxNQUFoQjtBQU5GO0FBUUEsR0FUTTs7OztBQVdBLE1BQU1DLGtCQUFrQixHQUFHLFVBQ2pDQyxhQURpQyxFQUVqQ0MsV0FGaUMsRUFHakNDLGlCQUhpQyxFQUlqQ0Msb0JBSmlDLEVBS2hDO0FBQ0QsUUFBTUMsV0FBVyxHQUFHSCxXQUFXLENBQUNJLGFBQVosRUFBcEI7QUFDQSxRQUFJQyxhQUFKO0FBQ0FDLElBQUFBLE1BQU0sQ0FBQ0MsSUFBUCxDQUFZSixXQUFaLEVBQXlCSyxPQUF6QixDQUFpQyxVQUFBQyxJQUFJLEVBQUk7QUFBQTs7QUFDeEMsVUFBTUMsVUFBVSxHQUFHUCxXQUFXLENBQUNNLElBQUQsQ0FBOUI7O0FBQ0EsVUFDQyxDQUFBQyxVQUFVLFNBQVYsSUFBQUEsVUFBVSxXQUFWLHFDQUFBQSxVQUFVLENBQ1BDLFdBREgsNEdBRUdDLFNBRkgsb0ZBR0dDLE9BSEgsUUFHaUIsMEJBSmxCLEVBS0U7QUFDRFIsUUFBQUEsYUFBYSxHQUFHSyxVQUFoQjtBQUNBO0FBQ0QsS0FWRDs7QUFXQSxRQUFJTCxhQUFKLEVBQW1CO0FBQ2xCLFVBQU1TLE9BQU8sR0FBR1QsYUFBYSxDQUFDVSxjQUFkLEdBQStCQyxtQkFBL0IsQ0FBbURDLGFBQWEsQ0FBQ2hCLGlCQUFELENBQWhFLEVBQXFGQyxvQkFBckYsQ0FBaEI7QUFFQVksTUFBQUEsT0FBTyxDQUFDTixPQUFSLENBQWdCLFVBQVNVLFFBQVQsRUFBb0M7QUFDbkRuQixRQUFBQSxhQUFhLENBQUNvQixRQUFkLENBQXVCO0FBQ3RCQyxVQUFBQSxRQUFRLEVBQUU1QixXQUFXLENBQUMwQixRQUFRLENBQUNFLFFBQVYsQ0FEQztBQUV0QkMsVUFBQUEsT0FBTyxFQUFFSCxRQUFRLENBQUNHLE9BRkk7QUFHdEJDLFVBQUFBLE9BQU8sRUFBRTtBQUNSQyxZQUFBQSxFQUFFLEVBQUVMLFFBQVEsQ0FBQ007QUFETDtBQUhhLFNBQXZCO0FBT0EsT0FSRDtBQVNBO0FBQ0QsR0FoQ00iLCJzb3VyY2VSb290IjoiLiIsInNvdXJjZXNDb250ZW50IjpbIi8qIVxuICogJHtjb3B5cmlnaHR9XG4gKi9cbi8qKlxuICogRGVmaW5lcyBzdXBwb3J0IHJ1bGVzIG9mIHRoZSBPYmplY3RQYWdlSGVhZGVyIGNvbnRyb2wgb2Ygc2FwLnV4YXAgbGlicmFyeS5cbiAqL1xuaW1wb3J0IFN1cHBvcnRMaWIgZnJvbSBcInNhcC91aS9zdXBwb3J0L2xpYnJhcnlcIjtcbmltcG9ydCB7IElzc3VlQ2F0ZWdvcnksIElzc3VlU2V2ZXJpdHkgfSBmcm9tIFwic2FwL2ZlL2NvcmUvY29udmVydGVycy9oZWxwZXJzL0lzc3VlTWFuYWdlclwiO1xuaW1wb3J0IHsgSXNzdWVEZWZpbml0aW9uIH0gZnJvbSBcInNhcC9mZS9jb3JlL3N1cHBvcnQvRGlhZ25vc3RpY3NcIjtcbmltcG9ydCB7IEFwcENvbXBvbmVudCB9IGZyb20gXCJzYXAvZmUvY29yZVwiO1xuXG5leHBvcnQgY29uc3QgQ2F0ZWdvcmllcyA9IFN1cHBvcnRMaWIuQ2F0ZWdvcmllcywgLy8gQWNjZXNzaWJpbGl0eSwgUGVyZm9ybWFuY2UsIE1lbW9yeSwgLi4uXG5cdFNldmVyaXR5ID0gU3VwcG9ydExpYi5TZXZlcml0eSwgLy8gSGludCwgV2FybmluZywgRXJyb3Jcblx0QXVkaWVuY2VzID0gU3VwcG9ydExpYi5BdWRpZW5jZXM7IC8vIENvbnRyb2wsIEludGVybmFsLCBBcHBsaWNhdGlvblxuXG4vLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKipcbi8vIFJ1bGUgRGVmaW5pdGlvbnNcbi8vKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKlxuXG4vLyBSdWxlIGNoZWNrcyBpZiBvYmplY3RQYWdlIGNvbXBvbmVudENvbnRhaW5lciBoZWlnaHQgaXMgc2V0XG5cbmV4cG9ydCBjb25zdCBnZXRTZXZlcml0eSA9IGZ1bmN0aW9uKG9TZXZlcml0eTogSXNzdWVTZXZlcml0eSkge1xuXHRzd2l0Y2ggKG9TZXZlcml0eSkge1xuXHRcdGNhc2UgSXNzdWVTZXZlcml0eS5Mb3c6XG5cdFx0XHRyZXR1cm4gU2V2ZXJpdHkuTG93O1xuXHRcdGNhc2UgSXNzdWVTZXZlcml0eS5IaWdoOlxuXHRcdFx0cmV0dXJuIFNldmVyaXR5LkhpZ2g7XG5cdFx0Y2FzZSBJc3N1ZVNldmVyaXR5Lk1lZGl1bTpcblx0XHRcdHJldHVybiBTZXZlcml0eS5NZWRpdW07XG5cdH1cbn07XG5cbmV4cG9ydCBjb25zdCBnZXRJc3N1ZUJ5Q2F0ZWdvcnkgPSBmdW5jdGlvbihcblx0b0lzc3VlTWFuYWdlcjogYW55LFxuXHRvQ29yZUZhY2FkZTogYW55IC8qb1Njb3BlOiBhbnkqLyxcblx0aXNzdWVDYXRlZ29yeVR5cGU6IElzc3VlQ2F0ZWdvcnksXG5cdGlzc3VlU3ViQ2F0ZWdvcnlUeXBlPzogc3RyaW5nXG4pIHtcblx0Y29uc3QgbUNvbXBvbmVudHMgPSBvQ29yZUZhY2FkZS5nZXRDb21wb25lbnRzKCk7XG5cdGxldCBvQXBwQ29tcG9uZW50ITogQXBwQ29tcG9uZW50O1xuXHRPYmplY3Qua2V5cyhtQ29tcG9uZW50cykuZm9yRWFjaChzS2V5ID0+IHtcblx0XHRjb25zdCBvQ29tcG9uZW50ID0gbUNvbXBvbmVudHNbc0tleV07XG5cdFx0aWYgKFxuXHRcdFx0b0NvbXBvbmVudFxuXHRcdFx0XHQ/LmdldE1ldGFkYXRhKClcblx0XHRcdFx0Py5nZXRQYXJlbnQoKVxuXHRcdFx0XHQ/LmdldE5hbWUoKSA9PT0gXCJzYXAuZmUuY29yZS5BcHBDb21wb25lbnRcIlxuXHRcdCkge1xuXHRcdFx0b0FwcENvbXBvbmVudCA9IG9Db21wb25lbnQ7XG5cdFx0fVxuXHR9KTtcblx0aWYgKG9BcHBDb21wb25lbnQpIHtcblx0XHRjb25zdCBhSXNzdWVzID0gb0FwcENvbXBvbmVudC5nZXREaWFnbm9zdGljcygpLmdldElzc3Vlc0J5Q2F0ZWdvcnkoSXNzdWVDYXRlZ29yeVtpc3N1ZUNhdGVnb3J5VHlwZV0sIGlzc3VlU3ViQ2F0ZWdvcnlUeXBlKTtcblxuXHRcdGFJc3N1ZXMuZm9yRWFjaChmdW5jdGlvbihvRWxlbWVudDogSXNzdWVEZWZpbml0aW9uKSB7XG5cdFx0XHRvSXNzdWVNYW5hZ2VyLmFkZElzc3VlKHtcblx0XHRcdFx0c2V2ZXJpdHk6IGdldFNldmVyaXR5KG9FbGVtZW50LnNldmVyaXR5KSxcblx0XHRcdFx0ZGV0YWlsczogb0VsZW1lbnQuZGV0YWlscyxcblx0XHRcdFx0Y29udGV4dDoge1xuXHRcdFx0XHRcdGlkOiBvRWxlbWVudC5jYXRlZ29yeVxuXHRcdFx0XHR9XG5cdFx0XHR9KTtcblx0XHR9KTtcblx0fVxufTtcbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkNvbW1vbkhlbHBlci50cyJdLCJuYW1lcyI6WyJDYXRlZ29yaWVzIiwiU3VwcG9ydExpYiIsIlNldmVyaXR5IiwiQXVkaWVuY2VzIiwiZ2V0U2V2ZXJpdHkiLCJvU2V2ZXJpdHkiLCJJc3N1ZVNldmVyaXR5IiwiTG93IiwiSGlnaCIsIk1lZGl1bSIsImdldElzc3VlQnlDYXRlZ29yeSIsIm9Jc3N1ZU1hbmFnZXIiLCJvQ29yZUZhY2FkZSIsImlzc3VlQ2F0ZWdvcnlUeXBlIiwiaXNzdWVTdWJDYXRlZ29yeVR5cGUiLCJtQ29tcG9uZW50cyIsImdldENvbXBvbmVudHMiLCJvQXBwQ29tcG9uZW50IiwiT2JqZWN0Iiwia2V5cyIsImZvckVhY2giLCJzS2V5Iiwib0NvbXBvbmVudCIsImdldE1ldGFkYXRhIiwiZ2V0UGFyZW50IiwiZ2V0TmFtZSIsImFJc3N1ZXMiLCJnZXREaWFnbm9zdGljcyIsImdldElzc3Vlc0J5Q2F0ZWdvcnkiLCJJc3N1ZUNhdGVnb3J5Iiwib0VsZW1lbnQiLCJhZGRJc3N1ZSIsInNldmVyaXR5IiwiZGV0YWlscyIsImNvbnRleHQiLCJpZCIsImNhdGVnb3J5Il0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7Ozs7OztBQVNPLE1BQU1BLFVBQVUsR0FBR0MsVUFBVSxDQUFDRCxVQUE5QjtBQUFBLE1BQTBDO0FBQ2hERSxFQUFBQSxRQUFRLEdBQUdELFVBQVUsQ0FBQ0MsUUFEaEI7QUFBQSxNQUMwQjtBQUNoQ0MsRUFBQUEsU0FBUyxHQUFHRixVQUFVLENBQUNFLFNBRmpCLEMsQ0FFNEI7QUFFbkM7QUFDQTtBQUNBO0FBRUE7Ozs7OztBQUVPLE1BQU1DLFdBQVcsR0FBRyxVQUFTQyxTQUFULEVBQW1DO0FBQzdELFlBQVFBLFNBQVI7QUFDQyxXQUFLQyxhQUFhLENBQUNDLEdBQW5CO0FBQ0MsZUFBT0wsUUFBUSxDQUFDSyxHQUFoQjs7QUFDRCxXQUFLRCxhQUFhLENBQUNFLElBQW5CO0FBQ0MsZUFBT04sUUFBUSxDQUFDTSxJQUFoQjs7QUFDRCxXQUFLRixhQUFhLENBQUNHLE1BQW5CO0FBQ0MsZUFBT1AsUUFBUSxDQUFDTyxNQUFoQjtBQU5GO0FBUUEsR0FUTTs7OztBQVdBLE1BQU1DLGtCQUFrQixHQUFHLFVBQ2pDQyxhQURpQyxFQUVqQ0MsV0FGaUMsRUFHakNDLGlCQUhpQyxFQUlqQ0Msb0JBSmlDLEVBS2hDO0FBQ0QsUUFBTUMsV0FBVyxHQUFHSCxXQUFXLENBQUNJLGFBQVosRUFBcEI7QUFDQSxRQUFJQyxhQUFKO0FBQ0FDLElBQUFBLE1BQU0sQ0FBQ0MsSUFBUCxDQUFZSixXQUFaLEVBQXlCSyxPQUF6QixDQUFpQyxVQUFBQyxJQUFJLEVBQUk7QUFBQTs7QUFDeEMsVUFBTUMsVUFBVSxHQUFHUCxXQUFXLENBQUNNLElBQUQsQ0FBOUI7O0FBQ0EsVUFDQyxDQUFBQyxVQUFVLFNBQVYsSUFBQUEsVUFBVSxXQUFWLHFDQUFBQSxVQUFVLENBQ1BDLFdBREgsNEdBRUdDLFNBRkgsb0ZBR0dDLE9BSEgsUUFHaUIsMEJBSmxCLEVBS0U7QUFDRFIsUUFBQUEsYUFBYSxHQUFHSyxVQUFoQjtBQUNBO0FBQ0QsS0FWRDs7QUFXQSxRQUFJTCxhQUFKLEVBQW1CO0FBQ2xCLFVBQU1TLE9BQU8sR0FBR1QsYUFBYSxDQUFDVSxjQUFkLEdBQStCQyxtQkFBL0IsQ0FBbURDLGFBQWEsQ0FBQ2hCLGlCQUFELENBQWhFLEVBQXFGQyxvQkFBckYsQ0FBaEI7QUFFQVksTUFBQUEsT0FBTyxDQUFDTixPQUFSLENBQWdCLFVBQVNVLFFBQVQsRUFBb0M7QUFDbkRuQixRQUFBQSxhQUFhLENBQUNvQixRQUFkLENBQXVCO0FBQ3RCQyxVQUFBQSxRQUFRLEVBQUU1QixXQUFXLENBQUMwQixRQUFRLENBQUNFLFFBQVYsQ0FEQztBQUV0QkMsVUFBQUEsT0FBTyxFQUFFSCxRQUFRLENBQUNHLE9BRkk7QUFHdEJDLFVBQUFBLE9BQU8sRUFBRTtBQUNSQyxZQUFBQSxFQUFFLEVBQUVMLFFBQVEsQ0FBQ007QUFETDtBQUhhLFNBQXZCO0FBT0EsT0FSRDtBQVNBO0FBQ0QsR0FoQ00iLCJzb3VyY2VSb290IjoiLiIsInNvdXJjZXNDb250ZW50IjpbIi8qIVxuICogJHtjb3B5cmlnaHR9XG4gKi9cbi8qKlxuICogRGVmaW5lcyBzdXBwb3J0IHJ1bGVzIG9mIHRoZSBPYmplY3RQYWdlSGVhZGVyIGNvbnRyb2wgb2Ygc2FwLnV4YXAgbGlicmFyeS5cbiAqL1xuaW1wb3J0IFN1cHBvcnRMaWIgZnJvbSBcInNhcC91aS9zdXBwb3J0L2xpYnJhcnlcIjtcbmltcG9ydCB7IElzc3VlQ2F0ZWdvcnksIElzc3VlU2V2ZXJpdHkgfSBmcm9tIFwic2FwL2ZlL2NvcmUvY29udmVydGVycy9oZWxwZXJzL0lzc3VlTWFuYWdlclwiO1xuaW1wb3J0IHsgSXNzdWVEZWZpbml0aW9uIH0gZnJvbSBcInNhcC9mZS9jb3JlL3N1cHBvcnQvRGlhZ25vc3RpY3NcIjtcbmltcG9ydCBBcHBDb21wb25lbnQgZnJvbSBcInNhcC9mZS9jb3JlL0FwcENvbXBvbmVudFwiO1xuXG5leHBvcnQgY29uc3QgQ2F0ZWdvcmllcyA9IFN1cHBvcnRMaWIuQ2F0ZWdvcmllcywgLy8gQWNjZXNzaWJpbGl0eSwgUGVyZm9ybWFuY2UsIE1lbW9yeSwgLi4uXG5cdFNldmVyaXR5ID0gU3VwcG9ydExpYi5TZXZlcml0eSwgLy8gSGludCwgV2FybmluZywgRXJyb3Jcblx0QXVkaWVuY2VzID0gU3VwcG9ydExpYi5BdWRpZW5jZXM7IC8vIENvbnRyb2wsIEludGVybmFsLCBBcHBsaWNhdGlvblxuXG4vLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKipcbi8vIFJ1bGUgRGVmaW5pdGlvbnNcbi8vKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKlxuXG4vLyBSdWxlIGNoZWNrcyBpZiBvYmplY3RQYWdlIGNvbXBvbmVudENvbnRhaW5lciBoZWlnaHQgaXMgc2V0XG5cbmV4cG9ydCBjb25zdCBnZXRTZXZlcml0eSA9IGZ1bmN0aW9uKG9TZXZlcml0eTogSXNzdWVTZXZlcml0eSkge1xuXHRzd2l0Y2ggKG9TZXZlcml0eSkge1xuXHRcdGNhc2UgSXNzdWVTZXZlcml0eS5Mb3c6XG5cdFx0XHRyZXR1cm4gU2V2ZXJpdHkuTG93O1xuXHRcdGNhc2UgSXNzdWVTZXZlcml0eS5IaWdoOlxuXHRcdFx0cmV0dXJuIFNldmVyaXR5LkhpZ2g7XG5cdFx0Y2FzZSBJc3N1ZVNldmVyaXR5Lk1lZGl1bTpcblx0XHRcdHJldHVybiBTZXZlcml0eS5NZWRpdW07XG5cdH1cbn07XG5cbmV4cG9ydCBjb25zdCBnZXRJc3N1ZUJ5Q2F0ZWdvcnkgPSBmdW5jdGlvbihcblx0b0lzc3VlTWFuYWdlcjogYW55LFxuXHRvQ29yZUZhY2FkZTogYW55IC8qb1Njb3BlOiBhbnkqLyxcblx0aXNzdWVDYXRlZ29yeVR5cGU6IElzc3VlQ2F0ZWdvcnksXG5cdGlzc3VlU3ViQ2F0ZWdvcnlUeXBlPzogc3RyaW5nXG4pIHtcblx0Y29uc3QgbUNvbXBvbmVudHMgPSBvQ29yZUZhY2FkZS5nZXRDb21wb25lbnRzKCk7XG5cdGxldCBvQXBwQ29tcG9uZW50ITogQXBwQ29tcG9uZW50O1xuXHRPYmplY3Qua2V5cyhtQ29tcG9uZW50cykuZm9yRWFjaChzS2V5ID0+IHtcblx0XHRjb25zdCBvQ29tcG9uZW50ID0gbUNvbXBvbmVudHNbc0tleV07XG5cdFx0aWYgKFxuXHRcdFx0b0NvbXBvbmVudFxuXHRcdFx0XHQ/LmdldE1ldGFkYXRhKClcblx0XHRcdFx0Py5nZXRQYXJlbnQoKVxuXHRcdFx0XHQ/LmdldE5hbWUoKSA9PT0gXCJzYXAuZmUuY29yZS5BcHBDb21wb25lbnRcIlxuXHRcdCkge1xuXHRcdFx0b0FwcENvbXBvbmVudCA9IG9Db21wb25lbnQ7XG5cdFx0fVxuXHR9KTtcblx0aWYgKG9BcHBDb21wb25lbnQpIHtcblx0XHRjb25zdCBhSXNzdWVzID0gb0FwcENvbXBvbmVudC5nZXREaWFnbm9zdGljcygpLmdldElzc3Vlc0J5Q2F0ZWdvcnkoSXNzdWVDYXRlZ29yeVtpc3N1ZUNhdGVnb3J5VHlwZV0sIGlzc3VlU3ViQ2F0ZWdvcnlUeXBlKTtcblxuXHRcdGFJc3N1ZXMuZm9yRWFjaChmdW5jdGlvbihvRWxlbWVudDogSXNzdWVEZWZpbml0aW9uKSB7XG5cdFx0XHRvSXNzdWVNYW5hZ2VyLmFkZElzc3VlKHtcblx0XHRcdFx0c2V2ZXJpdHk6IGdldFNldmVyaXR5KG9FbGVtZW50LnNldmVyaXR5KSxcblx0XHRcdFx0ZGV0YWlsczogb0VsZW1lbnQuZGV0YWlscyxcblx0XHRcdFx0Y29udGV4dDoge1xuXHRcdFx0XHRcdGlkOiBvRWxlbWVudC5jYXRlZ29yeVxuXHRcdFx0XHR9XG5cdFx0XHR9KTtcblx0XHR9KTtcblx0fVxufTtcbiJdfQ==

package/packages/sap.fe.core/src/sap/fe/core/support/CommonHelper.ts

@@ -9,7 +9,7 @@
 import SupportLib from "sap/ui/support/library";
 import { IssueCategory, IssueSeverity } from "sap/fe/core/converters/helpers/IssueManager";
 import { IssueDefinition } from "sap/fe/core/support/Diagnostics";
-import { AppComponent } from "sap/fe/core";
+import AppComponent from "sap/fe/core/AppComponent";
 
 export const Categories = SupportLib.Categories, // Accessibility, Performance, Memory, ...
 	Severity = SupportLib.Severity, // Hint, Warning, Error

package/packages/sap.fe.core/src/sap/fe/core/support/Diagnostics-dbg.js

@@ -5,69 +5,57 @@
 sap.ui.define([], function () {
   "use strict";
 
-  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-  function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-  function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
   var Diagnostics = /*#__PURE__*/function () {
     function Diagnostics() {
-      _classCallCheck(this, Diagnostics);
-
       this._issues = [];
     }
 
-    _createClass(Diagnostics, [{
-      key: "addIssue",
-      value: function addIssue(issueCategory, issueSeverity, details, issueCategoryType, subCategory) {
-        var checkIfIssueExists = this.checkIfIssueExists(issueCategory, issueSeverity, details, issueCategoryType, subCategory);
+    var _proto = Diagnostics.prototype;
 
-        if (!checkIfIssueExists) {
-          this._issues.push({
-            category: issueCategory,
-            severity: issueSeverity,
-            details: details,
-            subCategory: subCategory
-          });
-        }
-      }
-    }, {
-      key: "getIssues",
-      value: function getIssues() {
-        return this._issues;
+    _proto.addIssue = function addIssue(issueCategory, issueSeverity, details, issueCategoryType, subCategory) {
+      var checkIfIssueExists = this.checkIfIssueExists(issueCategory, issueSeverity, details, issueCategoryType, subCategory);
+
+      if (!checkIfIssueExists) {
+        this._issues.push({
+          category: issueCategory,
+          severity: issueSeverity,
+          details: details,
+          subCategory: subCategory
+        });
       }
-    }, {
-      key: "getIssuesByCategory",
-      value: function getIssuesByCategory(inCategory, subCategory) {
-        if (subCategory) {
-          return this._issues.filter(function (issue) {
-            return issue.category === inCategory && issue.subCategory === subCategory;
-          });
-        } else {
-          return this._issues.filter(function (issue) {
-            return issue.category === inCategory;
-          });
-        }
+    };
+
+    _proto.getIssues = function getIssues() {
+      return this._issues;
+    };
+
+    _proto.getIssuesByCategory = function getIssuesByCategory(inCategory, subCategory) {
+      if (subCategory) {
+        return this._issues.filter(function (issue) {
+          return issue.category === inCategory && issue.subCategory === subCategory;
+        });
+      } else {
+        return this._issues.filter(function (issue) {
+          return issue.category === inCategory;
+        });
       }
-    }, {
-      key: "checkIfIssueExists",
-      value: function checkIfIssueExists(inCategory, severity, details, issueCategoryType, issueSubCategory) {
-        if (issueCategoryType && issueCategoryType[inCategory] && issueSubCategory) {
-          return this._issues.some(function (issue) {
-            return issue.category === inCategory && issue.severity === severity && issue.details.replace(/\n/g, "") === details.replace(/\n/g, "") && issue.subCategory === issueSubCategory;
-          });
-        }
+    };
 
+    _proto.checkIfIssueExists = function checkIfIssueExists(inCategory, severity, details, issueCategoryType, issueSubCategory) {
+      if (issueCategoryType && issueCategoryType[inCategory] && issueSubCategory) {
         return this._issues.some(function (issue) {
-          return issue.category === inCategory && issue.severity === severity && issue.details.replace(/\n/g, "") === details.replace(/\n/g, "");
+          return issue.category === inCategory && issue.severity === severity && issue.details.replace(/\n/g, "") === details.replace(/\n/g, "") && issue.subCategory === issueSubCategory;
         });
       }
-    }]);
+
+      return this._issues.some(function (issue) {
+        return issue.category === inCategory && issue.severity === severity && issue.details.replace(/\n/g, "") === details.replace(/\n/g, "");
+      });
+    };
 
     return Diagnostics;
   }();
 
   return Diagnostics;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkRpYWdub3N0aWNzLnRzIl0sIm5hbWVzIjpbIkRpYWdub3N0aWNzIiwiX2lzc3VlcyIsImlzc3VlQ2F0ZWdvcnkiLCJpc3N1ZVNldmVyaXR5IiwiZGV0YWlscyIsImlzc3VlQ2F0ZWdvcnlUeXBlIiwic3ViQ2F0ZWdvcnkiLCJjaGVja0lmSXNzdWVFeGlzdHMiLCJwdXNoIiwiY2F0ZWdvcnkiLCJzZXZlcml0eSIsImluQ2F0ZWdvcnkiLCJmaWx0ZXIiLCJpc3N1ZSIsImlzc3VlU3ViQ2F0ZWdvcnkiLCJzb21lIiwicmVwbGFjZSJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7Ozs7Ozs7OztNQU1NQSxXO0FBRUwsMkJBQWM7QUFBQTs7QUFDYixXQUFLQyxPQUFMLEdBQWUsRUFBZjtBQUNBOzs7O2FBQ0Qsa0JBQ0NDLGFBREQsRUFFQ0MsYUFGRCxFQUdDQyxPQUhELEVBSUNDLGlCQUpELEVBS0NDLFdBTEQsRUFNUTtBQUNQLFlBQU1DLGtCQUFrQixHQUFHLEtBQUtBLGtCQUFMLENBQXdCTCxhQUF4QixFQUF1Q0MsYUFBdkMsRUFBc0RDLE9BQXRELEVBQStEQyxpQkFBL0QsRUFBa0ZDLFdBQWxGLENBQTNCOztBQUNBLFlBQUksQ0FBQ0Msa0JBQUwsRUFBeUI7QUFDeEIsZUFBS04sT0FBTCxDQUFhTyxJQUFiLENBQWtCO0FBQ2pCQyxZQUFBQSxRQUFRLEVBQUVQLGFBRE87QUFFakJRLFlBQUFBLFFBQVEsRUFBRVAsYUFGTztBQUdqQkMsWUFBQUEsT0FBTyxFQUFFQSxPQUhRO0FBSWpCRSxZQUFBQSxXQUFXLEVBQUVBO0FBSkksV0FBbEI7QUFNQTtBQUNEOzs7YUFDRCxxQkFBK0I7QUFDOUIsZUFBTyxLQUFLTCxPQUFaO0FBQ0E7OzthQUNELDZCQUFvQlUsVUFBcEIsRUFBK0NMLFdBQS9DLEVBQXdGO0FBQ3ZGLFlBQUlBLFdBQUosRUFBaUI7QUFDaEIsaUJBQU8sS0FBS0wsT0FBTCxDQUFhVyxNQUFiLENBQW9CLFVBQUFDLEtBQUs7QUFBQSxtQkFBSUEsS0FBSyxDQUFDSixRQUFOLEtBQW1CRSxVQUFuQixJQUFpQ0UsS0FBSyxDQUFDUCxXQUFOLEtBQXNCQSxXQUEzRDtBQUFBLFdBQXpCLENBQVA7QUFDQSxTQUZELE1BRU87QUFDTixpQkFBTyxLQUFLTCxPQUFMLENBQWFXLE1BQWIsQ0FBb0IsVUFBQUMsS0FBSztBQUFBLG1CQUFJQSxLQUFLLENBQUNKLFFBQU4sS0FBbUJFLFVBQXZCO0FBQUEsV0FBekIsQ0FBUDtBQUNBO0FBQ0Q7OzthQUNELDRCQUNDQSxVQURELEVBRUNELFFBRkQsRUFHQ04sT0FIRCxFQUlDQyxpQkFKRCxFQUtDUyxnQkFMRCxFQU1XO0FBQ1YsWUFBSVQsaUJBQWlCLElBQUlBLGlCQUFpQixDQUFDTSxVQUFELENBQXRDLElBQXNERyxnQkFBMUQsRUFBNEU7QUFDM0UsaUJBQU8sS0FBS2IsT0FBTCxDQUFhYyxJQUFiLENBQ04sVUFBQUYsS0FBSztBQUFBLG1CQUNKQSxLQUFLLENBQUNKLFFBQU4sS0FBbUJFLFVBQW5CLElBQ0FFLEtBQUssQ0FBQ0gsUUFBTixLQUFtQkEsUUFEbkIsSUFFQUcsS0FBSyxDQUFDVCxPQUFOLENBQWNZLE9BQWQsQ0FBc0IsS0FBdEIsRUFBNkIsRUFBN0IsTUFBcUNaLE9BQU8sQ0FBQ1ksT0FBUixDQUFnQixLQUFoQixFQUF1QixFQUF2QixDQUZyQyxJQUdBSCxLQUFLLENBQUNQLFdBQU4sS0FBc0JRLGdCQUpsQjtBQUFBLFdBREMsQ0FBUDtBQU9BOztBQUNELGVBQU8sS0FBS2IsT0FBTCxDQUFhYyxJQUFiLENBQ04sVUFBQUYsS0FBSztBQUFBLGlCQUNKQSxLQUFLLENBQUNKLFFBQU4sS0FBbUJFLFVBQW5CLElBQ0FFLEtBQUssQ0FBQ0gsUUFBTixLQUFtQkEsUUFEbkIsSUFFQUcsS0FBSyxDQUFDVCxPQUFOLENBQWNZLE9BQWQsQ0FBc0IsS0FBdEIsRUFBNkIsRUFBN0IsTUFBcUNaLE9BQU8sQ0FBQ1ksT0FBUixDQUFnQixLQUFoQixFQUF1QixFQUF2QixDQUhqQztBQUFBLFNBREMsQ0FBUDtBQU1BOzs7Ozs7U0FHYWhCLFciLCJzb3VyY2VSb290IjoiLiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IElzc3VlQ2F0ZWdvcnksIElzc3VlU2V2ZXJpdHkgfSBmcm9tIFwic2FwL2ZlL2NvcmUvY29udmVydGVycy9oZWxwZXJzL0lzc3VlTWFuYWdlclwiO1xuXG5leHBvcnQgdHlwZSBJc3N1ZURlZmluaXRpb24gPSB7XG5cdGNhdGVnb3J5OiBJc3N1ZUNhdGVnb3J5O1xuXHRzZXZlcml0eTogSXNzdWVTZXZlcml0eTtcblx0ZGV0YWlsczogc3RyaW5nO1xuXHRzdWJDYXRlZ29yeT86IHN0cmluZyB8IHVuZGVmaW5lZDtcbn07XG5jbGFzcyBEaWFnbm9zdGljcyB7XG5cdF9pc3N1ZXM6IElzc3VlRGVmaW5pdGlvbltdO1xuXHRjb25zdHJ1Y3RvcigpIHtcblx0XHR0aGlzLl9pc3N1ZXMgPSBbXTtcblx0fVxuXHRhZGRJc3N1ZShcblx0XHRpc3N1ZUNhdGVnb3J5OiBJc3N1ZUNhdGVnb3J5LFxuXHRcdGlzc3VlU2V2ZXJpdHk6IElzc3VlU2V2ZXJpdHksXG5cdFx0ZGV0YWlsczogc3RyaW5nLFxuXHRcdGlzc3VlQ2F0ZWdvcnlUeXBlPzogYW55IHwgdW5kZWZpbmVkLFxuXHRcdHN1YkNhdGVnb3J5Pzogc3RyaW5nIHwgdW5kZWZpbmVkXG5cdCk6IHZvaWQge1xuXHRcdGNvbnN0IGNoZWNrSWZJc3N1ZUV4aXN0cyA9IHRoaXMuY2hlY2tJZklzc3VlRXhpc3RzKGlzc3VlQ2F0ZWdvcnksIGlzc3VlU2V2ZXJpdHksIGRldGFpbHMsIGlzc3VlQ2F0ZWdvcnlUeXBlLCBzdWJDYXRlZ29yeSk7XG5cdFx0aWYgKCFjaGVja0lmSXNzdWVFeGlzdHMpIHtcblx0XHRcdHRoaXMuX2lzc3Vlcy5wdXNoKHtcblx0XHRcdFx0Y2F0ZWdvcnk6IGlzc3VlQ2F0ZWdvcnksXG5cdFx0XHRcdHNldmVyaXR5OiBpc3N1ZVNldmVyaXR5LFxuXHRcdFx0XHRkZXRhaWxzOiBkZXRhaWxzLFxuXHRcdFx0XHRzdWJDYXRlZ29yeTogc3ViQ2F0ZWdvcnlcblx0XHRcdH0pO1xuXHRcdH1cblx0fVxuXHRnZXRJc3N1ZXMoKTogSXNzdWVEZWZpbml0aW9uW10ge1xuXHRcdHJldHVybiB0aGlzLl9pc3N1ZXM7XG5cdH1cblx0Z2V0SXNzdWVzQnlDYXRlZ29yeShpbkNhdGVnb3J5OiBJc3N1ZUNhdGVnb3J5LCBzdWJDYXRlZ29yeT86IHN0cmluZyk6IElzc3VlRGVmaW5pdGlvbltdIHtcblx0XHRpZiAoc3ViQ2F0ZWdvcnkpIHtcblx0XHRcdHJldHVybiB0aGlzLl9pc3N1ZXMuZmlsdGVyKGlzc3VlID0+IGlzc3VlLmNhdGVnb3J5ID09PSBpbkNhdGVnb3J5ICYmIGlzc3VlLnN1YkNhdGVnb3J5ID09PSBzdWJDYXRlZ29yeSk7XG5cdFx0fSBlbHNlIHtcblx0XHRcdHJldHVybiB0aGlzLl9pc3N1ZXMuZmlsdGVyKGlzc3VlID0+IGlzc3VlLmNhdGVnb3J5ID09PSBpbkNhdGVnb3J5KTtcblx0XHR9XG5cdH1cblx0Y2hlY2tJZklzc3VlRXhpc3RzKFxuXHRcdGluQ2F0ZWdvcnk6IElzc3VlQ2F0ZWdvcnksXG5cdFx0c2V2ZXJpdHk6IElzc3VlU2V2ZXJpdHksXG5cdFx0ZGV0YWlsczogc3RyaW5nLFxuXHRcdGlzc3VlQ2F0ZWdvcnlUeXBlPzogYW55LFxuXHRcdGlzc3VlU3ViQ2F0ZWdvcnk/OiBzdHJpbmdcblx0KTogYm9vbGVhbiB7XG5cdFx0aWYgKGlzc3VlQ2F0ZWdvcnlUeXBlICYmIGlzc3VlQ2F0ZWdvcnlUeXBlW2luQ2F0ZWdvcnldICYmIGlzc3VlU3ViQ2F0ZWdvcnkpIHtcblx0XHRcdHJldHVybiB0aGlzLl9pc3N1ZXMuc29tZShcblx0XHRcdFx0aXNzdWUgPT5cblx0XHRcdFx0XHRpc3N1ZS5jYXRlZ29yeSA9PT0gaW5DYXRlZ29yeSAmJlxuXHRcdFx0XHRcdGlzc3VlLnNldmVyaXR5ID09PSBzZXZlcml0eSAmJlxuXHRcdFx0XHRcdGlzc3VlLmRldGFpbHMucmVwbGFjZSgvXFxuL2csIFwiXCIpID09PSBkZXRhaWxzLnJlcGxhY2UoL1xcbi9nLCBcIlwiKSAmJlxuXHRcdFx0XHRcdGlzc3VlLnN1YkNhdGVnb3J5ID09PSBpc3N1ZVN1YkNhdGVnb3J5XG5cdFx0XHQpO1xuXHRcdH1cblx0XHRyZXR1cm4gdGhpcy5faXNzdWVzLnNvbWUoXG5cdFx0XHRpc3N1ZSA9PlxuXHRcdFx0XHRpc3N1ZS5jYXRlZ29yeSA9PT0gaW5DYXRlZ29yeSAmJlxuXHRcdFx0XHRpc3N1ZS5zZXZlcml0eSA9PT0gc2V2ZXJpdHkgJiZcblx0XHRcdFx0aXNzdWUuZGV0YWlscy5yZXBsYWNlKC9cXG4vZywgXCJcIikgPT09IGRldGFpbHMucmVwbGFjZSgvXFxuL2csIFwiXCIpXG5cdFx0KTtcblx0fVxufVxuXG5leHBvcnQgZGVmYXVsdCBEaWFnbm9zdGljcztcbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkRpYWdub3N0aWNzLnRzIl0sIm5hbWVzIjpbIkRpYWdub3N0aWNzIiwiX2lzc3VlcyIsImFkZElzc3VlIiwiaXNzdWVDYXRlZ29yeSIsImlzc3VlU2V2ZXJpdHkiLCJkZXRhaWxzIiwiaXNzdWVDYXRlZ29yeVR5cGUiLCJzdWJDYXRlZ29yeSIsImNoZWNrSWZJc3N1ZUV4aXN0cyIsInB1c2giLCJjYXRlZ29yeSIsInNldmVyaXR5IiwiZ2V0SXNzdWVzIiwiZ2V0SXNzdWVzQnlDYXRlZ29yeSIsImluQ2F0ZWdvcnkiLCJmaWx0ZXIiLCJpc3N1ZSIsImlzc3VlU3ViQ2F0ZWdvcnkiLCJzb21lIiwicmVwbGFjZSJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7OztNQU1NQSxXO0FBRUwsMkJBQWM7QUFDYixXQUFLQyxPQUFMLEdBQWUsRUFBZjtBQUNBOzs7O1dBQ0RDLFEsR0FBQSxrQkFDQ0MsYUFERCxFQUVDQyxhQUZELEVBR0NDLE9BSEQsRUFJQ0MsaUJBSkQsRUFLQ0MsV0FMRCxFQU1RO0FBQ1AsVUFBTUMsa0JBQWtCLEdBQUcsS0FBS0Esa0JBQUwsQ0FBd0JMLGFBQXhCLEVBQXVDQyxhQUF2QyxFQUFzREMsT0FBdEQsRUFBK0RDLGlCQUEvRCxFQUFrRkMsV0FBbEYsQ0FBM0I7O0FBQ0EsVUFBSSxDQUFDQyxrQkFBTCxFQUF5QjtBQUN4QixhQUFLUCxPQUFMLENBQWFRLElBQWIsQ0FBa0I7QUFDakJDLFVBQUFBLFFBQVEsRUFBRVAsYUFETztBQUVqQlEsVUFBQUEsUUFBUSxFQUFFUCxhQUZPO0FBR2pCQyxVQUFBQSxPQUFPLEVBQUVBLE9BSFE7QUFJakJFLFVBQUFBLFdBQVcsRUFBRUE7QUFKSSxTQUFsQjtBQU1BO0FBQ0QsSzs7V0FDREssUyxHQUFBLHFCQUErQjtBQUM5QixhQUFPLEtBQUtYLE9BQVo7QUFDQSxLOztXQUNEWSxtQixHQUFBLDZCQUFvQkMsVUFBcEIsRUFBK0NQLFdBQS9DLEVBQXdGO0FBQ3ZGLFVBQUlBLFdBQUosRUFBaUI7QUFDaEIsZUFBTyxLQUFLTixPQUFMLENBQWFjLE1BQWIsQ0FBb0IsVUFBQUMsS0FBSztBQUFBLGlCQUFJQSxLQUFLLENBQUNOLFFBQU4sS0FBbUJJLFVBQW5CLElBQWlDRSxLQUFLLENBQUNULFdBQU4sS0FBc0JBLFdBQTNEO0FBQUEsU0FBekIsQ0FBUDtBQUNBLE9BRkQsTUFFTztBQUNOLGVBQU8sS0FBS04sT0FBTCxDQUFhYyxNQUFiLENBQW9CLFVBQUFDLEtBQUs7QUFBQSxpQkFBSUEsS0FBSyxDQUFDTixRQUFOLEtBQW1CSSxVQUF2QjtBQUFBLFNBQXpCLENBQVA7QUFDQTtBQUNELEs7O1dBQ0ROLGtCLEdBQUEsNEJBQ0NNLFVBREQsRUFFQ0gsUUFGRCxFQUdDTixPQUhELEVBSUNDLGlCQUpELEVBS0NXLGdCQUxELEVBTVc7QUFDVixVQUFJWCxpQkFBaUIsSUFBSUEsaUJBQWlCLENBQUNRLFVBQUQsQ0FBdEMsSUFBc0RHLGdCQUExRCxFQUE0RTtBQUMzRSxlQUFPLEtBQUtoQixPQUFMLENBQWFpQixJQUFiLENBQ04sVUFBQUYsS0FBSztBQUFBLGlCQUNKQSxLQUFLLENBQUNOLFFBQU4sS0FBbUJJLFVBQW5CLElBQ0FFLEtBQUssQ0FBQ0wsUUFBTixLQUFtQkEsUUFEbkIsSUFFQUssS0FBSyxDQUFDWCxPQUFOLENBQWNjLE9BQWQsQ0FBc0IsS0FBdEIsRUFBNkIsRUFBN0IsTUFBcUNkLE9BQU8sQ0FBQ2MsT0FBUixDQUFnQixLQUFoQixFQUF1QixFQUF2QixDQUZyQyxJQUdBSCxLQUFLLENBQUNULFdBQU4sS0FBc0JVLGdCQUpsQjtBQUFBLFNBREMsQ0FBUDtBQU9BOztBQUNELGFBQU8sS0FBS2hCLE9BQUwsQ0FBYWlCLElBQWIsQ0FDTixVQUFBRixLQUFLO0FBQUEsZUFDSkEsS0FBSyxDQUFDTixRQUFOLEtBQW1CSSxVQUFuQixJQUNBRSxLQUFLLENBQUNMLFFBQU4sS0FBbUJBLFFBRG5CLElBRUFLLEtBQUssQ0FBQ1gsT0FBTixDQUFjYyxPQUFkLENBQXNCLEtBQXRCLEVBQTZCLEVBQTdCLE1BQXFDZCxPQUFPLENBQUNjLE9BQVIsQ0FBZ0IsS0FBaEIsRUFBdUIsRUFBdkIsQ0FIakM7QUFBQSxPQURDLENBQVA7QUFNQSxLOzs7OztTQUdhbkIsVyIsInNvdXJjZVJvb3QiOiIuIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSXNzdWVDYXRlZ29yeSwgSXNzdWVTZXZlcml0eSB9IGZyb20gXCJzYXAvZmUvY29yZS9jb252ZXJ0ZXJzL2hlbHBlcnMvSXNzdWVNYW5hZ2VyXCI7XG5cbmV4cG9ydCB0eXBlIElzc3VlRGVmaW5pdGlvbiA9IHtcblx0Y2F0ZWdvcnk6IElzc3VlQ2F0ZWdvcnk7XG5cdHNldmVyaXR5OiBJc3N1ZVNldmVyaXR5O1xuXHRkZXRhaWxzOiBzdHJpbmc7XG5cdHN1YkNhdGVnb3J5Pzogc3RyaW5nIHwgdW5kZWZpbmVkO1xufTtcbmNsYXNzIERpYWdub3N0aWNzIHtcblx0X2lzc3VlczogSXNzdWVEZWZpbml0aW9uW107XG5cdGNvbnN0cnVjdG9yKCkge1xuXHRcdHRoaXMuX2lzc3VlcyA9IFtdO1xuXHR9XG5cdGFkZElzc3VlKFxuXHRcdGlzc3VlQ2F0ZWdvcnk6IElzc3VlQ2F0ZWdvcnksXG5cdFx0aXNzdWVTZXZlcml0eTogSXNzdWVTZXZlcml0eSxcblx0XHRkZXRhaWxzOiBzdHJpbmcsXG5cdFx0aXNzdWVDYXRlZ29yeVR5cGU/OiBhbnkgfCB1bmRlZmluZWQsXG5cdFx0c3ViQ2F0ZWdvcnk/OiBzdHJpbmcgfCB1bmRlZmluZWRcblx0KTogdm9pZCB7XG5cdFx0Y29uc3QgY2hlY2tJZklzc3VlRXhpc3RzID0gdGhpcy5jaGVja0lmSXNzdWVFeGlzdHMoaXNzdWVDYXRlZ29yeSwgaXNzdWVTZXZlcml0eSwgZGV0YWlscywgaXNzdWVDYXRlZ29yeVR5cGUsIHN1YkNhdGVnb3J5KTtcblx0XHRpZiAoIWNoZWNrSWZJc3N1ZUV4aXN0cykge1xuXHRcdFx0dGhpcy5faXNzdWVzLnB1c2goe1xuXHRcdFx0XHRjYXRlZ29yeTogaXNzdWVDYXRlZ29yeSxcblx0XHRcdFx0c2V2ZXJpdHk6IGlzc3VlU2V2ZXJpdHksXG5cdFx0XHRcdGRldGFpbHM6IGRldGFpbHMsXG5cdFx0XHRcdHN1YkNhdGVnb3J5OiBzdWJDYXRlZ29yeVxuXHRcdFx0fSk7XG5cdFx0fVxuXHR9XG5cdGdldElzc3VlcygpOiBJc3N1ZURlZmluaXRpb25bXSB7XG5cdFx0cmV0dXJuIHRoaXMuX2lzc3Vlcztcblx0fVxuXHRnZXRJc3N1ZXNCeUNhdGVnb3J5KGluQ2F0ZWdvcnk6IElzc3VlQ2F0ZWdvcnksIHN1YkNhdGVnb3J5Pzogc3RyaW5nKTogSXNzdWVEZWZpbml0aW9uW10ge1xuXHRcdGlmIChzdWJDYXRlZ29yeSkge1xuXHRcdFx0cmV0dXJuIHRoaXMuX2lzc3Vlcy5maWx0ZXIoaXNzdWUgPT4gaXNzdWUuY2F0ZWdvcnkgPT09IGluQ2F0ZWdvcnkgJiYgaXNzdWUuc3ViQ2F0ZWdvcnkgPT09IHN1YkNhdGVnb3J5KTtcblx0XHR9IGVsc2Uge1xuXHRcdFx0cmV0dXJuIHRoaXMuX2lzc3Vlcy5maWx0ZXIoaXNzdWUgPT4gaXNzdWUuY2F0ZWdvcnkgPT09IGluQ2F0ZWdvcnkpO1xuXHRcdH1cblx0fVxuXHRjaGVja0lmSXNzdWVFeGlzdHMoXG5cdFx0aW5DYXRlZ29yeTogSXNzdWVDYXRlZ29yeSxcblx0XHRzZXZlcml0eTogSXNzdWVTZXZlcml0eSxcblx0XHRkZXRhaWxzOiBzdHJpbmcsXG5cdFx0aXNzdWVDYXRlZ29yeVR5cGU/OiBhbnksXG5cdFx0aXNzdWVTdWJDYXRlZ29yeT86IHN0cmluZ1xuXHQpOiBib29sZWFuIHtcblx0XHRpZiAoaXNzdWVDYXRlZ29yeVR5cGUgJiYgaXNzdWVDYXRlZ29yeVR5cGVbaW5DYXRlZ29yeV0gJiYgaXNzdWVTdWJDYXRlZ29yeSkge1xuXHRcdFx0cmV0dXJuIHRoaXMuX2lzc3Vlcy5zb21lKFxuXHRcdFx0XHRpc3N1ZSA9PlxuXHRcdFx0XHRcdGlzc3VlLmNhdGVnb3J5ID09PSBpbkNhdGVnb3J5ICYmXG5cdFx0XHRcdFx0aXNzdWUuc2V2ZXJpdHkgPT09IHNldmVyaXR5ICYmXG5cdFx0XHRcdFx0aXNzdWUuZGV0YWlscy5yZXBsYWNlKC9cXG4vZywgXCJcIikgPT09IGRldGFpbHMucmVwbGFjZSgvXFxuL2csIFwiXCIpICYmXG5cdFx0XHRcdFx0aXNzdWUuc3ViQ2F0ZWdvcnkgPT09IGlzc3VlU3ViQ2F0ZWdvcnlcblx0XHRcdCk7XG5cdFx0fVxuXHRcdHJldHVybiB0aGlzLl9pc3N1ZXMuc29tZShcblx0XHRcdGlzc3VlID0+XG5cdFx0XHRcdGlzc3VlLmNhdGVnb3J5ID09PSBpbkNhdGVnb3J5ICYmXG5cdFx0XHRcdGlzc3VlLnNldmVyaXR5ID09PSBzZXZlcml0eSAmJlxuXHRcdFx0XHRpc3N1ZS5kZXRhaWxzLnJlcGxhY2UoL1xcbi9nLCBcIlwiKSA9PT0gZGV0YWlscy5yZXBsYWNlKC9cXG4vZywgXCJcIilcblx0XHQpO1xuXHR9XG59XG5cbmV4cG9ydCBkZWZhdWx0IERpYWdub3N0aWNzO1xuIl19

package/packages/sap.fe.core/src/sap/fe/core/support/Diagnostics.js

@@ -2,4 +2,4 @@
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define([],function(){"use strict";function _(i,C){if(!(i instanceof C)){throw new TypeError("Cannot call a class as a function");}}function a(t,p){for(var i=0;i<p.length;i++){var d=p[i];d.enumerable=d.enumerable||false;d.configurable=true;if("value"in d)d.writable=true;Object.defineProperty(t,d.key,d);}}function b(C,p,s){if(p)a(C.prototype,p);if(s)a(C,s);return C;}var D=function(){function D(){_(this,D);this._issues=[];}b(D,[{key:"addIssue",value:function g(i,c,d,e,s){var f=this.checkIfIssueExists(i,c,d,e,s);if(!f){this._issues.push({category:i,severity:c,details:d,subCategory:s});}}},{key:"getIssues",value:function g(){return this._issues;}},{key:"getIssuesByCategory",value:function g(i,s){if(s){return this._issues.filter(function(c){return c.category===i&&c.subCategory===s;});}else{return this._issues.filter(function(c){return c.category===i;});}}},{key:"checkIfIssueExists",value:function f(i,s,d,c,e){if(c&&c[i]&&e){return this._issues.some(function(g){return g.category===i&&g.severity===s&&g.details.replace(/\n/g,"")===d.replace(/\n/g,"")&&g.subCategory===e;});}return this._issues.some(function(g){return g.category===i&&g.severity===s&&g.details.replace(/\n/g,"")===d.replace(/\n/g,"");});}}]);return D;}();return D;},false);
+sap.ui.define([],function(){"use strict";var D=function(){function D(){this._issues=[];}var _=D.prototype;_.addIssue=function e(i,a,d,b,s){var c=this.checkIfIssueExists(i,a,d,b,s);if(!c){this._issues.push({category:i,severity:a,details:d,subCategory:s});}};_.getIssues=function g(){return this._issues;};_.getIssuesByCategory=function g(i,s){if(s){return this._issues.filter(function(a){return a.category===i&&a.subCategory===s;});}else{return this._issues.filter(function(a){return a.category===i;});}};_.checkIfIssueExists=function c(i,s,d,a,b){if(a&&a[i]&&b){return this._issues.some(function(e){return e.category===i&&e.severity===s&&e.details.replace(/\n/g,"")===d.replace(/\n/g,"")&&e.subCategory===b;});}return this._issues.some(function(e){return e.category===i&&e.severity===s&&e.details.replace(/\n/g,"")===d.replace(/\n/g,"");});};return D;}();return D;},false);