1 files changed, 43 insertions, 52 deletions

diff --git a/src/client/northstar/dash-fields/HistogramField.ts b/src/client/northstar/dash-fields/HistogramField.ts
index c699691a4..f01f08487 100644
--- a/src/client/northstar/dash-fields/HistogramField.ts
+++ b/src/client/northstar/dash-fields/HistogramField.ts
@@ -1,64 +1,55 @@
-import { action } from "mobx";
+import { observable } from "mobx";
+import { custom, serializable } from "serializr";
 import { ColumnAttributeModel } from "../../../client/northstar/core/attribute/AttributeModel";
 import { AttributeTransformationModel } from "../../../client/northstar/core/attribute/AttributeTransformationModel";
 import { HistogramOperation } from "../../../client/northstar/operations/HistogramOperation";
-import { BasicField } from "../../../fields/BasicField";
-import { Field, FieldId } from "../../../fields/Field";
+import { ObjectField, Copy } from "../../../new_fields/ObjectField";
 import { CurrentUserUtils } from "../../../server/authentication/models/current_user_utils";
-import { Types } from "../../../server/Message";
 import { OmitKeys } from "../../../Utils";
-
-
-export class HistogramField extends BasicField<HistogramOperation> {
-    constructor(data?: HistogramOperation, id?: FieldId, save: boolean = true) {
-        super(data ? data : HistogramOperation.Empty, save, id);
-    }
-
-    toString(): string {
-        return JSON.stringify(OmitKeys(this.Data, ['Links', 'BrushLinks', 'Result', 'BrushColors', 'FilterModels', 'FilterOperand']));
-    }
-
-    Copy(): Field {
-        return new HistogramField(this.Data.Copy());
+import { Deserializable } from "../../util/SerializationHelper";
+
+function serialize(field: HistogramField) {
+    return OmitKeys(field.HistoOp, ['Links', 'BrushLinks', 'Result', 'BrushColors', 'FilterModels', 'FilterOperand']).omit;
+}
+
+function deserialize(jp: any) {
+    let X: AttributeTransformationModel | undefined;
+    let Y: AttributeTransformationModel | undefined;
+    let V: AttributeTransformationModel | undefined;
+
+    let schema = CurrentUserUtils.GetNorthstarSchema(jp.SchemaName);
+    if (schema) {
+        CurrentUserUtils.GetAllNorthstarColumnAttributes(schema).map(attr => {
+            if (attr.displayName === jp.X.AttributeModel.Attribute.DisplayName) {
+                X = new AttributeTransformationModel(new ColumnAttributeModel(attr), jp.X.AggregateFunction);
+            }
+            if (attr.displayName === jp.Y.AttributeModel.Attribute.DisplayName) {
+                Y = new AttributeTransformationModel(new ColumnAttributeModel(attr), jp.Y.AggregateFunction);
+            }
+            if (attr.displayName === jp.V.AttributeModel.Attribute.DisplayName) {
+                V = new AttributeTransformationModel(new ColumnAttributeModel(attr), jp.V.AggregateFunction);
+            }
+        });
+        if (X && Y && V) {
+            return new HistogramField(new HistogramOperation(jp.SchemaName, X, Y, V, jp.Normalization));
+        }
     }
-
-    ToScriptString(): string {
-        return `new HistogramField("${this.Data}")`;
+    return new HistogramField(HistogramOperation.Empty);
+}
+
+@Deserializable("histogramField")
+export class HistogramField extends ObjectField {
+    @serializable(custom(serialize, deserialize)) @observable public readonly HistoOp: HistogramOperation;
+    constructor(data?: HistogramOperation) {
+        super();
+        this.HistoOp = data ? data : HistogramOperation.Empty;
     }
 
-
-    ToJson() {
-        return {
-            type: Types.HistogramOp,
-            data: this.toString(),
-            id: this.Id
-        };
+    toString(): string {
+        return JSON.stringify(OmitKeys(this.HistoOp, ['Links', 'BrushLinks', 'Result', 'BrushColors', 'FilterModels', 'FilterOperand']).omit);
     }
 
-    @action
-    static FromJson(id: string, data: any): HistogramField {
-        let jp = JSON.parse(data);
-        let X: AttributeTransformationModel | undefined;
-        let Y: AttributeTransformationModel | undefined;
-        let V: AttributeTransformationModel | undefined;
-
-        let schema = CurrentUserUtils.GetNorthstarSchema(jp.SchemaName);
-        if (schema) {
-            CurrentUserUtils.GetAllNorthstarColumnAttributes(schema).map(attr => {
-                if (attr.displayName === jp.X.AttributeModel.Attribute.DisplayName) {
-                    X = new AttributeTransformationModel(new ColumnAttributeModel(attr), jp.X.AggregateFunction);
-                }
-                if (attr.displayName === jp.Y.AttributeModel.Attribute.DisplayName) {
-                    Y = new AttributeTransformationModel(new ColumnAttributeModel(attr), jp.Y.AggregateFunction);
-                }
-                if (attr.displayName === jp.V.AttributeModel.Attribute.DisplayName) {
-                    V = new AttributeTransformationModel(new ColumnAttributeModel(attr), jp.V.AggregateFunction);
-                }
-            });
-            if (X && Y && V) {
-                return new HistogramField(new HistogramOperation(jp.SchemaName, X, Y, V, jp.Normalization), id, false);
-            }
-        }
-        return new HistogramField(HistogramOperation.Empty, id, false);
+    [Copy]() {
+        return new HistogramField(this.HistoOp.Copy());
     }
 }
\ No newline at end of file