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

package/esm2020/lib/util/factory.util.mjs

@@ -7,15 +7,29 @@ import { Util } from './util';
 export 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) {
@@ -64,4 +78,4 @@ export class FactoryUtil {
         }
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS51dGlsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vcHJvamVjdHMvb250aW1pemUtd2ViLW5neC9zcmMvbGliL3V0aWwvZmFjdG9yeS51dGlsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNqRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDckUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sMENBQTBDLENBQUM7QUFDN0UsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQ3hFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sUUFBUSxDQUFDO0FBRzlCLE1BQU0sT0FBTyxXQUFXO0lBR3RCLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxRQUFrQjtRQUN4QyxNQUFNLE1BQU0sR0FBRyxRQUFRLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ3ZDLE9BQU8sTUFBTSxDQUFDLGdCQUFnQixFQUFFLENBQUMsV0FBVyxLQUFLLFNBQVM7WUFDeEQsTUFBTSxDQUFDLGdCQUFnQixFQUFFLENBQUMsV0FBVyxZQUFZLGNBQWMsQ0FBQztJQUNwRSxDQUFDO0lBRUQsTUFBTSxDQUFDLG1CQUFtQixDQUFDLFFBQWtCO1FBQzNDLE1BQU0sTUFBTSxHQUFHLFFBQVEsQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDdkMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDLFdBQVcsS0FBSyxZQUFZO1lBQzVELE1BQU0sQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDLFdBQVcsWUFBWSxpQkFBaUIsQ0FBQztZQUNuRSxDQUFDLE1BQU0sQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDLFdBQVcsS0FBSyxVQUFVO2dCQUNuRCxNQUFNLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQyxXQUFXLFlBQVksZUFBZSxDQUFDLENBQUM7SUFDeEUsQ0FBQztJQUVELE1BQU0sQ0FBQywyQkFBMkIsQ0FBQyxXQUF3QixFQUFFLFFBQWtCO1FBQzdFLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQyxJQUFJLFdBQVcsQ0FBQyxVQUFVLEtBQUssV0FBVyxFQUFFO1lBQzFFLE9BQU8sSUFBSSxpQkFBaUIsQ0FBQyxRQUFRLENBQUMsQ0FBQztTQUN4QztRQUNELElBQUksV0FBVyxDQUFDLFFBQVEsS0FBSyxXQUFXLEVBQUU7WUFDeEMsT0FBTyxJQUFJLGVBQWUsQ0FBQyxRQUFRLENBQUMsQ0FBQztTQUN0QztRQUNELElBQUksV0FBVyxDQUFDLE9BQU8sS0FBSyxXQUFXLEVBQUU7WUFDdkMsT0FBTyxJQUFJLGNBQWMsQ0FBQyxRQUFRLENBQUMsQ0FBQztTQUNyQztRQUNELE9BQU8sSUFBSSxDQUFDLHFCQUFxQixDQUFDLFdBQVcsRUFBRSxRQUFRLENBQUMsQ0FBQztJQUUzRCxDQUFDO0lBRU8sTUFBTSxDQUFDLHNCQUFzQixDQUFDLFdBQWdCLEVBQUUsV0FBZ0IsRUFBRSxRQUFrQjtRQUMxRixJQUFJLENBQUMsV0FBVyxFQUFFO1lBQ2hCLE9BQU8sUUFBUSxDQUFDLEdBQUcsQ0FBTSxXQUFXLENBQUMsQ0FBQztTQUN2QztRQUVELElBQUksQ0FBQyxDQUFDLFdBQVcsQ0FBQyxRQUFRLEVBQUUsV0FBVyxDQUFDLFVBQVUsRUFBRSxXQUFXLENBQUMsT0FBTyxDQUFDLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxFQUFFO1lBQzlGLE9BQU8sV0FBVyxDQUFDLDJCQUEyQixDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQU0sV0FBVyxDQUFDLEVBQUUsUUFBUSxDQUFDLENBQUM7U0FDMUY7UUFFRCxPQUFPLFdBQVcsQ0FBQywyQkFBMkIsQ0FBQyxXQUFXLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDeEUsQ0FBQztJQUVBLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxvQkFBMkM7UUFDaEUsTUFBTSxXQUFXLEdBQUcsb0JBQW9CLENBQUMsV0FBVyxDQUFDO1FBQ3JELE1BQU0sTUFBTSxHQUFHLG9CQUFvQixDQUFDLE1BQU0sQ0FBQztRQUMzQyxNQUFNLE9BQU8sR0FBRyxvQkFBb0IsQ0FBQyxPQUFPLENBQUM7UUFDN0MsTUFBTSxRQUFRLEdBQUcsb0JBQW9CLENBQUMsUUFBUSxDQUFDO1FBRS9DLE1BQU0sTUFBTSxHQUFHLFFBQVEsQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDdkMsTUFBTSxvQkFBb0IsR0FBRyxNQUFNLENBQUMsdUJBQXVCLEVBQUUsQ0FBQztRQUM5RCxNQUFNLHdCQUF3QixHQUFHLG9CQUFvQixDQUFDLE9BQU8sQ0FBQyxFQUFFLFdBQVcsQ0FBQztRQUM1RSxNQUFNLFdBQVcsR0FBRyxvQkFBb0IsQ0FBQyxXQUFXLElBQUksd0JBQXdCLENBQUM7UUFFakYsSUFBSTtZQUNGLElBQUksV0FBVyxHQUFHLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxXQUFXLEVBQUUsV0FBVyxFQUFFLFFBQVEsQ0FBQyxDQUFDO1lBRWxGLElBQUksSUFBSSxDQUFDLGFBQWEsQ0FBQyxXQUFXLENBQUMsRUFBRTtnQkFDbkMsTUFBTSxVQUFVLEdBQUcsV0FBVyxDQUFDLDhCQUE4QixDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUN2RSxJQUFJLE1BQU0sRUFBRTtvQkFDVixVQUFVLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQztpQkFDNUI7Z0JBQ0QsV0FBVyxDQUFDLGdCQUFnQixDQUFDLFVBQVUsQ0FBQyxDQUFDO2FBQzFDO1lBQ0QsT0FBTyxXQUFXLENBQUM7U0FDcEI7UUFBQyxPQUFPLENBQUMsRUFBRTtZQUNWLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDakIsT0FBTyxJQUFJLENBQUM7U0FDYjtJQUVILENBQUM7Q0FHSiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdG9yIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5cbmltcG9ydCB7IEFwcENvbmZpZyB9IGZyb20gJy4uL2NvbmZpZy9hcHAtY29uZmlnJztcbmltcG9ydCB7IEpTT05BUElTZXJ2aWNlIH0gZnJvbSAnLi4vc2VydmljZXMvanNvbmFwaS9qc29uYXBpLnNlcnZpY2UnO1xuaW1wb3J0IHsgT250aW1pemVFRVNlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcy9vbnRpbWl6ZS9vbnRpbWl6ZS1lZS5zZXJ2aWNlJztcbmltcG9ydCB7IE9udGltaXplU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL29udGltaXplL29udGltaXplLnNlcnZpY2UnO1xuaW1wb3J0IHsgU2VydmljZVR5cGUgfSBmcm9tICcuLi90eXBlcy9zZXJ2aWNlLXR5cGUudHlwZSc7XG5pbXBvcnQgeyBVdGlsIH0gZnJvbSAnLi91dGlsJztcbmltcG9ydCB7IE9Db25maWd1cmVTZXJ2aWNlQXJncyB9IGZyb20gJy4uL3R5cGVzL2NvbmZpZ3VyZS1zZXJ2aWNlLWFyZ3MudHlwZSc7XG5cbmV4cG9ydCBjbGFzcyBGYWN0b3J5VXRpbCB7XG5cblxuICBzdGF0aWMgaXNKc29uQXBpU2VydmljZShpbmplY3RvcjogSW5qZWN0b3IpOiBib29sZWFuIHtcbiAgICBjb25zdCBjb25maWcgPSBpbmplY3Rvci5nZXQoQXBwQ29uZmlnKTtcbiAgICByZXR1cm4gY29uZmlnLmdldENvbmZpZ3VyYXRpb24oKS5zZXJ2aWNlVHlwZSA9PT0gJ0pTT05BUEknIHx8XG4gICAgICBjb25maWcuZ2V0Q29uZmlndXJhdGlvbigpLnNlcnZpY2VUeXBlIGluc3RhbmNlb2YgSlNPTkFQSVNlcnZpY2U7XG4gIH1cblxuICBzdGF0aWMgaXNPbnRpbWl6ZUVFU2VydmljZShpbmplY3RvcjogSW5qZWN0b3IpOiBib29sZWFuIHtcbiAgICBjb25zdCBjb25maWcgPSBpbmplY3Rvci5nZXQoQXBwQ29uZmlnKTtcbiAgICByZXR1cm4gKGNvbmZpZy5nZXRDb25maWd1cmF0aW9uKCkuc2VydmljZVR5cGUgPT09ICdPbnRpbWl6ZUVFJyB8fFxuICAgICAgY29uZmlnLmdldENvbmZpZ3VyYXRpb24oKS5zZXJ2aWNlVHlwZSBpbnN0YW5jZW9mIE9udGltaXplRUVTZXJ2aWNlKSB8fFxuICAgICAgKGNvbmZpZy5nZXRDb25maWd1cmF0aW9uKCkuc2VydmljZVR5cGUgPT09ICdPbnRpbWl6ZScgfHxcbiAgICAgICAgY29uZmlnLmdldENvbmZpZ3VyYXRpb24oKS5zZXJ2aWNlVHlwZSBpbnN0YW5jZW9mIE9udGltaXplU2VydmljZSk7XG4gIH1cblxuICBzdGF0aWMgY3JlYXRlU2VydmljZUluc3RhbmNlQnlUeXBlKHNlcnZpY2VUeXBlOiBTZXJ2aWNlVHlwZSwgaW5qZWN0b3I6IEluamVjdG9yKTogYW55IHtcbiAgICBpZiAoIVV0aWwuaXNEZWZpbmVkKHNlcnZpY2VUeXBlKSB8fCBTZXJ2aWNlVHlwZS5PbnRpbWl6ZUVFID09PSBzZXJ2aWNlVHlwZSkge1xuICAgICAgcmV0dXJuIG5ldyBPbnRpbWl6ZUVFU2VydmljZShpbmplY3Rvcik7XG4gICAgfVxuICAgIGlmIChTZXJ2aWNlVHlwZS5PbnRpbWl6ZSA9PT0gc2VydmljZVR5cGUpIHtcbiAgICAgIHJldHVybiBuZXcgT250aW1pemVTZXJ2aWNlKGluamVjdG9yKTtcbiAgICB9XG4gICAgaWYgKFNlcnZpY2VUeXBlLkpTT05BUEkgPT09IHNlcnZpY2VUeXBlKSB7XG4gICAgICByZXR1cm4gbmV3IEpTT05BUElTZXJ2aWNlKGluamVjdG9yKTtcbiAgICB9XG4gICAgcmV0dXJuIFV0aWwuY3JlYXRlU2VydmljZUluc3RhbmNlKHNlcnZpY2VUeXBlLCBpbmplY3Rvcik7XG5cbiAgfVxuXG4gIHByaXZhdGUgc3RhdGljIGdldERhdGFTZXJ2aWNlSW5zdGFuY2Uoc2VydmljZVR5cGU6IGFueSwgYmFzZVNlcnZpY2U6IGFueSwgaW5qZWN0b3I6IEluamVjdG9yKTogYW55IHtcbiAgICBpZiAoIXNlcnZpY2VUeXBlKSB7XG4gICAgICByZXR1cm4gaW5qZWN0b3IuZ2V0PGFueT4oYmFzZVNlcnZpY2UpO1xuICAgIH1cblxuICAgIGlmICghW1NlcnZpY2VUeXBlLk9udGltaXplLCBTZXJ2aWNlVHlwZS5PbnRpbWl6ZUVFLCBTZXJ2aWNlVHlwZS5KU09OQVBJXS5pbmNsdWRlcyhzZXJ2aWNlVHlwZSkpIHtcbiAgICAgIHJldHVybiBGYWN0b3J5VXRpbC5jcmVhdGVTZXJ2aWNlSW5zdGFuY2VCeVR5cGUoaW5qZWN0b3IuZ2V0PGFueT4oc2VydmljZVR5cGUpLCBpbmplY3Rvcik7XG4gICAgfVxuXG4gICAgcmV0dXJuIEZhY3RvcnlVdGlsLmNyZWF0ZVNlcnZpY2VJbnN0YW5jZUJ5VHlwZShzZXJ2aWNlVHlwZSwgaW5qZWN0b3IpO1xuICB9XG5cbiAgIHN0YXRpYyBjb25maWd1cmVTZXJ2aWNlKGNvbmZpZ3VyZVNlcnZpY2VBcmdzOiBPQ29uZmlndXJlU2VydmljZUFyZ3MpOiBhbnkge1xuICAgICAgY29uc3QgYmFzZVNlcnZpY2UgPSBjb25maWd1cmVTZXJ2aWNlQXJncy5iYXNlU2VydmljZTtcbiAgICAgIGNvbnN0IGVudGl0eSA9IGNvbmZpZ3VyZVNlcnZpY2VBcmdzLmVudGl0eTtcbiAgICAgIGNvbnN0IHNlcnZpY2UgPSBjb25maWd1cmVTZXJ2aWNlQXJncy5zZXJ2aWNlO1xuICAgICAgY29uc3QgaW5qZWN0b3IgPSBjb25maWd1cmVTZXJ2aWNlQXJncy5pbmplY3RvcjtcblxuICAgICAgY29uc3QgY29uZmlnID0gaW5qZWN0b3IuZ2V0KEFwcENvbmZpZyk7XG4gICAgICBjb25zdCBzZXJ2aWNlQ29uZmlndXJhdGlvbiA9IGNvbmZpZy5nZXRTZXJ2aWNlQ29uZmlndXJhdGlvbigpO1xuICAgICAgY29uc3Qgc2VydmljZUNvbmZpZ3VyYXRpb25UeXBlID0gc2VydmljZUNvbmZpZ3VyYXRpb25bc2VydmljZV0/LnNlcnZpY2VUeXBlO1xuICAgICAgY29uc3Qgc2VydmljZVR5cGUgPSBjb25maWd1cmVTZXJ2aWNlQXJncy5zZXJ2aWNlVHlwZSB8fCBzZXJ2aWNlQ29uZmlndXJhdGlvblR5cGU7XG5cbiAgICAgIHRyeSB7XG4gICAgICAgIGxldCBkYXRhU2VydmljZSA9IHRoaXMuZ2V0RGF0YVNlcnZpY2VJbnN0YW5jZShzZXJ2aWNlVHlwZSwgYmFzZVNlcnZpY2UsIGluamVjdG9yKTtcblxuICAgICAgICBpZiAoVXRpbC5pc0RhdGFTZXJ2aWNlKGRhdGFTZXJ2aWNlKSkge1xuICAgICAgICAgIGNvbnN0IHNlcnZpY2VDZmcgPSBkYXRhU2VydmljZS5nZXREZWZhdWx0U2VydmljZUNvbmZpZ3VyYXRpb24oc2VydmljZSk7XG4gICAgICAgICAgaWYgKGVudGl0eSkge1xuICAgICAgICAgICAgc2VydmljZUNmZy5lbnRpdHkgPSBlbnRpdHk7XG4gICAgICAgICAgfVxuICAgICAgICAgIGRhdGFTZXJ2aWNlLmNvbmZpZ3VyZVNlcnZpY2Uoc2VydmljZUNmZyk7XG4gICAgICAgIH1cbiAgICAgICAgcmV0dXJuIGRhdGFTZXJ2aWNlO1xuICAgICAgfSBjYXRjaCAoZSkge1xuICAgICAgICBjb25zb2xlLmVycm9yKGUpO1xuICAgICAgICByZXR1cm4gbnVsbDtcbiAgICAgIH1cblxuICAgIH1cblxuXG59XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"factory.util.js","sourceRoot":"","sources":["../../../../projects/ontimize-web-ngx/src/lib/util/factory.util.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injector } from '@angular/core';\n\nimport { AppConfig } from '../config/app-config';\nimport { JSONAPIService } from '../services/jsonapi/jsonapi.service';\nimport { OntimizeEEService } from '../services/ontimize/ontimize-ee.service';\nimport { OntimizeService } from '../services/ontimize/ontimize.service';\nimport { ServiceType } from '../types/service-type.type';\nimport { Util } from './util';\nimport { OConfigureServiceArgs } from '../types/configure-service-args.type';\n\nexport class FactoryUtil {\n\n\n  static isJsonApiService(injector: Injector): boolean {\n    const config = injector.get(AppConfig);\n    const serviceType = config.getConfiguration().serviceType;\n\n    return serviceType === 'JSONAPI' ||\n      FactoryUtil.isJSONAPISubclass(serviceType);\n  }\n\n  static isOntimizeEEService(injector: Injector): boolean {\n    const config = injector.get(AppConfig);\n    const serviceType = config.getConfiguration().serviceType;\n    return (serviceType === 'OntimizeEE' ||\n      FactoryUtil.isOntimizeEESubclass(serviceType)) ||\n      (serviceType === 'Ontimize' ||\n        FactoryUtil.isOntimizeSubclass(serviceType));\n  }\n\n  static isOntimizeSubclass(cls: any): boolean {\n    return typeof cls === 'function' &&\n      OntimizeService.prototype.isPrototypeOf(cls.prototype);\n  }\n\n  static isOntimizeEESubclass(cls: any): boolean {\n    return typeof cls === 'function' &&\n      OntimizeEEService.prototype.isPrototypeOf(cls.prototype);\n  }\n\n\n  static isJSONAPISubclass(cls: any): boolean {\n    return typeof cls === 'function' &&\n      JSONAPIService.prototype.isPrototypeOf(cls.prototype);\n  }\n\n  static createServiceInstanceByType(serviceType: ServiceType, injector: Injector): any {\n    if (!Util.isDefined(serviceType) || ServiceType.OntimizeEE === serviceType) {\n      return new OntimizeEEService(injector);\n    }\n    if (ServiceType.Ontimize === serviceType) {\n      return new OntimizeService(injector);\n    }\n    if (ServiceType.JSONAPI === serviceType) {\n      return new JSONAPIService(injector);\n    }\n    return Util.createServiceInstance(serviceType, injector);\n\n  }\n\n  private static getDataServiceInstance(serviceType: any, baseService: any, injector: Injector): any {\n    if (!serviceType) {\n      return injector.get<any>(baseService);\n    }\n\n    if (![ServiceType.Ontimize, ServiceType.OntimizeEE, ServiceType.JSONAPI].includes(serviceType)) {\n      return FactoryUtil.createServiceInstanceByType(injector.get<any>(serviceType), injector);\n    }\n\n    return FactoryUtil.createServiceInstanceByType(serviceType, injector);\n  }\n\n  static configureService(configureServiceArgs: OConfigureServiceArgs): any {\n    const baseService = configureServiceArgs.baseService;\n    const entity = configureServiceArgs.entity;\n    const service = configureServiceArgs.service;\n    const injector = configureServiceArgs.injector;\n\n    const config = injector.get(AppConfig);\n    const serviceConfiguration = config.getServiceConfiguration();\n    const serviceConfigurationType = serviceConfiguration[service]?.serviceType;\n    const serviceType = configureServiceArgs.serviceType || serviceConfigurationType;\n\n    try {\n      let dataService = this.getDataServiceInstance(serviceType, baseService, injector);\n\n      if (Util.isDataService(dataService)) {\n        const serviceCfg = dataService.getDefaultServiceConfiguration(service);\n        if (entity) {\n          serviceCfg.entity = entity;\n        }\n        dataService.configureService(serviceCfg);\n      }\n      return dataService;\n    } catch (e) {\n      console.error(e);\n      return null;\n    }\n\n  }\n\n\n}\n"]}

package/fesm2015/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';
@@ -5190,8 +5190,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 === null || config === void 0 ? void 0 : config.multipleKeyDelimiter) || this.DEFAULT_DELIMITER;
+        const jsonApiConfig = this.injector.get(O_JSON_API_CONFIG);
+        this.delimiter = (jsonApiConfig === null || jsonApiConfig === void 0 ? void 0 : jsonApiConfig.multipleKeyDelimiter) || this.DEFAULT_DELIMITER;
     }
     startsession(user, password) {
         const url = this.urlBase + this._startSessionPath;
@@ -7146,15 +7146,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) {
@@ -7205,6 +7219,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);
@@ -7268,14 +7296,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);
@@ -7284,14 +7311,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);
@@ -28942,9 +28968,11 @@ class OTableFilterByColumnService {
         });
     }
     parseListData(filter, column, tableData, isPageable, sourceData) {
+        var _a;
         const columnData = [];
         const colRenderedValues = this.getColumnDataUsingRenderer(column, tableData);
-        const colValues = tableData.map((elem) => Util.getValueFromPath(elem, column.valueColumn));
+        const valueColumn = (_a = column.valueColumn) !== null && _a !== void 0 ? _a : column.attr;
+        const colValues = tableData.map((elem) => Util.getValueFromPath(elem, valueColumn));
         if (Util.isDefined(filter === null || filter === void 0 ? void 0 : filter.availableValues)) {
             return filter.availableValues;
         }
@@ -38566,6 +38594,7 @@ class OTableColumnComponent {
                         break;
                     case 'percentage':
                         newRenderer.valueBase = this.valueBase;
+                        break;
                     case 'real':
                         newRenderer.decimalSeparator = this.decimalSeparator;
                         newRenderer.minDecimalDigits = this.minDecimalDigits;