ontimize-web-ngx 15.6.0-next.9 → 15.6.1

package/fesm2020/ontimize-web-ngx.mjs

@@ -1,5 +1,5 @@
 import * as i0 from '@angular/core';
-import { InjectionToken, Pipe, EventEmitter, Directive, Host, Self, Optional, Input, HostListener, forwardRef, Output, Injectable, Injector, Component, ContentChildren, ChangeDetectorRef, NgModule, ViewChild, ElementRef, ViewEncapsulation, inject, ViewContainerRef, Inject, NgZone, HostBinding, ViewChildren, ChangeDetectionStrategy, CUSTOM_ELEMENTS_SCHEMA, TemplateRef, SkipSelf, isDevMode, ContentChild, Renderer2, APP_INITIALIZER } from '@angular/core';
+import { InjectionToken, Pipe, EventEmitter, Directive, Host, Self, Optional, Input, HostListener, forwardRef, Output, Injectable, Injector, Component, ContentChildren, ChangeDetectorRef, NgModule, ViewChild, ElementRef, ViewEncapsulation, ViewContainerRef, Inject, NgZone, HostBinding, ViewChildren, ChangeDetectionStrategy, inject, CUSTOM_ELEMENTS_SCHEMA, TemplateRef, SkipSelf, isDevMode, ContentChild, Renderer2, APP_INITIALIZER } from '@angular/core';
 import moment from 'moment';
 import { isObservable, from, of, Subscription, Observable, Subject, share as share$1, timer, combineLatest, BehaviorSubject, ReplaySubject, concatMap, delay, merge, fromEvent, map as map$1 } from 'rxjs';
 export { Observable, Subject } from 'rxjs';
@@ -4379,8 +4379,8 @@ class JSONAPIService extends BaseDataService {
         this.injector = injector;
         this.DEFAULT_DELIMITER = '_';
         this.config = this.injector.get(AppConfig);
-        const config = inject(O_JSON_API_CONFIG);
-        this.delimiter = config?.multipleKeyDelimiter || this.DEFAULT_DELIMITER;
+        const jsonApiConfig = this.injector.get(O_JSON_API_CONFIG);
+        this.delimiter = jsonApiConfig?.multipleKeyDelimiter || this.DEFAULT_DELIMITER;
     }
     startsession(user, password) {
         const url = this.urlBase + this._startSessionPath;
@@ -6731,15 +6731,29 @@ var ServiceType;
 class FactoryUtil {
     static isJsonApiService(injector) {
         const config = injector.get(AppConfig);
-        return config.getConfiguration().serviceType === 'JSONAPI' ||
-            config.getConfiguration().serviceType instanceof JSONAPIService;
+        const serviceType = config.getConfiguration().serviceType;
+        return serviceType === 'JSONAPI' ||
+            FactoryUtil.isJSONAPISubclass(serviceType);
     }
     static isOntimizeEEService(injector) {
         const config = injector.get(AppConfig);
-        return (config.getConfiguration().serviceType === 'OntimizeEE' ||
-            config.getConfiguration().serviceType instanceof OntimizeEEService) ||
-            (config.getConfiguration().serviceType === 'Ontimize' ||
-                config.getConfiguration().serviceType instanceof OntimizeService);
+        const serviceType = config.getConfiguration().serviceType;
+        return (serviceType === 'OntimizeEE' ||
+            FactoryUtil.isOntimizeEESubclass(serviceType)) ||
+            (serviceType === 'Ontimize' ||
+                FactoryUtil.isOntimizeSubclass(serviceType));
+    }
+    static isOntimizeSubclass(cls) {
+        return typeof cls === 'function' &&
+            OntimizeService.prototype.isPrototypeOf(cls.prototype);
+    }
+    static isOntimizeEESubclass(cls) {
+        return typeof cls === 'function' &&
+            OntimizeEEService.prototype.isPrototypeOf(cls.prototype);
+    }
+    static isJSONAPISubclass(cls) {
+        return typeof cls === 'function' &&
+            JSONAPIService.prototype.isPrototypeOf(cls.prototype);
     }
     static createServiceInstanceByType(serviceType, injector) {
         if (!Util.isDefined(serviceType) || ServiceType.OntimizeEE === serviceType) {
@@ -6789,6 +6803,20 @@ class FactoryUtil {
     }
 }
 
+class BaseServiceResponseAdapter {
+    adapt(res) {
+        return res;
+    }
+    adaptError(error) {
+        return error;
+    }
+}
+BaseServiceResponseAdapter.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BaseServiceResponseAdapter, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+BaseServiceResponseAdapter.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BaseServiceResponseAdapter });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BaseServiceResponseAdapter, decorators: [{
+            type: Injectable
+        }] });
+
 function dataServiceFactory(injector) {
     const serviceClass = _getInjectionTokenValue(O_DATA_SERVICE, injector);
     const service = Util.createServiceInstance(serviceClass, injector);
@@ -6852,14 +6880,13 @@ function serviceRequestAdapterFactory(injector) {
         return service;
     }
     const config = injector.get(AppConfig).getConfiguration();
-    if (!Util.isDefined(config.serviceType) ||
-        FactoryUtil.isOntimizeEEService(injector)) {
+    if (!Util.isDefined(config.serviceType) || FactoryUtil.isOntimizeEEService(injector)) {
         return new OntimizeRequestArgumentsAdapter();
     }
     else if (FactoryUtil.isJsonApiService(injector)) {
         return new JSONAPIRequestArgumentsAdapter();
     }
-    return new OntimizeRequestArgumentsAdapter();
+    return new BaseRequestArgument();
 }
 function serviceResponseAdapterFactory(injector) {
     const serviceClass = _getInjectionTokenValue(O_RESPONSE_ADAPTER, injector);
@@ -6868,14 +6895,13 @@ function serviceResponseAdapterFactory(injector) {
         return service;
     }
     const config = injector.get(AppConfig).getConfiguration();
-    if (!Util.isDefined(config.serviceType) ||
-        (FactoryUtil.isOntimizeEEService(injector))) {
+    if (!Util.isDefined(config.serviceType) || FactoryUtil.isOntimizeEEService(injector)) {
         return new OntimizeServiceResponseAdapter();
     }
     else if (FactoryUtil.isJsonApiService(injector)) {
         return new JSONAPIServiceResponseAdapter();
     }
-    return new JSONAPIServiceResponseAdapter();
+    return new BaseServiceResponseAdapter();
 }
 function permissionsServiceFactory(injector) {
     const serviceClass = _getInjectionTokenValue(O_PERMISSION_SERVICE, injector);
@@ -28806,7 +28832,8 @@ class OTableFilterByColumnService {
     parseListData(filter, column, tableData, isPageable, sourceData) {
         const columnData = [];
         const colRenderedValues = this.getColumnDataUsingRenderer(column, tableData);
-        const colValues = tableData.map((elem) => Util.getValueFromPath(elem, column.valueColumn));
+        const valueColumn = column.valueColumn ?? column.attr;
+        const colValues = tableData.map((elem) => Util.getValueFromPath(elem, valueColumn));
         if (Util.isDefined(filter?.availableValues)) {
             return filter.availableValues;
         }
@@ -38362,6 +38389,7 @@ class OTableColumnComponent {
                         break;
                     case 'percentage':
                         newRenderer.valueBase = this.valueBase;
+                        break;
                     case 'real':
                         newRenderer.decimalSeparator = this.decimalSeparator;
                         newRenderer.minDecimalDigits = this.minDecimalDigits;