Merge branch 'worktree-agent-af579b24' into feature/dashboard-or-conditions

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;
 }
 
@@ -120,6 +122,7 @@ export class AlarmDataSubscription {
         entityFilter: this.alarmDataSubscriptionOptions.entityFilter,
         pageLink: deepClone(this.alarmDataSubscriptionOptions.pageLink),
         keyFilters,
+        keyFiltersOperation: this.alarmDataSubscriptionOptions.keyFiltersOperation,
         alarmFields,
         entityFields,
         latestValues

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

@@ -85,6 +85,7 @@ export class AlarmDataService {
       alarmDataSubscriptionOptions.entityFilter = alarmSource.entityFilter;
       alarmDataSubscriptionOptions.pageLink = pageLink;
       alarmDataSubscriptionOptions.keyFilters = alarmSource.keyFilters;
+      alarmDataSubscriptionOptions.keyFiltersOperation = alarmSource.keyFiltersOperation;
       alarmDataSubscriptionOptions.additionalKeyFilters = additionalKeyFilters;
     }
     return alarmDataSubscriptionOptions;

ui-ngx/src/app/core/api/alias-controller.ts

@@ -315,6 +315,10 @@ export class AliasController implements IAliasController {
       || newDatasource.type === DatasourceType.alarmCount) {
       if (newDatasource.filterId) {
         newDatasource.keyFilters = this.getKeyFilters(newDatasource.filterId);
+        const filterInfo = this.getFilterInfo(newDatasource.filterId);
+        if (filterInfo?.keyFiltersOperation) {
+          newDatasource.keyFiltersOperation = filterInfo.keyFiltersOperation;
+        }
       }
       if (newDatasource.type === DatasourceType.alarmCount) {
         newDatasource.alarmFilter = this.entityService.resolveAlarmFilter(newDatasource.alarmFilterConfig, false);

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;
 }
@@ -370,6 +372,7 @@ export class EntityDataSubscription {
             entityFilter: this.entityDataSubscriptionOptions.entityFilter,
             pageLink: this.entityDataSubscriptionOptions.pageLink,
             keyFilters,
+            keyFiltersOperation: this.entityDataSubscriptionOptions.keyFiltersOperation,
             entityFields,
             latestValues: this.latestValues
           };
@@ -494,7 +497,8 @@ export class EntityDataSubscription {
           }
           this.countCommand.query = {
             entityFilter: this.entityDataSubscriptionOptions.entityFilter,
-            keyFilters
+            keyFilters,
+            keyFiltersOperation: this.entityDataSubscriptionOptions.keyFiltersOperation
           };
           this.subscriber.subscriptionCommands.push(this.countCommand);
 
@@ -569,7 +573,8 @@ export class EntityDataSubscription {
           }
           this.alarmCountCommand.query = {
             entityFilter: this.entityDataSubscriptionOptions.entityFilter,
-            keyFilters
+            keyFilters,
+            keyFiltersOperation: this.entityDataSubscriptionOptions.keyFiltersOperation
           };
           if (this.entityDataSubscriptionOptions.alarmFilter) {
             this.alarmCountCommand.query = {...this.alarmCountCommand.query, ...this.entityDataSubscriptionOptions.alarmFilter};

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

@@ -183,6 +183,7 @@ export class EntityDataService {
       entityDataSubscriptionOptions.alarmFilter = datasource.alarmFilter;
       entityDataSubscriptionOptions.keyFilters = keyFilters;
       entityDataSubscriptionOptions.additionalKeyFilters = additionalKeyFilters;
+      entityDataSubscriptionOptions.keyFiltersOperation = datasource.keyFiltersOperation;
       if (entityDataSubscriptionOptions.datasourceType === DatasourceType.entity) {
         entityDataSubscriptionOptions.pageLink = pageLink;
       }

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;