Add keyFiltersOperation to Datasource and subscription option interfaces

- Add keyFiltersOperation?: ComplexOperation to Datasource interface in widget.models.ts
- Add keyFiltersOperation?: ComplexOperation to EntityDataSubscriptionOptions interface
- Add keyFiltersOperation?: ComplexOperation to AlarmDataSubscriptionOptions interface
- Import ComplexOperation from query.models in all three files

ui-ngx/src/app/core/api/alarm-data-subscription.ts

@@ -23,6 +23,7 @@ import { DatasourceType } from '@shared/models/widget.models';
 import {
   AlarmData,
   AlarmDataPageLink,
+  ComplexOperation,
   EntityFilter,
   EntityKey,
   EntityKeyType,
@@ -47,6 +48,7 @@ export interface AlarmDataSubscriptionOptions {
   pageLink?: AlarmDataPageLink;
   keyFilters?: Array<KeyFilter>;
   additionalKeyFilters?: Array<KeyFilter>;
+  keyFiltersOperation?: ComplexOperation;
   subscriptionTimewindow?: SubscriptionTimewindow;
 }
 

ui-ngx/src/app/core/api/entity-data-subscription.ts

@@ -34,6 +34,7 @@ import {
 import {
   AlarmFilter,
   ComparisonTsValue,
+  ComplexOperation,
   EntityData,
   EntityDataPageLink,
   EntityFilter,
@@ -112,6 +113,7 @@ export interface EntityDataSubscriptionOptions {
   pageLink?: EntityDataPageLink;
   keyFilters?: Array<KeyFilter>;
   additionalKeyFilters?: Array<KeyFilter>;
+  keyFiltersOperation?: ComplexOperation;
   subscriptionTimewindow?: SubscriptionTimewindow;
   latestTsOffset?: number;
 }

ui-ngx/src/app/shared/models/widget.models.ts

@@ -24,6 +24,7 @@ import { EntityId } from '@shared/models/id/entity-id';
 import {
   AlarmFilter,
   AlarmFilterConfig,
+  ComplexOperation,
   EntityDataPageLink,
   EntityFilter,
   KeyFilter
@@ -450,6 +451,7 @@ export interface Datasource {
   origDatasourceIndex?: number;
   pageLink?: EntityDataPageLink;
   keyFilters?: Array<KeyFilter>;
+  keyFiltersOperation?: ComplexOperation;
   entityFilter?: EntityFilter;
   alarmFilterConfig?: AlarmFilterConfig;
   alarmFilter?: AlarmFilter;