PT-FIXES: DOS-1818 Switch Filter Sink from MQL to AQL.

Author: kgrgreer

src/foam/core/reflow/FilteredDAOAgent.js

@@ -13,6 +13,7 @@ foam.CLASS({
 
   requires: [
     'foam.mlang.sink.FilteredSink',
+    'foam.parse.SimpleQueryParser',
     'foam.parse.QueryParser'
   ],
 
@@ -22,9 +23,33 @@ foam.CLASS({
       name: 'where',
       section: 'filter',
       displayWidth: 60,
+      postSet: function(o, n) { if ( n ) this.enableAQL_ = false; },
+      visibility: function(enableAQL_) { return enableAQL_ ? foam.u2.DisplayMode.HIDDEN : foam.u2.DisplayMode.RW; },
       view: { class: 'foam.core.reflow.PredicateSuggestedField' },
       documentation: 'Predicate expression to filter objects before putting them in the sink'
     },
+    {
+      class: 'Boolean',
+      name: 'enableAQL_',
+      transient: true,
+      hidden: true,
+      value: true,
+      documentation: 'Temporary flag to determine if AQL is available.'
+    },
+    {
+      class: 'String',
+      name: 'aql',
+      label: 'Where (autocomplete)',
+      displayWidth: 60,
+      visibility: function(enableAQL_) { return enableAQL_ ? foam.u2.DisplayMode.RW : foam.u2.DisplayMode.HIDDEN; },
+      view: function(_, X) {
+        var data = X.data;
+        return {
+          class: 'foam.parse.auto.SmartView',
+          parser: data.SimpleQueryParser.create({of: data.of}, X)
+        };
+      }
+    },
     {
       name: 'sink',
       view: 'foam.core.reflow.SinkView',
@@ -46,6 +71,13 @@ foam.CLASS({
           console.warn('FilteredDAOAgent: Failed to parse predicate:', this.where, x);
         }
       }
+      if ( this.aql ) {
+        predicate = this.SimpleQueryParser.create({of: this.of}).parseString(this.aql);
+      }
+      if ( predicate ) {
+        dao = dao.where(predicate);
+      }
+
       var delegateSink = this.sink ? this.sink.createSink() : this.ArraySink.create();
 
       return this.FilteredSink.create({
@@ -59,9 +91,10 @@ foam.CLASS({
         start().
           style({display: 'flex', paddingLeft: '12px'}).
           add(this.WHERE.__).
+          add(this.AQL.__).
           add(this.SINK).
         end().
-        endContext();
+      endContext();
     }
   ]
 });