added HistogramField

2 files changed, 14 insertions, 9 deletions

diff --git a/src/client/northstar/core/filter/FilterModel.ts b/src/client/northstar/core/filter/FilterModel.ts
index 3c4cfc4a7..01bf2a809 100644
--- a/src/client/northstar/core/filter/FilterModel.ts
+++ b/src/client/northstar/core/filter/FilterModel.ts
@@ -1,5 +1,8 @@
 import { ValueComparison } from "./ValueComparision";
 import { Utils } from "../../utils/Utils";
+import { IBaseFilterProvider } from "./IBaseFilterProvider";
+import { BaseOperation } from "../../operations/BaseOperation";
+import { FilterOperand } from "./FilterOperand";
 
 export class FilterModel {
     public ValueComparisons: ValueComparison[];
@@ -36,20 +39,20 @@ export class FilterModel {
         return ret;
     }
 
-    // public static GetFilterModelsRecursive(filterGraphNode: GraphNode<BaseOperationViewModel, FilterLinkViewModel>,
-    //     visitedFilterProviders: Set<GraphNode<BaseOperationViewModel, FilterLinkViewModel>>, filterModels: FilterModel[], isFirst: boolean): string {
+    // public static GetFilterModelsRecursive(baseOperation: BaseOperation,
+    //     visitedFilterProviders: Set<IBaseFilterProvider>, filterModels: FilterModel[], isFirst: boolean): string {
     //     let ret = "";
-    //     if (Utils.isBaseFilterProvider(filterGraphNode.Data)) {
-    //         visitedFilterProviders.add(filterGraphNode);
-    //         let filtered = filterGraphNode.Data.FilterModels.filter(fm => fm && fm.ValueComparisons.length > 0);
+    //     if (Utils.isBaseFilterProvider(baseOperation)) {
+    //         visitedFilterProviders.add(baseOperation);
+    //         let filtered = baseOperation.FilterModels.filter(fm => fm && fm.ValueComparisons.length > 0);
     //         if (!isFirst && filtered.length > 0) {
     //             filterModels.push(...filtered);
-    //             ret = "(" + filterGraphNode.Data.FilterModels.filter(fm => fm != null).map(fm => fm.ToPythonString()).join(" || ") + ")";
+    //             ret = "(" + baseOperation.FilterModels.filter(fm => fm != null).map(fm => fm.ToPythonString()).join(" || ") + ")";
     //         }
     //     }
-    //     if (Utils.isBaseFilterConsumer(filterGraphNode.Data) && filterGraphNode.Links != null) {
+    //     if (Utils.isBaseFilterConsumer(baseOperation) && baseOperation.Links) {
     //         let children = new Array<string>();
-    //         let linkedGraphNodes = filterGraphNode.Links.get(LinkType.Filter);
+    //         let linkedGraphNodes = baseOperation.Links.get(LinkType.Filter);
     //         if (linkedGraphNodes != null) {
     //             for (let i = 0; i < linkedGraphNodes.length; i++) {
     //                 let linkVm = linkedGraphNodes[i].Data;
@@ -66,7 +69,7 @@ export class FilterModel {
     //             }
     //         }
 
-    //         let childrenJoined = children.join(filterGraphNode.Data.FilterOperand === FilterOperand.AND ? " && " : " || ");
+    //         let childrenJoined = children.join(baseOperation.FilterOperand === FilterOperand.AND ? " && " : " || ");
     //         if (children.length > 0) {
     //             if (ret !== "") {
     //                 ret = "(" + ret + " &&  (" + childrenJoined + "))";
diff --git a/src/client/northstar/core/filter/IBaseFilterConsumer.ts b/src/client/northstar/core/filter/IBaseFilterConsumer.ts
index e687acb8a..3eb32b6db 100644
--- a/src/client/northstar/core/filter/IBaseFilterConsumer.ts
+++ b/src/client/northstar/core/filter/IBaseFilterConsumer.ts
@@ -1,8 +1,10 @@
 import { FilterOperand } from '../filter/FilterOperand'
 import { IEquatable } from '../../utils/IEquatable'
+import { IBaseFilterProvider } from './IBaseFilterProvider';
 
 export interface IBaseFilterConsumer extends IEquatable {
     FilterOperand: FilterOperand;
+    Links: IBaseFilterProvider[];
 }
 
 export function instanceOfIBaseFilterConsumer(object: any): object is IBaseFilterConsumer {