@wavemaker/app-ng-runtime 12.0.0-next.1417180 → 12.0.0-next.1417190

app-ng-runtime/runtime/base/esm2022/util/utils.mjs

@@ -1,6 +1,10 @@
+import { _WM_APP_PROJECT } from "@wm/core";
 export const isPrefabInPreview = (prefabName) => prefabName === '__self__';
-export const getPrefabBaseUrl = (prefabName) => isPrefabInPreview(prefabName) ? '.' : `ng-bundle/resources/${prefabName}`;
+export const getPrefabBaseUrl = (prefabName) => {
+    const basePath = _WM_APP_PROJECT.isPreview ? 'app/prefabs' : _WM_APP_PROJECT.cdnUrl + 'resources';
+    return isPrefabInPreview(prefabName) ? '.' : basePath + `/${prefabName}`;
+};
 export const getPrefabConfigUrl = (prefabName) => `${getPrefabBaseUrl(prefabName)}/config.json`;
 export const getPrefabMinJsonUrl = (prefabName) => `${getPrefabBaseUrl(prefabName)}/pages/Main/page.min.json`;
 export const getPrefabPartialJsonUrl = (prefabName, partialName) => `${getPrefabBaseUrl(prefabName)}/pages/${partialName}/page.min.json`;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9ydW50aW1lLWJhc2Uvc3JjL3V0aWwvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxDQUFDLE1BQU0saUJBQWlCLEdBQUcsQ0FBQyxVQUFrQixFQUFFLEVBQUUsQ0FBQyxVQUFVLEtBQUssVUFBVSxDQUFDO0FBRW5GLE1BQU0sQ0FBQyxNQUFNLGdCQUFnQixHQUFHLENBQUMsVUFBa0IsRUFBRSxFQUFFLENBQUMsaUJBQWlCLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsdUJBQXVCLFVBQVUsRUFBRSxDQUFDO0FBRWxJLE1BQU0sQ0FBQyxNQUFNLGtCQUFrQixHQUFHLENBQUMsVUFBa0IsRUFBRSxFQUFFLENBQUMsR0FBRyxnQkFBZ0IsQ0FBQyxVQUFVLENBQUMsY0FBYyxDQUFDO0FBRXhHLE1BQU0sQ0FBQyxNQUFNLG1CQUFtQixHQUFHLENBQUMsVUFBa0IsRUFBRSxFQUFFLENBQUMsR0FBRyxnQkFBZ0IsQ0FBQyxVQUFVLENBQUMsMkJBQTJCLENBQUM7QUFFdEgsTUFBTSxDQUFDLE1BQU0sdUJBQXVCLEdBQUcsQ0FBQyxVQUFrQixFQUFFLFdBQW1CLEVBQUUsRUFBRSxDQUFDLEdBQUcsZ0JBQWdCLENBQUMsVUFBVSxDQUFDLFVBQVUsV0FBVyxnQkFBZ0IsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBjb25zdCBpc1ByZWZhYkluUHJldmlldyA9IChwcmVmYWJOYW1lOiBzdHJpbmcpID0+IHByZWZhYk5hbWUgPT09ICdfX3NlbGZfXyc7XG5cbmV4cG9ydCBjb25zdCBnZXRQcmVmYWJCYXNlVXJsID0gKHByZWZhYk5hbWU6IHN0cmluZykgPT4gaXNQcmVmYWJJblByZXZpZXcocHJlZmFiTmFtZSkgPyAnLicgOiBgbmctYnVuZGxlL3Jlc291cmNlcy8ke3ByZWZhYk5hbWV9YDtcblxuZXhwb3J0IGNvbnN0IGdldFByZWZhYkNvbmZpZ1VybCA9IChwcmVmYWJOYW1lOiBzdHJpbmcpID0+IGAke2dldFByZWZhYkJhc2VVcmwocHJlZmFiTmFtZSl9L2NvbmZpZy5qc29uYDtcblxuZXhwb3J0IGNvbnN0IGdldFByZWZhYk1pbkpzb25VcmwgPSAocHJlZmFiTmFtZTogc3RyaW5nKSA9PiBgJHtnZXRQcmVmYWJCYXNlVXJsKHByZWZhYk5hbWUpfS9wYWdlcy9NYWluL3BhZ2UubWluLmpzb25gO1xuXG5leHBvcnQgY29uc3QgZ2V0UHJlZmFiUGFydGlhbEpzb25VcmwgPSAocHJlZmFiTmFtZTogc3RyaW5nLCBwYXJ0aWFsTmFtZTogc3RyaW5nKSA9PiBgJHtnZXRQcmVmYWJCYXNlVXJsKHByZWZhYk5hbWUpfS9wYWdlcy8ke3BhcnRpYWxOYW1lfS9wYWdlLm1pbi5qc29uYDtcbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9ydW50aW1lLWJhc2Uvc3JjL3V0aWwvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFDLGVBQWUsRUFBQyxNQUFNLFVBQVUsQ0FBQztBQUV6QyxNQUFNLENBQUMsTUFBTSxpQkFBaUIsR0FBRyxDQUFDLFVBQWtCLEVBQUUsRUFBRSxDQUFDLFVBQVUsS0FBSyxVQUFVLENBQUM7QUFFbkYsTUFBTSxDQUFDLE1BQU0sZ0JBQWdCLEdBQUcsQ0FBQyxVQUFrQixFQUFFLEVBQUU7SUFDbkQsTUFBTSxRQUFRLEdBQUcsZUFBZSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQyxlQUFlLENBQUMsTUFBTSxHQUFHLFdBQVcsQ0FBQztJQUNuRyxPQUFPLGlCQUFpQixDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFFLFFBQVEsR0FBRyxJQUFJLFVBQVUsRUFBRSxDQUFBO0FBQzVFLENBQUMsQ0FBQztBQUVGLE1BQU0sQ0FBQyxNQUFNLGtCQUFrQixHQUFHLENBQUMsVUFBa0IsRUFBRSxFQUFFLENBQUMsR0FBRyxnQkFBZ0IsQ0FBQyxVQUFVLENBQUMsY0FBYyxDQUFDO0FBRXhHLE1BQU0sQ0FBQyxNQUFNLG1CQUFtQixHQUFHLENBQUMsVUFBa0IsRUFBRSxFQUFFLENBQUMsR0FBRyxnQkFBZ0IsQ0FBQyxVQUFVLENBQUMsMkJBQTJCLENBQUM7QUFFdEgsTUFBTSxDQUFDLE1BQU0sdUJBQXVCLEdBQUcsQ0FBQyxVQUFrQixFQUFFLFdBQW1CLEVBQUUsRUFBRSxDQUFDLEdBQUcsZ0JBQWdCLENBQUMsVUFBVSxDQUFDLFVBQVUsV0FBVyxnQkFBZ0IsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7X1dNX0FQUF9QUk9KRUNUfSBmcm9tIFwiQHdtL2NvcmVcIjtcblxuZXhwb3J0IGNvbnN0IGlzUHJlZmFiSW5QcmV2aWV3ID0gKHByZWZhYk5hbWU6IHN0cmluZykgPT4gcHJlZmFiTmFtZSA9PT0gJ19fc2VsZl9fJztcblxuZXhwb3J0IGNvbnN0IGdldFByZWZhYkJhc2VVcmwgPSAocHJlZmFiTmFtZTogc3RyaW5nKSA9PiB7XG4gICAgY29uc3QgYmFzZVBhdGggPSBfV01fQVBQX1BST0pFQ1QuaXNQcmV2aWV3ID8gJ2FwcC9wcmVmYWJzJyA6IF9XTV9BUFBfUFJPSkVDVC5jZG5VcmwgKyAncmVzb3VyY2VzJztcbiAgIHJldHVybiBpc1ByZWZhYkluUHJldmlldyhwcmVmYWJOYW1lKSA/ICcuJyA6ICBiYXNlUGF0aCArIGAvJHtwcmVmYWJOYW1lfWBcbn07XG5cbmV4cG9ydCBjb25zdCBnZXRQcmVmYWJDb25maWdVcmwgPSAocHJlZmFiTmFtZTogc3RyaW5nKSA9PiBgJHtnZXRQcmVmYWJCYXNlVXJsKHByZWZhYk5hbWUpfS9jb25maWcuanNvbmA7XG5cbmV4cG9ydCBjb25zdCBnZXRQcmVmYWJNaW5Kc29uVXJsID0gKHByZWZhYk5hbWU6IHN0cmluZykgPT4gYCR7Z2V0UHJlZmFiQmFzZVVybChwcmVmYWJOYW1lKX0vcGFnZXMvTWFpbi9wYWdlLm1pbi5qc29uYDtcblxuZXhwb3J0IGNvbnN0IGdldFByZWZhYlBhcnRpYWxKc29uVXJsID0gKHByZWZhYk5hbWU6IHN0cmluZywgcGFydGlhbE5hbWU6IHN0cmluZykgPT4gYCR7Z2V0UHJlZmFiQmFzZVVybChwcmVmYWJOYW1lKX0vcGFnZXMvJHtwYXJ0aWFsTmFtZX0vcGFnZS5taW4uanNvbmA7XG4iXX0=

app-ng-runtime/runtime/base/fesm2022/index.mjs

@@ -5,7 +5,7 @@ import { ActivatedRoute, Router, RouterOutlet, NavigationStart, NavigationEnd, N
 import * as i1$2 from '@angular/common';
 import { AsyncPipe, SlicePipe, PercentPipe, I18nPluralPipe, NgLocalization, I18nSelectPipe, KeyValuePipe, UpperCasePipe, LowerCasePipe, JsonPipe, DecimalPipe, TitleCasePipe, CurrencyPipe, DatePipe, DOCUMENT, ɵgetDOM as _getDOM, CommonModule } from '@angular/common';
 import * as i1 from '@wm/core';
-import { $appDigest, isDefined, triggerFn, fetchContent, stringStartsWith, loadStyleSheets, loadScripts, noop as noop$1, App, AbstractI18nService, ScriptLoaderService, Viewport, UtilsService, $invokeWatchers, registerFnByExpr, LRUCache, muteWatchers, AbstractNavigationService, getWmProjectProperties, isMobileApp, isIos, isAndroid, unMuteWatchers, $watch, isIE, CustomPipeManager, getSessionStorageItem, AbstractDialogService, StatePersistence, AbstractSpinnerService, AbstractToasterService, ConstantService, FieldTypeService, FieldWidgetService, DynamicComponentRefProvider, EventNotifier, setCSS, _WM_APP_PROJECT, isMobile, setSessionStorageItem, replace, setPipeProvider, setNgZone, setAppRef, addClass, removeClass, hasCordova, extendProto, $parseExpr, AppDefaults, isObject as isObject$1, isIphone, isIpod, isIpad, CoreModule } from '@wm/core';
+import { $appDigest, isDefined, triggerFn, fetchContent, _WM_APP_PROJECT, stringStartsWith, loadStyleSheets, loadScripts, noop as noop$1, App, AbstractI18nService, ScriptLoaderService, Viewport, UtilsService, $invokeWatchers, registerFnByExpr, LRUCache, muteWatchers, AbstractNavigationService, getWmProjectProperties, isMobileApp, isIos, isAndroid, unMuteWatchers, $watch, isIE, CustomPipeManager, getSessionStorageItem, AbstractDialogService, StatePersistence, AbstractSpinnerService, AbstractToasterService, ConstantService, FieldTypeService, FieldWidgetService, DynamicComponentRefProvider, EventNotifier, setCSS, isMobile, setSessionStorageItem, replace, setPipeProvider, setNgZone, setAppRef, addClass, removeClass, hasCordova, extendProto, $parseExpr, AppDefaults, isObject as isObject$1, isIphone, isIpod, isIpad, CoreModule } from '@wm/core';
 import * as i2 from '@wm/security';
 import { SecurityModule } from '@wm/security';
 import * as i4 from '@wm/variables';
@@ -591,7 +591,10 @@ class AppManagerService {
     }], () => [{ type: i1.AbstractHttpService }, { type: i2.SecurityService }, { type: i1.AbstractDialogService }, { type: i1$1.Router }, { type: i1.App }, { type: i4.VariablesService }, { type: i4.MetadataService }, { type: i1.AbstractSpinnerService }, { type: i1.AbstractI18nService }, { type: i1$2.DatePipe }], null); })();
 
 const isPrefabInPreview = (prefabName) => prefabName === '__self__';
-const getPrefabBaseUrl = (prefabName) => isPrefabInPreview(prefabName) ? '.' : `ng-bundle/resources/${prefabName}`;
+const getPrefabBaseUrl = (prefabName) => {
+    const basePath = _WM_APP_PROJECT.isPreview ? 'app/prefabs' : _WM_APP_PROJECT.cdnUrl + 'resources';
+    return isPrefabInPreview(prefabName) ? '.' : basePath + `/${prefabName}`;
+};
 const getPrefabConfigUrl = (prefabName) => `${getPrefabBaseUrl(prefabName)}/config.json`;
 const getPrefabMinJsonUrl = (prefabName) => `${getPrefabBaseUrl(prefabName)}/pages/Main/page.min.json`;
 const getPrefabPartialJsonUrl = (prefabName, partialName) => `${getPrefabBaseUrl(prefabName)}/pages/${partialName}/page.min.json`;
@@ -602,7 +605,7 @@ const resolvedPrefabs = new Set();
 const getPrefabResourceUrl = (resourcePath, resourceBasePath) => {
     let _url = resourcePath;
     if (!stringStartsWith(resourcePath, 'http://|https://|//')) {
-        _url = (resourceBasePath + _url).replace('//', '/');
+        _url = (resourceBasePath + _url);
     }
     return _url;
 };
@@ -2761,7 +2764,7 @@ class ToasterServiceImpl extends AbstractToasterService {
         type: Injectable
     }], () => [{ type: i1$3.ToastrService }], null); })();
 
-const APP_LOCALE_ROOT_PATH = './ng-bundle/resources/i18n';
+const APP_LOCALE_ROOT_PATH = 'resources/i18n';
 const RTL_LANGUAGE_CODES = ['ar', 'ar-001', 'ar-ae', 'ar-bh', 'ar-dz', 'ar-eg', 'ar-iq', 'ar-jo', 'ar-kw', 'ar-lb', 'ar-ly',
     'ar-ma', 'ar-om', 'ar-qa', 'ar-sa', 'ar-sd', 'ar-sy', 'ar-tn', 'ar-ye', 'arc', 'bcc', 'bqi', 'ckb', 'dv', 'fa', 'glk',
     'he', 'ku', 'mzn', 'pnb', 'ps', 'sd', 'ug', 'ur', 'yi'];
@@ -2832,7 +2835,8 @@ class I18nServiceImpl extends AbstractI18nService {
         });
     }
     loadAppLocaleBundle() {
-        this.loadResource(`${APP_LOCALE_ROOT_PATH}/${this.selectedLocale}.json`)
+        const basePath = _WM_APP_PROJECT.isPreview ? '' : _WM_APP_PROJECT.cdnUrl;
+        this.loadResource(basePath + `${APP_LOCALE_ROOT_PATH}/${this.selectedLocale}.json`)
             .then(bundle => {
             this.extendMessages(bundle.messages);
             this.extendPrefabMessages(bundle);
@@ -3936,6 +3940,11 @@ class HttpCallInterceptor {
     intercept(request, next) {
         let modifiedReq;
         let modifiedResp;
+        let isServicesUrl = request.url.indexOf("services/") !== -1;
+        if (isServicesUrl) {
+            let apiUrl = _WM_APP_PROJECT.apiUrl + request.url;
+            request = request.clone({ url: apiUrl });
+        }
         if (appManager && appManager.appOnBeforeServiceCall) {
             // Convert the angular HttpRequest to wm HttpRequest
             const req = this.wmHttpRequest.angularToWmRequest(request);
@@ -4635,12 +4644,15 @@ ShadowDomRenderer = __decorate([
 
 const initializeProjectDetails = () => {
     let cdnUrl = document.querySelector('[name="deployUrl"]') && document.querySelector('[name="deployUrl"]').getAttribute('content');
+    _WM_APP_PROJECT.isPreview = cdnUrl ? false : true;
+    let apiUrl = document.querySelector('[name="apiUrl"]') && document.querySelector('[name="apiUrl"]').getAttribute('content');
     //for preview
     if (!cdnUrl) {
         cdnUrl = document.querySelector('[name="cdnUrl"]') && document.querySelector('[name="cdnUrl"]').getAttribute('content');
     }
     _WM_APP_PROJECT.id = hasCordova() ? _WM_APP_PROPERTIES.displayName : location.href.split('/')[3];
     // Integration with third party apps like in SSPA/WebComponents, this meta tag with cdnUrl will not be there then default it to ng-bundle/
+    _WM_APP_PROJECT.apiUrl = apiUrl || './';
     _WM_APP_PROJECT.cdnUrl = cdnUrl || 'ng-bundle/';
     _WM_APP_PROJECT.ngDest = 'ng-bundle/';
     try {