From b38f66f9d61a047cd5e69c18432fe3f339785d9e Mon Sep 17 00:00:00 2001
From: Juan J Chorro Bergillo <jjchorrobe@gmail.com>
Date: Tue, 25 Jun 2019 13:16:32 +0200
Subject: [PATCH 1/2] Add edit mode in post-aggregations

---
 dist/partials/query.editor.html | 12 ++++++++++++
 dist/query_ctrl.d.ts            |  1 +
 dist/query_ctrl.js              |  5 +++++
 dist/query_ctrl.ts              |  6 ++++++
 src/partials/query.editor.html  | 12 ++++++++++++
 src/query_ctrl.ts               |  6 ++++++
 6 files changed, 42 insertions(+)

diff --git a/dist/partials/query.editor.html b/dist/partials/query.editor.html
index 0180a489..1e135418 100644
--- a/dist/partials/query.editor.html
+++ b/dist/partials/query.editor.html
@@ -416,6 +416,9 @@
       <div ng-switch-when="arithmetic">
         <label class="gf-form-label">
           {{postAggregator.type}}:&nbsp;name&nbsp;=&nbsp;{{postAggregator.name}},&nbsp;fn&nbsp;=&nbsp;{{postAggregator.fn}}, &nbsp;fields&nbsp;=&nbsp;{{postAggregator.fields}}
+          <a ng-click="ctrl.editPostAggregator($index)">
+            <i class="fa fa-pencil"></i>
+          </a>  
           <a ng-click="ctrl.removePostAggregator($index)">
             <i class="fa fa-remove"></i>
           </a>
@@ -424,6 +427,9 @@
       <div ng-switch-when="max">
         <label class="gf-form-label">
           {{postAggregator.type}}:&nbsp;name&nbsp;=&nbsp;{{postAggregator.name}},&nbsp;field&nbsp;=&nbsp;{{postAggregator.fieldName}}
+          <a ng-click="ctrl.editPostAggregator($index)">
+            <i class="fa fa-pencil"></i>
+          </a>  
           <a ng-click="ctrl.removePostAggregator($index)">
             <i class="fa fa-remove"></i>
           </a>
@@ -432,6 +438,9 @@
       <div ng-switch-when="min">
         <label class="gf-form-label">
           {{postAggregator.type}}:&nbsp;name&nbsp;=&nbsp;{{postAggregator.name}},&nbsp;field&nbsp;=&nbsp;{{postAggregator.fieldName}}
+          <a ng-click="ctrl.editPostAggregator($index)">
+            <i class="fa fa-pencil"></i>
+          </a>  
           <a ng-click="ctrl.removePostAggregator($index)">
             <i class="fa fa-remove"></i>
           </a>
@@ -440,6 +449,9 @@
       <div ng-switch-when="quantile">
         <label class="gf-form-label">
           {{postAggregator.type}}:&nbsp;name&nbsp;=&nbsp;{{postAggregator.name}},&nbsp;field&nbsp;=&nbsp;{{postAggregator.fieldName}}, &nbsp;prob&nbsp;=&nbsp;{{postAggregator.probability}}
+          <a ng-click="ctrl.editPostAggregator($index)">
+            <i class="fa fa-pencil"></i>
+          </a>  
           <a ng-click="ctrl.removePostAggregator($index)">
             <i class="fa fa-remove"></i>
           </a>
diff --git a/dist/query_ctrl.d.ts b/dist/query_ctrl.d.ts
index b6448314..3840b93e 100644
--- a/dist/query_ctrl.d.ts
+++ b/dist/query_ctrl.d.ts
@@ -85,6 +85,7 @@ export declare class DruidQueryCtrl extends QueryCtrl {
     removeAggregator(index: any): void;
     clearCurrentAggregator(): void;
     addPostAggregator(): void;
+    editPostAggregator(index: any): void;
     removePostAggregator(index: any): void;
     clearCurrentPostAggregator(): void;
     isValidFilterType(type: any): any;
diff --git a/dist/query_ctrl.js b/dist/query_ctrl.js
index b5dd64bd..b2501476 100644
--- a/dist/query_ctrl.js
+++ b/dist/query_ctrl.js
@@ -271,6 +271,11 @@ System.register(["lodash", "app/plugins/sdk", "./css/query_editor.css!"], functi
                     }
                     this.targetBlur();
                 };
+                DruidQueryCtrl.prototype.editPostAggregator = function (index) {
+                        this.addPostAggregatorMode = true;
+                        var delPostAggregator = this.target.postAggregators.splice(index, 1);
+                        this.target.currentPostAggregator = delPostAggregator[0];
+                };
                 DruidQueryCtrl.prototype.removePostAggregator = function (index) {
                     this.target.postAggregators.splice(index, 1);
                     this.targetBlur();
diff --git a/dist/query_ctrl.ts b/dist/query_ctrl.ts
index c7451024..282c444f 100644
--- a/dist/query_ctrl.ts
+++ b/dist/query_ctrl.ts
@@ -319,6 +319,12 @@ export class DruidQueryCtrl extends QueryCtrl {
     this.targetBlur();
   }
 
+  editPostAggregator(index) {
+    this.addPostAggregatorMode = true;
+    const delPostAggregator = this.target.postAggregators.splice(index, 1);
+    this.target.currentAggregator = delPostAggregator[0];
+  }
+
   removePostAggregator(index) {
     this.target.postAggregators.splice(index, 1);
     this.targetBlur();
diff --git a/src/partials/query.editor.html b/src/partials/query.editor.html
index 0180a489..a82d76c3 100644
--- a/src/partials/query.editor.html
+++ b/src/partials/query.editor.html
@@ -416,6 +416,9 @@
       <div ng-switch-when="arithmetic">
         <label class="gf-form-label">
           {{postAggregator.type}}:&nbsp;name&nbsp;=&nbsp;{{postAggregator.name}},&nbsp;fn&nbsp;=&nbsp;{{postAggregator.fn}}, &nbsp;fields&nbsp;=&nbsp;{{postAggregator.fields}}
+          <a ng-click="ctrl.editPostAggregator($index)">
+            <i class="fa fa-pencil"></i>
+          </a>
           <a ng-click="ctrl.removePostAggregator($index)">
             <i class="fa fa-remove"></i>
           </a>
@@ -424,6 +427,9 @@
       <div ng-switch-when="max">
         <label class="gf-form-label">
           {{postAggregator.type}}:&nbsp;name&nbsp;=&nbsp;{{postAggregator.name}},&nbsp;field&nbsp;=&nbsp;{{postAggregator.fieldName}}
+          <a ng-click="ctrl.editPostAggregator($index)">
+            <i class="fa fa-pencil"></i>
+          </a>  
           <a ng-click="ctrl.removePostAggregator($index)">
             <i class="fa fa-remove"></i>
           </a>
@@ -432,6 +438,9 @@
       <div ng-switch-when="min">
         <label class="gf-form-label">
           {{postAggregator.type}}:&nbsp;name&nbsp;=&nbsp;{{postAggregator.name}},&nbsp;field&nbsp;=&nbsp;{{postAggregator.fieldName}}
+          <a ng-click="ctrl.editPostAggregator($index)">
+            <i class="fa fa-pencil"></i>
+          </a>  
           <a ng-click="ctrl.removePostAggregator($index)">
             <i class="fa fa-remove"></i>
           </a>
@@ -440,6 +449,9 @@
       <div ng-switch-when="quantile">
         <label class="gf-form-label">
           {{postAggregator.type}}:&nbsp;name&nbsp;=&nbsp;{{postAggregator.name}},&nbsp;field&nbsp;=&nbsp;{{postAggregator.fieldName}}, &nbsp;prob&nbsp;=&nbsp;{{postAggregator.probability}}
+          <a ng-click="ctrl.editPostAggregator($index)">
+            <i class="fa fa-pencil"></i>
+          </a>  
           <a ng-click="ctrl.removePostAggregator($index)">
             <i class="fa fa-remove"></i>
           </a>
diff --git a/src/query_ctrl.ts b/src/query_ctrl.ts
index c7451024..9a2051c2 100644
--- a/src/query_ctrl.ts
+++ b/src/query_ctrl.ts
@@ -319,6 +319,12 @@ export class DruidQueryCtrl extends QueryCtrl {
     this.targetBlur();
   }
 
+  editPostAggregator(index) {
+    this.addPostAggregatorMode = true;
+    const delPostAggregator = this.target.postAggregators.splice(index, 1);
+    this.target.currentPostAggregator = delPostAggregator[0];
+  }
+
   removePostAggregator(index) {
     this.target.postAggregators.splice(index, 1);
     this.targetBlur();

From 9566eb4e641c0687a9967c4aa3c10c41fe28444e Mon Sep 17 00:00:00 2001
From: Juan J Chorro Bergillo <jjchorrobe@gmail.com>
Date: Thu, 27 Jun 2019 09:16:03 +0200
Subject: [PATCH 2/2] Improve post aggregation Improve post-aggregation query
 editor

Add next post-aggregation field types:
 - fieldAccess
 - constant
 - hyperUniqueCardinality
---
 dist/partials/query.editor.html |  77 ++++++++++++++++++++--
 dist/query_ctrl.d.ts            |  23 +++++++
 dist/query_ctrl.js              |  94 ++++++++++++++++++++++++---
 dist/query_ctrl.js.map          |   2 +-
 dist/query_ctrl.ts              | 111 +++++++++++++++++++++++++++++---
 src/partials/query.editor.html  |  79 +++++++++++++++++++++--
 src/query_ctrl.ts               | 109 ++++++++++++++++++++++++++++---
 7 files changed, 458 insertions(+), 37 deletions(-)

diff --git a/dist/partials/query.editor.html b/dist/partials/query.editor.html
index 1e135418..bab80389 100644
--- a/dist/partials/query.editor.html
+++ b/dist/partials/query.editor.html
@@ -471,9 +471,75 @@
 
   <!-- arithmetic -->
   <div class="gf-form" ng-show="ctrl.addPostAggregatorMode" ng-switch on="ctrl.target.currentPostAggregator.type">
-    <input type="text" ng-switch-when="arithmetic" class="input-small gf-form-input" spellcheck="false" ng-model="ctrl.target.currentPostAggregator.name" placeholder="output name" ng-blur="ctrl.targetBlur()">
-    <select ng-switch-when="arithmetic" class="input-small gf-form-input" ng-model="ctrl.target.currentPostAggregator.fn" ng-options="fn for fn in ctrl.arithmeticPostAggregator" ng-change="ctrl.targetBlur()"></select>
-    <input type="text" ng-switch-when="arithmetic" class="input-small gf-form-input" spellcheck="false" ng-model="ctrl.target.currentPostAggregator.fields" placeholder="field1,field2" ng-blur="ctrl.targetBlur()">
+    <input type="text" ng-switch-when="arithmetic" class="input-small gf-form-input width-9" spellcheck="false" ng-model="ctrl.target.currentPostAggregator.name" placeholder="output name" ng-blur="ctrl.targetBlur()">
+    <select ng-switch-when="arithmetic" class="input-small gf-form-input width-3" ng-model="ctrl.target.currentPostAggregator.fn" ng-options="fn for fn in ctrl.arithmeticPostAggregator" ng-change="ctrl.targetBlur()"></select>
+    
+    <label ng-switch-when=arithmetic class="gf-form-label query-keyword width-5">
+      Fields
+    </label>
+
+    <div class="gf-form" ng-switch-when="arithmetic" ng-repeat="field in ctrl.target.currentPostAggregator.fields track by $index">
+      <div ng-switch="field.type">
+        <div ng-switch-when="fieldAccess">
+            <label class="gf-form-label">
+                {{field.type}}:&nbsp;name&nbsp;=&nbsp;{{field.fieldName}}
+                <a ng-click="ctrl.editPostAggregatorField($index)">
+                  <i class="fa fa-pencil"></i>
+                </a>
+                <a ng-click="ctrl.removePostAggregatorField($index)">
+                  <i class="fa fa-remove"></i>
+                </a>
+            </label>
+        </div>
+        <div ng-switch-when="constant">
+            <label class="gf-form-label">
+                {{field.type}}:&nbsp;{{field.value}}
+                <a ng-click="ctrl.editPostAggregatorField($index)">
+                  <i class="fa fa-pencil"></i>
+                </a>
+                <a ng-click="ctrl.removePostAggregatorField($index)">
+                  <i class="fa fa-remove"></i>
+                </a>
+            </label>
+        </div>
+        <div ng-switch-when="hyperUniqueCardinality">
+            <label class="gf-form-label">
+                {{field.type}}:&nbsp;name&nbsp;=&nbsp;{{field.fieldName}}
+                <a ng-click="ctrl.editPostAggregatorField($index)">
+                  <i class="fa fa-pencil"></i>
+                </a>
+                <a ng-click="ctrl.removePostAggregatorField($index)">
+                  <i class="fa fa-remove"></i>
+                </a>
+            </label>
+        </div>
+
+      </div>
+    </div>
+
+    <div class="gf-form-select-wrapper max-width-15" ng-switch-when="arithmetic" ng-show="ctrl.addPostAggregatorFieldMode">
+      <select ng-model="ctrl.target.currentPostAggregatorField.type" class="gf-form-input" ng-options="type for type in ctrl.arithmeticPostAggregatorFieldsTypes" ng-change="ctrl.targetBlur()"></select>
+    </div>
+    <div class="gf-form" ng-switch-when="arithmetic" ng-show="ctrl.addPostAggregatorFieldMode" ng-switch on="ctrl.target.currentPostAggregatorField.type">
+      <input ng-switch-when="fieldAccess|hyperUniqueCardinality" ng-switch-when-separator="|" type="text" class="gf-form-input width-8" spellcheck="false" ng-model="ctrl.target.currentPostAggregatorField.fieldName" placeholder="fieldName" ng-blur="ctrl.targetBlur()">
+      <input ng-switch-when="constant" type="text" class="gf-form-input width-8" spellcheck="false" ng-model="ctrl.target.currentPostAggregatorField.value" placeholder="value" ng-blur="ctrl.targetBlur()">
+    </div>
+
+    <div class="gf-form" ng-switch-when="arithmetic" ng-show="ctrl.addPostAggregatorFieldMode">
+      <label class="gf-form-label" bs-tooltip="ctrl.errors.currentPostAggregatorField" style="color: rgb(229, 189, 28)" ng-show="ctrl.errors.currentPostAggregatorField">
+        <i class="fa fa-warning"></i>
+      </label>
+      <label class="gf-form-label width-6">
+        <a ng-click="ctrl.addPostAggregatorField()">add field</a>
+        <a ng-click="ctrl.clearCurrentPostAggregatorField()"><i class="fa fa-remove"></i></a>
+      </label>
+    </div>
+
+    <div class="gf-form" ng-hide="ctrl.addPostAggregatorFieldMode" ng-switch-when=arithmetic>
+      <label class="gf-form-label query-keyword">
+        <a ng-click="ctrl.addPostAggregatorField()"><i class="fa fa-plus"></i></a>
+      </label>
+    </div>
   </div>
 
   <!-- max -->
@@ -496,8 +562,11 @@
   </div>
 
   <div class="gf-form" ng-show="ctrl.addPostAggregatorMode">
+    <label class="gf-form-label" bs-tooltip="ctrl.errors.currentPostAggregator" style="color: rgb(229, 189, 28)" ng-show="ctrl.errors.currentPostAggregator">
+      <i class="fa fa-warning"></i>
+    </label>
     <label class="gf-form-label">
-      <a ng-click="ctrl.addPostAggregator()">add tag</a>
+      <a ng-click="ctrl.addPostAggregator()">add post-agg</a>
       <a ng-click="ctrl.clearCurrentPostAggregator()"><i class="fa fa-remove"></i></a>
     </label>
   </div>
diff --git a/dist/query_ctrl.d.ts b/dist/query_ctrl.d.ts
index 3840b93e..3a59454e 100644
--- a/dist/query_ctrl.d.ts
+++ b/dist/query_ctrl.d.ts
@@ -7,6 +7,7 @@ export declare class DruidQueryCtrl extends QueryCtrl {
     addFilterMode: boolean;
     addAggregatorMode: boolean;
     addPostAggregatorMode: boolean;
+    addPostAggregatorFieldMode: boolean;
     addDimensionsMode: boolean;
     addMetricsMode: boolean;
     listDataSources: any;
@@ -19,6 +20,7 @@ export declare class DruidQueryCtrl extends QueryCtrl {
     filterTypes: any;
     aggregatorTypes: any;
     postAggregatorTypes: any;
+    postAggregatorFieldTypes: any;
     arithmeticPostAggregator: any;
     customGranularity: any;
     target: any;
@@ -49,12 +51,22 @@ export declare class DruidQueryCtrl extends QueryCtrl {
         "min": any;
         "quantile": any;
     };
+    postAggregatorFieldValidators: {
+        "fieldAccess": any;
+        "hyperUniqueCardinality": any;
+        "constant": any;
+    };
     arithmeticPostAggregatorFns: {
         '+': any;
         '-': any;
         '*': any;
         '/': any;
     };
+    arithmeticPostAggregatorFieldsTypes: {
+        'fieldAccess': any;
+        'constant': any;
+        'hyperUniqueCardinality': any;
+    };
     defaultQueryType: string;
     defaultFilterType: string;
     defaultAggregatorType: string;
@@ -62,6 +74,9 @@ export declare class DruidQueryCtrl extends QueryCtrl {
         type: string;
         'fn': string;
     };
+    defaultPostAggregatorField: {
+        type: string;
+    };
     customGranularities: string[];
     defaultCustomGranularity: string;
     defaultSelectDimension: string;
@@ -88,9 +103,14 @@ export declare class DruidQueryCtrl extends QueryCtrl {
     editPostAggregator(index: any): void;
     removePostAggregator(index: any): void;
     clearCurrentPostAggregator(): void;
+    addPostAggregatorField(): void;
+    removePostAggregatorField(index: any): void;
+    clearCurrentPostAggregatorField(): void;
+    editPostAggregatorField(index: any): void;
     isValidFilterType(type: any): any;
     isValidAggregatorType(type: any): any;
     isValidPostAggregatorType(type: any): any;
+    isValidPostAggregatorFieldType(type: any): any;
     isValidQueryType(type: any): any;
     isValidArithmeticPostAggregatorFn(fn: any): any;
     validateMaxDataPoints(target: any, errs: any): boolean;
@@ -112,5 +132,8 @@ export declare class DruidQueryCtrl extends QueryCtrl {
     validateMinPostAggregator(target: any): string;
     validateQuantilePostAggregator(target: any): string;
     validateArithmeticPostAggregator(target: any): "Must provide an output name for arithmetic post aggregator." | "Must provide a function for arithmetic post aggregator." | "Invalid arithmetic function" | "Must provide a list of fields for arithmetic post aggregator." | "Must provide at least two fields for arithmetic post aggregator.";
+    validateFieldAccessPostAggregatorField(target: any): string;
+    validateHyperUniqueCardinalityPostAggregatorField(target: any): string;
+    validateConstantPostAggregatorField(target: any): "Must provide a value for constant field type." | "The value for constant field type must be numeric.";
     validateTarget(): any;
 }
diff --git a/dist/query_ctrl.js b/dist/query_ctrl.js
index b2501476..446bcdbf 100644
--- a/dist/query_ctrl.js
+++ b/dist/query_ctrl.js
@@ -57,11 +57,22 @@ System.register(["lodash", "app/plugins/sdk", "./css/query_editor.css!"], functi
                         "min": _this.validateMinPostAggregator.bind(_this),
                         "quantile": _this.validateQuantilePostAggregator.bind(_this)
                     };
+                    _this.postAggregatorFieldValidators = {
+                        "fieldAccess": _this.validateFieldAccessPostAggregatorField.bind(_this),
+                        "hyperUniqueCardinality": _this.validateHyperUniqueCardinalityPostAggregatorField.bind(_this),
+                        "constant": _this.validateConstantPostAggregatorField.bind(_this),
+                    };
                     _this.arithmeticPostAggregatorFns = { '+': null, '-': null, '*': null, '/': null };
+                    _this.arithmeticPostAggregatorFieldsTypes = {
+                        'fieldAccess': null,
+                        'constant': null,
+                        'hyperUniqueCardinality': null
+                    };
                     _this.defaultQueryType = "timeseries";
                     _this.defaultFilterType = "selector";
                     _this.defaultAggregatorType = "count";
                     _this.defaultPostAggregator = { type: 'arithmetic', 'fn': '+' };
+                    _this.defaultPostAggregatorField = { type: 'fieldAccess' };
                     _this.customGranularities = ['second', 'minute', 'fifteen_minute', 'thirty_minute', 'hour', 'day', 'week', 'month', 'quarter', 'year', 'all'];
                     _this.defaultCustomGranularity = 'minute';
                     _this.defaultSelectDimension = "";
@@ -74,7 +85,9 @@ System.register(["lodash", "app/plugins/sdk", "./css/query_editor.css!"], functi
                     _this.filterTypes = lodash_1.default.keys(_this.filterValidators);
                     _this.aggregatorTypes = lodash_1.default.keys(_this.aggregatorValidators);
                     _this.postAggregatorTypes = lodash_1.default.keys(_this.postAggregatorValidators);
+                    _this.postAggregatorFieldTypes = lodash_1.default.keys(_this.postAggregatorFieldValidators);
                     _this.arithmeticPostAggregator = lodash_1.default.keys(_this.arithmeticPostAggregatorFns);
+                    _this.arithmeticPostAggregatorFieldsTypes = lodash_1.default.keys(_this.arithmeticPostAggregatorFieldsTypes);
                     _this.customGranularity = _this.customGranularities;
                     _this.errors = _this.validateTarget();
                     if (!_this.target.currentFilter) {
@@ -91,6 +104,9 @@ System.register(["lodash", "app/plugins/sdk", "./css/query_editor.css!"], functi
                     if (!_this.target.currentPostAggregator) {
                         _this.clearCurrentPostAggregator();
                     }
+                    if (!_this.target.clearCurrentPostAggregatorField) {
+                        _this.clearCurrentPostAggregatorField();
+                    }
                     if (!_this.target.customGranularity) {
                         _this.target.customGranularity = _this.defaultCustomGranularity;
                     }
@@ -272,9 +288,9 @@ System.register(["lodash", "app/plugins/sdk", "./css/query_editor.css!"], functi
                     this.targetBlur();
                 };
                 DruidQueryCtrl.prototype.editPostAggregator = function (index) {
-                        this.addPostAggregatorMode = true;
-                        var delPostAggregator = this.target.postAggregators.splice(index, 1);
-                        this.target.currentPostAggregator = delPostAggregator[0];
+                    this.addPostAggregatorMode = true;
+                    var delPostAggregator = this.target.postAggregators.splice(index, 1);
+                    this.target.currentPostAggregator = delPostAggregator[0];
                 };
                 DruidQueryCtrl.prototype.removePostAggregator = function (index) {
                     this.target.postAggregators.splice(index, 1);
@@ -282,10 +298,42 @@ System.register(["lodash", "app/plugins/sdk", "./css/query_editor.css!"], functi
                 };
                 DruidQueryCtrl.prototype.clearCurrentPostAggregator = function () {
                     this.target.currentPostAggregator = lodash_1.default.clone(this.defaultPostAggregator);
-                    ;
                     this.addPostAggregatorMode = false;
                     this.targetBlur();
                 };
+                DruidQueryCtrl.prototype.addPostAggregatorField = function () {
+                    if (!this.addPostAggregatorFieldMode) {
+                        this.addPostAggregatorFieldMode = true;
+                        return;
+                    }
+                    this.target.errors = this.validateTarget();
+                    if (!this.target.currentPostAggregator) {
+                        this.target.currentPostAggregator = lodash_1.default.clone(this.defaultPostAggregator);
+                    }
+                    if (!this.target.currentPostAggregator.fields) {
+                        this.target.currentPostAggregator.fields = [];
+                    }
+                    if (!this.target.errors.currentPostAggregatorField) {
+                        this.target.currentPostAggregator.fields.push(this.target.currentPostAggregatorField);
+                        this.clearCurrentPostAggregatorField();
+                        this.addPostAggregatorFieldMode = false;
+                    }
+                    this.targetBlur();
+                };
+                DruidQueryCtrl.prototype.removePostAggregatorField = function (index) {
+                    this.target.currentPostAggregator.fields.splice(index, 1);
+                    this.targetBlur();
+                };
+                DruidQueryCtrl.prototype.clearCurrentPostAggregatorField = function () {
+                    this.target.currentPostAggregatorField = lodash_1.default.clone(this.defaultPostAggregatorField);
+                    this.addPostAggregatorFieldMode = false;
+                    this.targetBlur();
+                };
+                DruidQueryCtrl.prototype.editPostAggregatorField = function (index) {
+                    this.addPostAggregatorFieldMode = true;
+                    var delPostAggregatorField = this.target.currentPostAggregator.fields.splice(index, 1);
+                    this.target.currentPostAggregatorField = delPostAggregatorField[0];
+                };
                 DruidQueryCtrl.prototype.isValidFilterType = function (type) {
                     return lodash_1.default.has(this.filterValidators, type);
                 };
@@ -295,6 +343,9 @@ System.register(["lodash", "app/plugins/sdk", "./css/query_editor.css!"], functi
                 DruidQueryCtrl.prototype.isValidPostAggregatorType = function (type) {
                     return lodash_1.default.has(this.postAggregatorValidators, type);
                 };
+                DruidQueryCtrl.prototype.isValidPostAggregatorFieldType = function (type) {
+                    return lodash_1.default.has(this.postAggregatorFieldValidators, type);
+                };
                 DruidQueryCtrl.prototype.isValidQueryType = function (type) {
                     return lodash_1.default.has(this.queryTypeValidators, type);
                 };
@@ -474,18 +525,30 @@ System.register(["lodash", "app/plugins/sdk", "./css/query_editor.css!"], functi
                         return "Must provide a list of fields for arithmetic post aggregator.";
                     }
                     else {
-                        if (!Array.isArray(target.currentPostAggregator.fields)) {
-                            target.currentPostAggregator.fields = target.currentPostAggregator.fields
-                                .split(",")
-                                .map(function (f) { return f.trim(); })
-                                .map(function (f) { return { type: "fieldAccess", fieldName: f }; });
-                        }
                         if (target.currentPostAggregator.fields.length < 2) {
                             return "Must provide at least two fields for arithmetic post aggregator.";
                         }
                     }
                     return null;
                 };
+                DruidQueryCtrl.prototype.validateFieldAccessPostAggregatorField = function (target) {
+                    if (!target.currentPostAggregatorField.fieldName) {
+                        return "Must provide a fieldName for fieldAccess field type.";
+                    }
+                };
+                DruidQueryCtrl.prototype.validateHyperUniqueCardinalityPostAggregatorField = function (target) {
+                    if (!target.currentPostAggregatorField.fieldName) {
+                        return "Must provide a fieldName for hyperUniqueCardinality field type.";
+                    }
+                };
+                DruidQueryCtrl.prototype.validateConstantPostAggregatorField = function (target) {
+                    if (!target.currentPostAggregatorField.value) {
+                        return "Must provide a value for constant field type.";
+                    }
+                    if (isNaN(Number(target.currentPostAggregatorField.value))) {
+                        return "The value for constant field type must be numeric.";
+                    }
+                };
                 DruidQueryCtrl.prototype.validateTarget = function () {
                     var validatorOut, errs = {};
                     if (!this.target.druidDS) {
@@ -549,6 +612,17 @@ System.register(["lodash", "app/plugins/sdk", "./css/query_editor.css!"], functi
                             }
                         }
                     }
+                    if (this.addPostAggregatorFieldMode) {
+                        if (!this.isValidPostAggregatorFieldType(this.target.currentPostAggregatorField.type)) {
+                            errs.currentPostAggregatorField = "Invalid post aggregator field type: " + this.target.currentPostAggregatorField.type + ".";
+                        }
+                        else {
+                            validatorOut = this.postAggregatorFieldValidators[this.target.currentPostAggregatorField.type](this.target);
+                            if (validatorOut) {
+                                errs.currentPostAggregatorField = validatorOut;
+                            }
+                        }
+                    }
                     return errs;
                 };
                 DruidQueryCtrl.templateUrl = 'partials/query.editor.html';
diff --git a/dist/query_ctrl.js.map b/dist/query_ctrl.js.map
index 01ac3227..4ad697de 100644
--- a/dist/query_ctrl.js.map
+++ b/dist/query_ctrl.js.map
@@ -1 +1 @@
-{"version":3,"file":"query_ctrl.js","sourceRoot":"","sources":["query_ctrl.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"query_ctrl.js","sourceRoot":"","sources":["query_ctrl.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/dist/query_ctrl.ts b/dist/query_ctrl.ts
index 282c444f..17c2e5a1 100644
--- a/dist/query_ctrl.ts
+++ b/dist/query_ctrl.ts
@@ -11,6 +11,7 @@ export class DruidQueryCtrl extends QueryCtrl {
   addFilterMode: boolean;
   addAggregatorMode: boolean;
   addPostAggregatorMode: boolean;
+  addPostAggregatorFieldMode: boolean;
   addDimensionsMode: boolean;
   addMetricsMode: boolean;
   listDataSources: any;
@@ -23,6 +24,7 @@ export class DruidQueryCtrl extends QueryCtrl {
   filterTypes: any;
   aggregatorTypes: any;
   postAggregatorTypes: any;
+  postAggregatorFieldTypes: any;
   arithmeticPostAggregator: any;
   customGranularity: any;
   target: any;
@@ -54,12 +56,22 @@ export class DruidQueryCtrl extends QueryCtrl {
     "min": this.validateMinPostAggregator.bind(this),
     "quantile": this.validateQuantilePostAggregator.bind(this)
   };
-
+  postAggregatorFieldValidators = {
+    "fieldAccess": this.validateFieldAccessPostAggregatorField.bind(this),
+    "hyperUniqueCardinality": this.validateHyperUniqueCardinalityPostAggregatorField.bind(this),
+    "constant": this.validateConstantPostAggregatorField.bind(this),
+  }
   arithmeticPostAggregatorFns = { '+': null, '-': null, '*': null, '/': null };
+  arithmeticPostAggregatorFieldsTypes = { 
+    'fieldAccess': null, 
+    'constant': null, 
+    'hyperUniqueCardinality': null 
+  };
   defaultQueryType = "timeseries";
   defaultFilterType = "selector";
   defaultAggregatorType = "count";
   defaultPostAggregator = { type: 'arithmetic', 'fn': '+' };
+  defaultPostAggregatorField = { type: 'fieldAccess' };
   customGranularities = ['second', 'minute', 'fifteen_minute', 'thirty_minute', 'hour', 'day', 'week', 'month', 'quarter', 'year', 'all'];
   defaultCustomGranularity = 'minute';
   defaultSelectDimension = "";
@@ -77,7 +89,9 @@ export class DruidQueryCtrl extends QueryCtrl {
     this.filterTypes = _.keys(this.filterValidators);
     this.aggregatorTypes = _.keys(this.aggregatorValidators);
     this.postAggregatorTypes = _.keys(this.postAggregatorValidators);
+    this.postAggregatorFieldTypes = _.keys(this.postAggregatorFieldValidators);
     this.arithmeticPostAggregator = _.keys(this.arithmeticPostAggregatorFns);
+    this.arithmeticPostAggregatorFieldsTypes = _.keys(this.arithmeticPostAggregatorFieldsTypes);
     this.customGranularity = this.customGranularities;
 
     this.errors = this.validateTarget();
@@ -99,6 +113,10 @@ export class DruidQueryCtrl extends QueryCtrl {
       this.clearCurrentPostAggregator();
     }
 
+    if (!this.target.clearCurrentPostAggregatorField) {
+      this.clearCurrentPostAggregatorField();
+    }
+
     if (!this.target.customGranularity) {
       this.target.customGranularity = this.defaultCustomGranularity;
     }
@@ -322,7 +340,7 @@ export class DruidQueryCtrl extends QueryCtrl {
   editPostAggregator(index) {
     this.addPostAggregatorMode = true;
     const delPostAggregator = this.target.postAggregators.splice(index, 1);
-    this.target.currentAggregator = delPostAggregator[0];
+    this.target.currentPostAggregator = delPostAggregator[0];
   }
 
   removePostAggregator(index) {
@@ -331,11 +349,54 @@ export class DruidQueryCtrl extends QueryCtrl {
   }
 
   clearCurrentPostAggregator() {
-    this.target.currentPostAggregator = _.clone(this.defaultPostAggregator);;
+    this.target.currentPostAggregator = _.clone(this.defaultPostAggregator);
     this.addPostAggregatorMode = false;
     this.targetBlur();
   }
 
+  addPostAggregatorField() {
+    if (!this.addPostAggregatorFieldMode) {
+      this.addPostAggregatorFieldMode = true;
+      return;
+    }
+    
+    this.target.errors = this.validateTarget();
+
+    if (!this.target.currentPostAggregator) {
+      this.target.currentPostAggregator = _.clone(this.defaultPostAggregator);
+    }
+
+    if (!this.target.currentPostAggregator.fields) {
+      this.target.currentPostAggregator.fields = [];
+    }
+
+    if (!this.target.errors.currentPostAggregatorField) {
+      //Add new post aggregator field to the list
+      this.target.currentPostAggregator.fields.push(this.target.currentPostAggregatorField);
+      this.clearCurrentPostAggregatorField();
+      this.addPostAggregatorFieldMode = false;
+    }
+
+    this.targetBlur();
+  }
+
+  removePostAggregatorField(index) {
+    this.target.currentPostAggregator.fields.splice(index, 1);
+    this.targetBlur();
+  }
+
+  clearCurrentPostAggregatorField() {
+    this.target.currentPostAggregatorField = _.clone(this.defaultPostAggregatorField);
+    this.addPostAggregatorFieldMode = false;
+    this.targetBlur();
+  }
+
+  editPostAggregatorField(index) {
+    this.addPostAggregatorFieldMode = true;
+    const delPostAggregatorField = this.target.currentPostAggregator.fields.splice(index, 1);
+    this.target.currentPostAggregatorField = delPostAggregatorField[0];
+  }
+
   isValidFilterType(type) {
     return _.has(this.filterValidators, type);
   }
@@ -348,6 +409,10 @@ export class DruidQueryCtrl extends QueryCtrl {
     return _.has(this.postAggregatorValidators, type);
   }
 
+  isValidPostAggregatorFieldType(type) {
+    return _.has(this.postAggregatorFieldValidators, type)
+  }
+
   isValidQueryType(type) {
     return _.has(this.queryTypeValidators, type);
   }
@@ -539,15 +604,10 @@ export class DruidQueryCtrl extends QueryCtrl {
     if (!this.isValidArithmeticPostAggregatorFn(target.currentPostAggregator.fn)) {
       return "Invalid arithmetic function";
     }
+
     if (!target.currentPostAggregator.fields) {
       return "Must provide a list of fields for arithmetic post aggregator.";
     } else {
-      if (!Array.isArray(target.currentPostAggregator.fields)) {
-        target.currentPostAggregator.fields = target.currentPostAggregator.fields
-          .split(",")
-          .map(function (f) { return f.trim(); })
-          .map(function (f) { return { type: "fieldAccess", fieldName: f }; });
-      }
       if (target.currentPostAggregator.fields.length < 2) {
         return "Must provide at least two fields for arithmetic post aggregator.";
       }
@@ -555,6 +615,28 @@ export class DruidQueryCtrl extends QueryCtrl {
     return null;
   }
 
+  validateFieldAccessPostAggregatorField(target) {
+    if (!target.currentPostAggregatorField.fieldName) {
+      return "Must provide a fieldName for fieldAccess field type.";
+    }
+  }
+
+  validateHyperUniqueCardinalityPostAggregatorField(target) {
+    if (!target.currentPostAggregatorField.fieldName) {
+      return "Must provide a fieldName for hyperUniqueCardinality field type.";
+    }
+  }
+
+  validateConstantPostAggregatorField(target) {
+    if (!target.currentPostAggregatorField.value) {
+      return "Must provide a value for constant field type.";
+    }
+
+    if (isNaN(Number(target.currentPostAggregatorField.value))) {
+      return "The value for constant field type must be numeric."
+    }
+  }
+
   validateTarget() {
     let validatorOut, errs: any = {};
     if (!this.target.druidDS) {
@@ -618,6 +700,17 @@ export class DruidQueryCtrl extends QueryCtrl {
       }
     }
 
+    if (this.addPostAggregatorFieldMode) {
+      if(!this.isValidPostAggregatorFieldType(this.target.currentPostAggregatorField.type)) {
+        errs.currentPostAggregatorField = "Invalid post aggregator field type: " + this.target.currentPostAggregatorField.type + ".";
+      } else {
+        validatorOut = this.postAggregatorFieldValidators[this.target.currentPostAggregatorField.type](this.target);
+        if (validatorOut) {
+          errs.currentPostAggregatorField = validatorOut;
+        }
+      }
+    }
+
     return errs;
   }
 }
diff --git a/src/partials/query.editor.html b/src/partials/query.editor.html
index a82d76c3..bab80389 100644
--- a/src/partials/query.editor.html
+++ b/src/partials/query.editor.html
@@ -418,7 +418,7 @@
           {{postAggregator.type}}:&nbsp;name&nbsp;=&nbsp;{{postAggregator.name}},&nbsp;fn&nbsp;=&nbsp;{{postAggregator.fn}}, &nbsp;fields&nbsp;=&nbsp;{{postAggregator.fields}}
           <a ng-click="ctrl.editPostAggregator($index)">
             <i class="fa fa-pencil"></i>
-          </a>
+          </a>  
           <a ng-click="ctrl.removePostAggregator($index)">
             <i class="fa fa-remove"></i>
           </a>
@@ -471,9 +471,75 @@
 
   <!-- arithmetic -->
   <div class="gf-form" ng-show="ctrl.addPostAggregatorMode" ng-switch on="ctrl.target.currentPostAggregator.type">
-    <input type="text" ng-switch-when="arithmetic" class="input-small gf-form-input" spellcheck="false" ng-model="ctrl.target.currentPostAggregator.name" placeholder="output name" ng-blur="ctrl.targetBlur()">
-    <select ng-switch-when="arithmetic" class="input-small gf-form-input" ng-model="ctrl.target.currentPostAggregator.fn" ng-options="fn for fn in ctrl.arithmeticPostAggregator" ng-change="ctrl.targetBlur()"></select>
-    <input type="text" ng-switch-when="arithmetic" class="input-small gf-form-input" spellcheck="false" ng-model="ctrl.target.currentPostAggregator.fields" placeholder="field1,field2" ng-blur="ctrl.targetBlur()">
+    <input type="text" ng-switch-when="arithmetic" class="input-small gf-form-input width-9" spellcheck="false" ng-model="ctrl.target.currentPostAggregator.name" placeholder="output name" ng-blur="ctrl.targetBlur()">
+    <select ng-switch-when="arithmetic" class="input-small gf-form-input width-3" ng-model="ctrl.target.currentPostAggregator.fn" ng-options="fn for fn in ctrl.arithmeticPostAggregator" ng-change="ctrl.targetBlur()"></select>
+    
+    <label ng-switch-when=arithmetic class="gf-form-label query-keyword width-5">
+      Fields
+    </label>
+
+    <div class="gf-form" ng-switch-when="arithmetic" ng-repeat="field in ctrl.target.currentPostAggregator.fields track by $index">
+      <div ng-switch="field.type">
+        <div ng-switch-when="fieldAccess">
+            <label class="gf-form-label">
+                {{field.type}}:&nbsp;name&nbsp;=&nbsp;{{field.fieldName}}
+                <a ng-click="ctrl.editPostAggregatorField($index)">
+                  <i class="fa fa-pencil"></i>
+                </a>
+                <a ng-click="ctrl.removePostAggregatorField($index)">
+                  <i class="fa fa-remove"></i>
+                </a>
+            </label>
+        </div>
+        <div ng-switch-when="constant">
+            <label class="gf-form-label">
+                {{field.type}}:&nbsp;{{field.value}}
+                <a ng-click="ctrl.editPostAggregatorField($index)">
+                  <i class="fa fa-pencil"></i>
+                </a>
+                <a ng-click="ctrl.removePostAggregatorField($index)">
+                  <i class="fa fa-remove"></i>
+                </a>
+            </label>
+        </div>
+        <div ng-switch-when="hyperUniqueCardinality">
+            <label class="gf-form-label">
+                {{field.type}}:&nbsp;name&nbsp;=&nbsp;{{field.fieldName}}
+                <a ng-click="ctrl.editPostAggregatorField($index)">
+                  <i class="fa fa-pencil"></i>
+                </a>
+                <a ng-click="ctrl.removePostAggregatorField($index)">
+                  <i class="fa fa-remove"></i>
+                </a>
+            </label>
+        </div>
+
+      </div>
+    </div>
+
+    <div class="gf-form-select-wrapper max-width-15" ng-switch-when="arithmetic" ng-show="ctrl.addPostAggregatorFieldMode">
+      <select ng-model="ctrl.target.currentPostAggregatorField.type" class="gf-form-input" ng-options="type for type in ctrl.arithmeticPostAggregatorFieldsTypes" ng-change="ctrl.targetBlur()"></select>
+    </div>
+    <div class="gf-form" ng-switch-when="arithmetic" ng-show="ctrl.addPostAggregatorFieldMode" ng-switch on="ctrl.target.currentPostAggregatorField.type">
+      <input ng-switch-when="fieldAccess|hyperUniqueCardinality" ng-switch-when-separator="|" type="text" class="gf-form-input width-8" spellcheck="false" ng-model="ctrl.target.currentPostAggregatorField.fieldName" placeholder="fieldName" ng-blur="ctrl.targetBlur()">
+      <input ng-switch-when="constant" type="text" class="gf-form-input width-8" spellcheck="false" ng-model="ctrl.target.currentPostAggregatorField.value" placeholder="value" ng-blur="ctrl.targetBlur()">
+    </div>
+
+    <div class="gf-form" ng-switch-when="arithmetic" ng-show="ctrl.addPostAggregatorFieldMode">
+      <label class="gf-form-label" bs-tooltip="ctrl.errors.currentPostAggregatorField" style="color: rgb(229, 189, 28)" ng-show="ctrl.errors.currentPostAggregatorField">
+        <i class="fa fa-warning"></i>
+      </label>
+      <label class="gf-form-label width-6">
+        <a ng-click="ctrl.addPostAggregatorField()">add field</a>
+        <a ng-click="ctrl.clearCurrentPostAggregatorField()"><i class="fa fa-remove"></i></a>
+      </label>
+    </div>
+
+    <div class="gf-form" ng-hide="ctrl.addPostAggregatorFieldMode" ng-switch-when=arithmetic>
+      <label class="gf-form-label query-keyword">
+        <a ng-click="ctrl.addPostAggregatorField()"><i class="fa fa-plus"></i></a>
+      </label>
+    </div>
   </div>
 
   <!-- max -->
@@ -496,8 +562,11 @@
   </div>
 
   <div class="gf-form" ng-show="ctrl.addPostAggregatorMode">
+    <label class="gf-form-label" bs-tooltip="ctrl.errors.currentPostAggregator" style="color: rgb(229, 189, 28)" ng-show="ctrl.errors.currentPostAggregator">
+      <i class="fa fa-warning"></i>
+    </label>
     <label class="gf-form-label">
-      <a ng-click="ctrl.addPostAggregator()">add tag</a>
+      <a ng-click="ctrl.addPostAggregator()">add post-agg</a>
       <a ng-click="ctrl.clearCurrentPostAggregator()"><i class="fa fa-remove"></i></a>
     </label>
   </div>
diff --git a/src/query_ctrl.ts b/src/query_ctrl.ts
index 9a2051c2..17c2e5a1 100644
--- a/src/query_ctrl.ts
+++ b/src/query_ctrl.ts
@@ -11,6 +11,7 @@ export class DruidQueryCtrl extends QueryCtrl {
   addFilterMode: boolean;
   addAggregatorMode: boolean;
   addPostAggregatorMode: boolean;
+  addPostAggregatorFieldMode: boolean;
   addDimensionsMode: boolean;
   addMetricsMode: boolean;
   listDataSources: any;
@@ -23,6 +24,7 @@ export class DruidQueryCtrl extends QueryCtrl {
   filterTypes: any;
   aggregatorTypes: any;
   postAggregatorTypes: any;
+  postAggregatorFieldTypes: any;
   arithmeticPostAggregator: any;
   customGranularity: any;
   target: any;
@@ -54,12 +56,22 @@ export class DruidQueryCtrl extends QueryCtrl {
     "min": this.validateMinPostAggregator.bind(this),
     "quantile": this.validateQuantilePostAggregator.bind(this)
   };
-
+  postAggregatorFieldValidators = {
+    "fieldAccess": this.validateFieldAccessPostAggregatorField.bind(this),
+    "hyperUniqueCardinality": this.validateHyperUniqueCardinalityPostAggregatorField.bind(this),
+    "constant": this.validateConstantPostAggregatorField.bind(this),
+  }
   arithmeticPostAggregatorFns = { '+': null, '-': null, '*': null, '/': null };
+  arithmeticPostAggregatorFieldsTypes = { 
+    'fieldAccess': null, 
+    'constant': null, 
+    'hyperUniqueCardinality': null 
+  };
   defaultQueryType = "timeseries";
   defaultFilterType = "selector";
   defaultAggregatorType = "count";
   defaultPostAggregator = { type: 'arithmetic', 'fn': '+' };
+  defaultPostAggregatorField = { type: 'fieldAccess' };
   customGranularities = ['second', 'minute', 'fifteen_minute', 'thirty_minute', 'hour', 'day', 'week', 'month', 'quarter', 'year', 'all'];
   defaultCustomGranularity = 'minute';
   defaultSelectDimension = "";
@@ -77,7 +89,9 @@ export class DruidQueryCtrl extends QueryCtrl {
     this.filterTypes = _.keys(this.filterValidators);
     this.aggregatorTypes = _.keys(this.aggregatorValidators);
     this.postAggregatorTypes = _.keys(this.postAggregatorValidators);
+    this.postAggregatorFieldTypes = _.keys(this.postAggregatorFieldValidators);
     this.arithmeticPostAggregator = _.keys(this.arithmeticPostAggregatorFns);
+    this.arithmeticPostAggregatorFieldsTypes = _.keys(this.arithmeticPostAggregatorFieldsTypes);
     this.customGranularity = this.customGranularities;
 
     this.errors = this.validateTarget();
@@ -99,6 +113,10 @@ export class DruidQueryCtrl extends QueryCtrl {
       this.clearCurrentPostAggregator();
     }
 
+    if (!this.target.clearCurrentPostAggregatorField) {
+      this.clearCurrentPostAggregatorField();
+    }
+
     if (!this.target.customGranularity) {
       this.target.customGranularity = this.defaultCustomGranularity;
     }
@@ -331,11 +349,54 @@ export class DruidQueryCtrl extends QueryCtrl {
   }
 
   clearCurrentPostAggregator() {
-    this.target.currentPostAggregator = _.clone(this.defaultPostAggregator);;
+    this.target.currentPostAggregator = _.clone(this.defaultPostAggregator);
     this.addPostAggregatorMode = false;
     this.targetBlur();
   }
 
+  addPostAggregatorField() {
+    if (!this.addPostAggregatorFieldMode) {
+      this.addPostAggregatorFieldMode = true;
+      return;
+    }
+    
+    this.target.errors = this.validateTarget();
+
+    if (!this.target.currentPostAggregator) {
+      this.target.currentPostAggregator = _.clone(this.defaultPostAggregator);
+    }
+
+    if (!this.target.currentPostAggregator.fields) {
+      this.target.currentPostAggregator.fields = [];
+    }
+
+    if (!this.target.errors.currentPostAggregatorField) {
+      //Add new post aggregator field to the list
+      this.target.currentPostAggregator.fields.push(this.target.currentPostAggregatorField);
+      this.clearCurrentPostAggregatorField();
+      this.addPostAggregatorFieldMode = false;
+    }
+
+    this.targetBlur();
+  }
+
+  removePostAggregatorField(index) {
+    this.target.currentPostAggregator.fields.splice(index, 1);
+    this.targetBlur();
+  }
+
+  clearCurrentPostAggregatorField() {
+    this.target.currentPostAggregatorField = _.clone(this.defaultPostAggregatorField);
+    this.addPostAggregatorFieldMode = false;
+    this.targetBlur();
+  }
+
+  editPostAggregatorField(index) {
+    this.addPostAggregatorFieldMode = true;
+    const delPostAggregatorField = this.target.currentPostAggregator.fields.splice(index, 1);
+    this.target.currentPostAggregatorField = delPostAggregatorField[0];
+  }
+
   isValidFilterType(type) {
     return _.has(this.filterValidators, type);
   }
@@ -348,6 +409,10 @@ export class DruidQueryCtrl extends QueryCtrl {
     return _.has(this.postAggregatorValidators, type);
   }
 
+  isValidPostAggregatorFieldType(type) {
+    return _.has(this.postAggregatorFieldValidators, type)
+  }
+
   isValidQueryType(type) {
     return _.has(this.queryTypeValidators, type);
   }
@@ -539,15 +604,10 @@ export class DruidQueryCtrl extends QueryCtrl {
     if (!this.isValidArithmeticPostAggregatorFn(target.currentPostAggregator.fn)) {
       return "Invalid arithmetic function";
     }
+
     if (!target.currentPostAggregator.fields) {
       return "Must provide a list of fields for arithmetic post aggregator.";
     } else {
-      if (!Array.isArray(target.currentPostAggregator.fields)) {
-        target.currentPostAggregator.fields = target.currentPostAggregator.fields
-          .split(",")
-          .map(function (f) { return f.trim(); })
-          .map(function (f) { return { type: "fieldAccess", fieldName: f }; });
-      }
       if (target.currentPostAggregator.fields.length < 2) {
         return "Must provide at least two fields for arithmetic post aggregator.";
       }
@@ -555,6 +615,28 @@ export class DruidQueryCtrl extends QueryCtrl {
     return null;
   }
 
+  validateFieldAccessPostAggregatorField(target) {
+    if (!target.currentPostAggregatorField.fieldName) {
+      return "Must provide a fieldName for fieldAccess field type.";
+    }
+  }
+
+  validateHyperUniqueCardinalityPostAggregatorField(target) {
+    if (!target.currentPostAggregatorField.fieldName) {
+      return "Must provide a fieldName for hyperUniqueCardinality field type.";
+    }
+  }
+
+  validateConstantPostAggregatorField(target) {
+    if (!target.currentPostAggregatorField.value) {
+      return "Must provide a value for constant field type.";
+    }
+
+    if (isNaN(Number(target.currentPostAggregatorField.value))) {
+      return "The value for constant field type must be numeric."
+    }
+  }
+
   validateTarget() {
     let validatorOut, errs: any = {};
     if (!this.target.druidDS) {
@@ -618,6 +700,17 @@ export class DruidQueryCtrl extends QueryCtrl {
       }
     }
 
+    if (this.addPostAggregatorFieldMode) {
+      if(!this.isValidPostAggregatorFieldType(this.target.currentPostAggregatorField.type)) {
+        errs.currentPostAggregatorField = "Invalid post aggregator field type: " + this.target.currentPostAggregatorField.type + ".";
+      } else {
+        validatorOut = this.postAggregatorFieldValidators[this.target.currentPostAggregatorField.type](this.target);
+        if (validatorOut) {
+          errs.currentPostAggregatorField = validatorOut;
+        }
+      }
+    }
+
     return errs;
   }
 }