number filter query

src/client/components/number-range-picker/number-range-picker.tsx

@@ -15,13 +15,14 @@
  * limitations under the License.
  */
 
-import { $, Dataset, ply } from "plywood";
+import { Dataset } from "plywood";
 import React from "react";
 import { Dimension } from "../../../common/models/dimension/dimension";
 import { Essence } from "../../../common/models/essence/essence";
 import { Timekeeper } from "../../../common/models/timekeeper/timekeeper";
 import { getNumberOfWholeDigits, isTruthy, toSignificantDigits } from "../../../common/utils/general/general";
 import { clamp, classNames, getXFromEvent } from "../../utils/dom/dom";
+import { ApiContext, ApiContextValue } from "../../views/cube-view/api-context";
 import { Loader } from "../loader/loader";
 import { QueryError } from "../query-error/query-error";
 import { RangeHandle } from "../range-handle/range-handle";
@@ -72,6 +73,9 @@ export interface NumberRangePickerState {
 }
 
 export class NumberRangePicker extends React.Component<NumberRangePickerProps, NumberRangePickerState> {
+  static contextType = ApiContext;
+
+  context: ApiContextValue;
   public mounted: boolean;
   private picker = React.createRef<HTMLDivElement>();
 
@@ -87,19 +91,12 @@ export class NumberRangePicker extends React.Component<NumberRangePickerProps, N
   }
 
   fetchData(essence: Essence, timekeeper: Timekeeper, dimension: Dimension, rightBound: number): void {
-    const { dataCube } = essence;
-    const filterExpression = essence.getEffectiveFilter(timekeeper, { unfilterDimension: dimension }).toExpression(dataCube);
-    const $main = $("main");
-    const query = ply()
-      .apply("main", $main.filter(filterExpression))
-      .apply("Min", $main.min($(dimension.name)))
-      .apply("Max", $main.max($(dimension.name)));
-
+    const { numberFilterQuery } = this.context;
     this.setState({
       loading: true
     });
 
-    dataCube.executor(query)
+    numberFilterQuery(essence, dimension)
       .then(
         (dataset: Dataset) => {
           if (!this.mounted) return;

src/client/components/preview-string-filter-menu/preview-string-filter-menu.tsx

@@ -35,13 +35,12 @@ import {
   StringFilterClause
 } from "../../../common/models/filter-clause/filter-clause";
 import { FilterMode } from "../../../common/models/filter/filter";
-import { Timekeeper } from "../../../common/models/timekeeper/timekeeper";
 import { debounceWithPromise, Unary } from "../../../common/utils/functional/functional";
 import { Fn } from "../../../common/utils/general/general";
-import { previewStringFilterQuery } from "../../../common/utils/query/preview-string-filter-query";
 import { SEARCH_WAIT, STRINGS } from "../../config/constants";
 import { classNames, enterKey } from "../../utils/dom/dom";
 import { reportError } from "../../utils/error-reporter/error-reporter";
+import { ApiContext, ApiContextValue } from "../../views/cube-view/api-context";
 import { Button } from "../button/button";
 import { ClearableInput } from "../clearable-input/clearable-input";
 import { GlobalEventListener } from "../global-event-listener/global-event-listener";
@@ -66,7 +65,6 @@ export type PreviewFilterMode = FilterMode.CONTAINS | FilterMode.REGEX;
 export interface PreviewStringFilterMenuProps {
   dimension: Dimension;
   essence: Essence;
-  timekeeper: Timekeeper;
   onClose: Fn;
   filterMode: FilterMode.REGEX | FilterMode.CONTAINS;
   saveClause: Unary<FilterClause, void>;
@@ -77,14 +75,11 @@ export interface PreviewStringFilterMenuState {
   dataset: DatasetRequest;
 }
 
-interface QueryProps {
-  essence: Essence;
-  timekeeper: Timekeeper;
-  dimension: Dimension;
-  filterMode: PreviewFilterMode;
-}
-
 export class PreviewStringFilterMenu extends React.Component<PreviewStringFilterMenuProps, PreviewStringFilterMenuState> {
+  static contextType = ApiContext;
+
+  context: ApiContextValue;
+
   private lastSearchText: string;
 
   initialSearchText = (): string => {
@@ -115,7 +110,7 @@ export class PreviewStringFilterMenu extends React.Component<PreviewStringFilter
   private sendQueryFilter(): Promise<DatasetRequest> {
     const { searchText } = this.state;
     this.lastSearchText = searchText;
-    return this.debouncedQueryFilter({ ...this.props, searchText });
+    return this.debouncedQueryFilter(this.props.essence, this.constructClause());
   }
 
   private regexErrorMessage(): string {
@@ -124,12 +119,11 @@ export class PreviewStringFilterMenu extends React.Component<PreviewStringFilter
     return filterMode === FilterMode.REGEX && searchText && checkRegex(searchText);
   }
 
-  private queryFilter = (props: QueryProps): Promise<DatasetRequest> => {
-    const { essence } = props;
+  private queryFilter = (essence: Essence, clause: StringFilterClause): Promise<DatasetRequest> => {
+    const { stringFilterQuery } = this.context;
     const { searchText } = this.state;
-    const query = previewStringFilterQuery({ ...props, searchText, limit: TOP_N + 1 });
 
-    return essence.dataCube.executor(query, { timezone: essence.timezone })
+    return stringFilterQuery(essence, clause)
       .then((dataset: Dataset) => {
         if (this.lastSearchText !== searchText) return null;
         return loaded(dataset);
@@ -164,10 +158,9 @@ export class PreviewStringFilterMenu extends React.Component<PreviewStringFilter
     }
   };
 
-  constructClause(): FilterClause {
+  constructClause(): StringFilterClause {
     const { dimension, filterMode } = this.props;
     const { searchText } = this.state;
-    if (!searchText) return null;
     const { name: reference } = dimension;
 
     switch (filterMode) {
@@ -201,8 +194,11 @@ export class PreviewStringFilterMenu extends React.Component<PreviewStringFilter
     const { essence: { filter }, dimension } = this.props;
     if (this.regexErrorMessage()) return false;
     const newClause = this.constructClause();
+    if (!newClause.values.first()) {
+      return false;
+    }
     const oldClause = filter.getClauseForDimension(dimension);
-    return newClause && !newClause.equals(oldClause);
+    return !newClause.equals(oldClause);
   }
 
   render() {

src/client/components/selectable-string-filter-menu/selectable-string-filter-menu.tsx

@@ -38,10 +38,10 @@ import { FilterMode } from "../../../common/models/filter/filter";
 import { Timekeeper } from "../../../common/models/timekeeper/timekeeper";
 import { debounceWithPromise, Unary } from "../../../common/utils/functional/functional";
 import { Fn } from "../../../common/utils/general/general";
-import { stringFilterOptionsQuery } from "../../../common/utils/query/selectable-string-filter-query";
 import { SEARCH_WAIT, STRINGS } from "../../config/constants";
 import { classNames, enterKey } from "../../utils/dom/dom";
 import { reportError } from "../../utils/error-reporter/error-reporter";
+import { ApiContext, ApiContextValue } from "../../views/cube-view/api-context";
 import { Button } from "../button/button";
 import { ClearableInput } from "../clearable-input/clearable-input";
 import { GlobalEventListener } from "../global-event-listener/global-event-listener";
@@ -74,14 +74,10 @@ function toggle(set: Set<string>, value: string): Set<string> {
   return set.has(value) ? set.remove(value) : set.add(value);
 }
 
-interface QueryProps {
-  essence: Essence;
-  timekeeper: Timekeeper;
-  dimension: Dimension;
-  searchText: string;
-}
-
 export class SelectableStringFilterMenu extends React.Component<SelectableStringFilterMenuProps, SelectableStringFilterMenuState> {
+  static contextType = ApiContext;
+
+  context: ApiContextValue;
   private lastSearchText: string;
 
   state: SelectableStringFilterMenuState = {
@@ -109,14 +105,14 @@ export class SelectableStringFilterMenu extends React.Component<SelectableString
   private sendQueryFilter(): Promise<DatasetRequest> {
     const { searchText } = this.state;
     this.lastSearchText = searchText;
-    return this.debouncedQueryFilter({ ...this.props, searchText });
+    return this.debouncedQueryFilter(this.props.essence, this.constructSearchTextClause());
   }
 
-  private queryFilter = (props: QueryProps): Promise<DatasetRequest> => {
-    const { essence, searchText } = props;
-    const query = stringFilterOptionsQuery({ ...props, limit: TOP_N + 1 });
+  private queryFilter = (essence: Essence, clause: StringFilterClause): Promise<DatasetRequest> => {
+    const { searchText } = this.state;
+    const { stringFilterQuery } = this.context;
 
-    return essence.dataCube.executor(query, { timezone: essence.timezone })
+    return stringFilterQuery(essence, clause)
       .then((dataset: Dataset) => {
         if (this.lastSearchText !== searchText) return null;
         return loaded(dataset);
@@ -163,7 +159,7 @@ export class SelectableStringFilterMenu extends React.Component<SelectableString
 
   updateSearchText = (searchText: string) => this.setState({ searchText });
 
-  constructClause(): FilterClause | null {
+  constructClause(): StringFilterClause {
     const { dimension, filterMode } = this.props;
     const { selectedValues } = this.state;
     const { name } = dimension;
@@ -177,6 +173,17 @@ export class SelectableStringFilterMenu extends React.Component<SelectableString
     });
   }
 
+  constructSearchTextClause(): StringFilterClause {
+    const { dimension } = this.props;
+    const { name: reference } = dimension;
+    const { searchText } = this.state;
+    return new StringFilterClause({
+      action: StringFilterAction.CONTAINS,
+      reference,
+      values: Set.of(searchText)
+    });
+  }
+
   onValueClick = (value: string, withModKey: boolean) => {
     const { selectedValues } = this.state;
     if (withModKey) {