@teselagen/ui 0.7.35 → 0.8.1

package/index.cjs.js

@@ -15848,7 +15848,6 @@ var itemSizeEstimator = /* @__PURE__ */ __name(function itemSizeEstimator2() {
   return 41.36;
 }, "itemSizeEstimator");
 var ReactTableDefaults = defaultProps;
-var VIRTUALIZE_CUTOFF_LENGTH = 200;
 var ReactTable = function(_Methods) {
   _inherits$8(ReactTable2, _Methods);
   function ReactTable2(props) {
@@ -16434,7 +16433,7 @@ var ReactTable = function(_Methods) {
                   minWidth: rowMinWidth + "px"
                 })
               }, tBodyProps.rest),
-              _this2.props.noVirtual || pageRows.length < VIRTUALIZE_CUTOFF_LENGTH ? pageRows.map(function(d2, i2) {
+              pageRows.length < 200 ? pageRows.map(function(d2, i2) {
                 return makePageRow(d2, i2);
               }) : React.createElement(ReactList, {
                 type: "variable",

package/index.es.js

@@ -15830,7 +15830,6 @@ var itemSizeEstimator = /* @__PURE__ */ __name(function itemSizeEstimator2() {
   return 41.36;
 }, "itemSizeEstimator");
 var ReactTableDefaults = defaultProps;
-var VIRTUALIZE_CUTOFF_LENGTH = 200;
 var ReactTable = function(_Methods) {
   _inherits$8(ReactTable2, _Methods);
   function ReactTable2(props) {
@@ -16416,7 +16415,7 @@ var ReactTable = function(_Methods) {
                   minWidth: rowMinWidth + "px"
                 })
               }, tBodyProps.rest),
-              _this2.props.noVirtual || pageRows.length < VIRTUALIZE_CUTOFF_LENGTH ? pageRows.map(function(d2, i2) {
+              pageRows.length < 200 ? pageRows.map(function(d2, i2) {
                 return makePageRow(d2, i2);
               }) : React__default.createElement(ReactList, {
                 type: "variable",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teselagen/ui",
-  "version": "0.7.35",
+  "version": "0.8.1",
   "main": "./src/index.js",
   "type": "module",
   "exports": {

package/src/DataTable/Columns.js

@@ -33,10 +33,10 @@ import getTextFromEl from "../utils/getTextFromEl";
 import rowClick, { finalizeSelection } from "./utils/rowClick";
 import { editCellHelper } from "./editCellHelper";
 import { getCellVal } from "./getCellVal";
+import { getCCDisplayName } from "./utils/queryParams";
 import { useDispatch } from "react-redux";
 import { change as _change } from "redux-form";
 import { RenderCell } from "./RenderCell";
-import { getCCDisplayName } from "./utils/tableQueryParamsToHasuraClauses";
 
 dayjs.extend(localizedFormat);
 

package/src/DataTable/DisplayOptions.js

@@ -10,7 +10,7 @@ import {
   Popover,
   Switch
 } from "@blueprintjs/core";
-import { getCCDisplayName } from "./utils/tableQueryParamsToHasuraClauses";
+import { getCCDisplayName } from "./utils/queryParams";
 
 const DisplayOptions = ({
   compact,

package/src/DataTable/FilterAndSortMenu.js

@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 import { DateInput, DateRangeInput } from "@blueprintjs/datetime";
-import { camelCase, startCase } from "lodash-es";
+import { camelCase } from "lodash-es";
 import classNames from "classnames";
 import {
   Menu,
@@ -349,40 +349,43 @@ function getFilterMenuItems(dataType) {
   let filterMenuItems = [];
   if (dataType === "string") {
     filterMenuItems = [
-      "contains",
-      "notContains",
-      "startsWith",
-      "endsWith",
-      "isExactly",
-      "regex",
-      "inList",
-      "notInList",
-      "isEmpty",
-      "notEmpty"
+      "Contains",
+      "Not Contains",
+      "Starts With",
+      "Ends With",
+      "Is Exactly",
+      "Regex",
+      "In List",
+      "Not In List",
+      "Is Empty",
+      "Not Empty"
     ];
   } else if (dataType === "lookup") {
     filterMenuItems = [
-      "contains",
-      "notContains",
-      "startsWith",
-      "endsWith",
-      "isExactly",
-      "regex"
+      "Contains",
+      "Not Contains",
+      "Starts With",
+      "Ends With",
+      "Is Exactly",
+      "Regex"
     ];
   } else if (dataType === "boolean") {
-    filterMenuItems = ["true", "false"];
+    filterMenuItems = ["True", "False"];
   } else if (dataType === "number" || dataType === "integer") {
+    // else if (dataType === "lookup") {
+    //   filterMenuItems = ["None"];
+    // }
     filterMenuItems = [
-      "greaterThan",
-      "lessThan",
-      "inRange",
-      "outsideRange",
-      "equalTo",
-      "inList",
-      "notInList"
+      "Greater Than",
+      "Less Than",
+      "In Range",
+      "Outside Range",
+      "Equal To",
+      "In List",
+      "Not In List"
     ];
   } else if (dataType === "timestamp") {
-    filterMenuItems = ["isBetween", "notBetween", "isBefore", "isAfter"];
+    filterMenuItems = ["Is Between", "Not Between", "Is Before", "Is After"];
   }
-  return filterMenuItems.map(item => startCase(item));
+  return filterMenuItems;
 }

package/src/DataTable/index.js

@@ -92,6 +92,7 @@ import { viewColumn, openColumn, multiViewColumn } from "./viewColumn";
 import convertSchema from "./utils/convertSchema";
 import TableFormTrackerContext from "./TableFormTrackerContext";
 import {
+  getCCDisplayName,
   getCurrentParamsFromUrl,
   getQueryParams,
   makeDataTableHandlers,
@@ -102,7 +103,6 @@ import { formValueSelector, change as _change } from "redux-form";
 import { throwFormError } from "../throwFormError";
 import { isObservableArray, toJS } from "mobx";
 import { isBeingCalledExcessively } from "../utils/isBeingCalledExcessively";
-import { getCCDisplayName } from "./utils/tableQueryParamsToHasuraClauses";
 
 enablePatches();
 const IS_LINUX = window.navigator.platform.toLowerCase().search("linux") > -1;
@@ -337,6 +337,16 @@ const DataTable = ({
 
   const queryParams = useMemo(() => {
     if (!isTableParamsConnected) {
+      const additionalFilterToUse =
+        typeof props.additionalFilter === "function"
+          ? props.additionalFilter
+          : () => props.additionalFilter;
+
+      const additionalOrFilterToUse =
+        typeof props.additionalOrFilter === "function"
+          ? props.additionalOrFilter
+          : () => props.additionalOrFilter;
+
       return getQueryParams({
         doNotCoercePageSize,
         currentParams,
@@ -346,7 +356,8 @@ const DataTable = ({
         schema: convertedSchema,
         isInfinite,
         isLocalCall,
-        additionalFilter: props.additionalFilter,
+        additionalFilter: additionalFilterToUse,
+        additionalOrFilter: additionalOrFilterToUse,
         noOrderError: props.noOrderError,
         isCodeModel: props.isCodeModel,
         ownProps: props
@@ -603,7 +614,7 @@ const DataTable = ({
                 : !val;
           });
         }
-        if (noValsForField && entities.length) {
+        if (noValsForField) {
           return {
             ...field,
             isHidden: true,