mmhglobal-dynamicform 2.41.2 → 2.41.4

package/fesm2020/mmhglobal-dynamicform.mjs

@@ -875,7 +875,7 @@ class MainService {
         };
         console.log('MainService constructor');
         this.environment = this.zcoreService.getEnvironment();
-        this.oauthEnvironmentUrl = this.environment.e1OauthUrl + '/';
+        this.oauthEnvironmentUrl = this.zcoreService.getOauthUrl();
         this.router.events.subscribe((event) => {
             if (event instanceof NavigationStart) {
                 this.handleNavigationStart(event);
@@ -5414,7 +5414,6 @@ class UicontentComponent {
         console.log(this.group);
     }
     isSITEnvironment() {
-        // return environment.e1OauthUrl.startsWith('https://oauthdev.');
         return this.zcoreService.isDebugSession() && !this.isFieldElement();
     }
     isFieldElement() {
@@ -9103,7 +9102,7 @@ class ZuploadComponent extends InputFieldBase {
             size: 102400,
             maxAutoRetries: 3,
         };
-        this.uploadAttachmentUrl = this.zcoreService.getEnvironment().uploadAttachmentUrl;
+        this.uploadAttachmentUrl = this.zcoreService.normalizeUrl(this.zcoreService.getEnvironment().uploadAttachmentUrl);
         this.uploadSaveUrl = this.uploadAttachmentUrl + this.uploadSaveUrl;
         this.uploadRemoveUrl = this.uploadAttachmentUrl + this.uploadRemoveUrl;
     }
@@ -10140,7 +10139,7 @@ class ZgridComponent extends DataListingFieldBase {
             }
         };
         this.environment = this.zcoreService.getEnvironment();
-        this.oauthUrl = `${this.environment.e1OauthUrl}/`;
+        this.oauthUrl = this.zcoreService.getOauthUrl();
         this.allResults = this.allResults.bind(this);
         this.refreshData = this.refreshData.bind(this);
         this.clearData = this.clearData.bind(this);
@@ -11779,13 +11778,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.3", ngImpor
 
 /********** Angular **********/
 class ZreportComponent extends FieldBase {
-    constructor(componentService, fontAweSomeService, resourceApiService, authService, alertService) {
+    constructor(componentService, fontAweSomeService, resourceApiService, authService, alertService, zcoreService) {
         super(componentService);
         this.componentService = componentService;
         this.fontAweSomeService = fontAweSomeService;
         this.resourceApiService = resourceApiService;
         this.authService = authService;
         this.alertService = alertService;
+        this.zcoreService = zcoreService;
         this.allowPrintPDF = true;
         this.serviceUrl = null;
         this.reportSource = null;
@@ -11934,18 +11934,18 @@ class ZreportComponent extends FieldBase {
             this.reportSource.parameters.Authorization = this.authService.authorizationBearer.Authorization;
         }
         if (this.reportSource['url']) {
-            this.serviceUrl = this.reportSource['url'];
+            this.serviceUrl = this.zcoreService.normalizeUrl(this.reportSource['url']);
         }
         this.viewer.setReportSource(this.reportSource);
         //this.viewer.refreshReport();
     }
 }
-ZreportComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.3", ngImport: i0, type: ZreportComponent, deps: [{ token: ZComponentService }, { token: i2.FontAweSomeService }, { token: i2.ResourceApiService }, { token: i2.AuthService }, { token: i2.AlertService }], target: i0.ɵɵFactoryTarget.Component });
+ZreportComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.3", ngImport: i0, type: ZreportComponent, deps: [{ token: ZComponentService }, { token: i2.FontAweSomeService }, { token: i2.ResourceApiService }, { token: i2.AuthService }, { token: i2.AlertService }, { token: i2.ZCoreService }], target: i0.ɵɵFactoryTarget.Component });
 ZreportComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.3", type: ZreportComponent, selector: "app-zreport", host: { listeners: { "window:resize": "onResize($event)" } }, viewQueries: [{ propertyName: "viewer", first: true, predicate: ["reportViewer1"], descendants: true }], usesInheritance: true, ngImport: i0, template: "<div width=\"100%\" height=\"800px\"> \r\n  <tr-viewer #reportViewer1\r\n             [containerStyle]=\"viewerContainerStyle\"\r\n             [serviceUrl]=\"serviceUrl\"\r\n             [reportSource]=\"reportSource\"\r\n             [viewMode]=\"'INTERACTIVE'\"\r\n             [scaleMode]=\"'SPECIFIC'\"\r\n             [scale]=\"1.0\"\r\n             [enableAccessibility]=\"false\"\r\n             [ready]=\"onReady\" \r\n             [exportBegin]=\"onExportBegin\"\r\n             [exportEnd]=\"onExportEnd\"\r\n             [renderingBegin]=\"onRenderingBegin\"\r\n             [renderingEnd]=\"onRenderingEnd\"\r\n             [printBegin]=\"onPrintBegin\"\r\n             [printEnd]=\"onPrintEnd\">\r\n  </tr-viewer>\r\n</div>\r\n", styles: ["#reportViewer1{height:200px}#reportViewer1 .k-splitter .k-scrollable{overflow:hidden}.k-pdf-export,.k-pdf-export *{font-family:Arial Unicode MS}\n"], components: [{ type: i3$9.TelerikReportViewerComponent, selector: "tr-viewer", inputs: ["id", "serviceUrl", "reportServer", "templateUrl", "initialPageAreaImageUrl", "reportSource", "sendEmail", "parameters", "scale", "scaleMode", "viewMode", "pageMode", "persistSession", "parameterEditors", "authenticationToken", "printMode", "selector", "disabledButtonClass", "checkedButtonClass", "enableAccessibility", "searchMetadataOnDemand", "parametersAreaVisible", "documentMapVisible", "ready", "error", "parametersAreaPosition", "documentMapAreaPosition", "exportBegin", "exportEnd", "sendEmailBegin", "sendEmailEnd", "pageReady", "printBegin", "printEnd", "renderingBegin", "renderingEnd", "updateUi", "interactiveActionExecuting", "interactiveActionEnter", "interactiveActionLeave", "viewerToolTipOpening", "keepClientAlive", "containerStyle"] }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.3", ngImport: i0, type: ZreportComponent, decorators: [{
             type: Component,
             args: [{ selector: "app-zreport", template: "<div width=\"100%\" height=\"800px\"> \r\n  <tr-viewer #reportViewer1\r\n             [containerStyle]=\"viewerContainerStyle\"\r\n             [serviceUrl]=\"serviceUrl\"\r\n             [reportSource]=\"reportSource\"\r\n             [viewMode]=\"'INTERACTIVE'\"\r\n             [scaleMode]=\"'SPECIFIC'\"\r\n             [scale]=\"1.0\"\r\n             [enableAccessibility]=\"false\"\r\n             [ready]=\"onReady\" \r\n             [exportBegin]=\"onExportBegin\"\r\n             [exportEnd]=\"onExportEnd\"\r\n             [renderingBegin]=\"onRenderingBegin\"\r\n             [renderingEnd]=\"onRenderingEnd\"\r\n             [printBegin]=\"onPrintBegin\"\r\n             [printEnd]=\"onPrintEnd\">\r\n  </tr-viewer>\r\n</div>\r\n", styles: ["#reportViewer1{height:200px}#reportViewer1 .k-splitter .k-scrollable{overflow:hidden}.k-pdf-export,.k-pdf-export *{font-family:Arial Unicode MS}\n"] }]
-        }], ctorParameters: function () { return [{ type: ZComponentService }, { type: i2.FontAweSomeService }, { type: i2.ResourceApiService }, { type: i2.AuthService }, { type: i2.AlertService }]; }, propDecorators: { viewer: [{
+        }], ctorParameters: function () { return [{ type: ZComponentService }, { type: i2.FontAweSomeService }, { type: i2.ResourceApiService }, { type: i2.AuthService }, { type: i2.AlertService }, { type: i2.ZCoreService }]; }, propDecorators: { viewer: [{
                 type: ViewChild,
                 args: ['reportViewer1', { static: false }]
             }], onResize: [{