@teselagen/ui 0.8.6-beta.10 → 0.8.6-beta.12

package/index.cjs.js

@@ -19422,34 +19422,37 @@ function tableQueryParamsToHasuraClauses({
   if (searchTerm) {
     const searchTermFilters = [];
     const uniqueFieldsByPath = {};
+    const searchTerms = searchTerm.split(",");
     schema.fields.forEach((field) => {
       const { type: type2, path: path2, searchDisabled } = field;
       if (uniqueFieldsByPath[path2]) return;
       uniqueFieldsByPath[path2] = true;
       if (searchDisabled || field.filterDisabled || type2 === "color") return;
-      const filterValue = searchTerm;
-      if (type2 === "string" || type2 === "lookup") {
-        const o2 = set$1({}, path2, { _ilike: `%${filterValue}%` });
-        searchTermFilters.push(o2);
-      } else if (type2 === "boolean") {
-        let regex;
-        try {
-          regex = new RegExp("^" + searchTerm, "ig");
-        } catch (error) {
-        }
-        if (regex) {
-          if ("true".replace(regex, "") !== "true") {
-            const o2 = set$1({}, path2, { _eq: true });
-            searchTermFilters.push(o2);
-          } else if ("false".replace(regex, "") !== "false") {
-            const o2 = set$1({}, path2, { _eq: false });
-            searchTermFilters.push(o2);
+      searchTerms.forEach((term) => {
+        const filterValue = term.trim();
+        if (type2 === "string" || type2 === "lookup") {
+          const o2 = set$1({}, path2, { _ilike: `%${filterValue}%` });
+          searchTermFilters.push(o2);
+        } else if (type2 === "boolean") {
+          let regex;
+          try {
+            regex = new RegExp("^" + filterValue, "ig");
+          } catch (error) {
           }
+          if (regex) {
+            if ("true".replace(regex, "") !== "true") {
+              const o2 = set$1({}, path2, { _eq: true });
+              searchTermFilters.push(o2);
+            } else if ("false".replace(regex, "") !== "false") {
+              const o2 = set$1({}, path2, { _eq: false });
+              searchTermFilters.push(o2);
+            }
+          }
+        } else if ((type2 === "number" || type2 === "integer") && !isNaN(filterValue)) {
+          const o2 = set$1({}, path2, { _eq: parseFloat(filterValue) });
+          searchTermFilters.push(o2);
         }
-      } else if ((type2 === "number" || type2 === "integer") && !isNaN(filterValue)) {
-        const o2 = set$1({}, path2, { _eq: parseFloat(filterValue) });
-        searchTermFilters.push(o2);
-      }
+      });
     });
     if (searchTermFilters.length > 0) {
       if (Object.keys(where).length > 0) {
@@ -19462,10 +19465,8 @@ function tableQueryParamsToHasuraClauses({
   if (filters && filters.length > 0) {
     const filterClauses = filters.map((filter2) => {
       let { selectedFilter, filterOn, filterValue } = filter2;
-      console.log("filterOn:", filterOn);
       const fieldSchema = ccFields[filterOn] || {};
       const { path: path2, reference: reference2, type: type2, customColumnFilter } = fieldSchema;
-      console.log("customColumnFilter:", customColumnFilter);
       if (customColumnFilter) {
         return customColumnFilter(filterValue);
       }
@@ -19545,9 +19546,7 @@ function tableQueryParamsToHasuraClauses({
               },
               {
                 [filterOn]: {
-                  _gt: new Date(
-                    new Date(arrayFilterValue[1]).setHours(23, 59)
-                  )
+                  _gt: new Date(new Date(arrayFilterValue[1]).setHours(23, 59))
                 }
               }
             ]

package/index.es.js

@@ -19404,34 +19404,37 @@ function tableQueryParamsToHasuraClauses({
   if (searchTerm) {
     const searchTermFilters = [];
     const uniqueFieldsByPath = {};
+    const searchTerms = searchTerm.split(",");
     schema.fields.forEach((field) => {
       const { type: type2, path: path2, searchDisabled } = field;
       if (uniqueFieldsByPath[path2]) return;
       uniqueFieldsByPath[path2] = true;
       if (searchDisabled || field.filterDisabled || type2 === "color") return;
-      const filterValue = searchTerm;
-      if (type2 === "string" || type2 === "lookup") {
-        const o2 = set$1({}, path2, { _ilike: `%${filterValue}%` });
-        searchTermFilters.push(o2);
-      } else if (type2 === "boolean") {
-        let regex;
-        try {
-          regex = new RegExp("^" + searchTerm, "ig");
-        } catch (error) {
-        }
-        if (regex) {
-          if ("true".replace(regex, "") !== "true") {
-            const o2 = set$1({}, path2, { _eq: true });
-            searchTermFilters.push(o2);
-          } else if ("false".replace(regex, "") !== "false") {
-            const o2 = set$1({}, path2, { _eq: false });
-            searchTermFilters.push(o2);
+      searchTerms.forEach((term) => {
+        const filterValue = term.trim();
+        if (type2 === "string" || type2 === "lookup") {
+          const o2 = set$1({}, path2, { _ilike: `%${filterValue}%` });
+          searchTermFilters.push(o2);
+        } else if (type2 === "boolean") {
+          let regex;
+          try {
+            regex = new RegExp("^" + filterValue, "ig");
+          } catch (error) {
           }
+          if (regex) {
+            if ("true".replace(regex, "") !== "true") {
+              const o2 = set$1({}, path2, { _eq: true });
+              searchTermFilters.push(o2);
+            } else if ("false".replace(regex, "") !== "false") {
+              const o2 = set$1({}, path2, { _eq: false });
+              searchTermFilters.push(o2);
+            }
+          }
+        } else if ((type2 === "number" || type2 === "integer") && !isNaN(filterValue)) {
+          const o2 = set$1({}, path2, { _eq: parseFloat(filterValue) });
+          searchTermFilters.push(o2);
         }
-      } else if ((type2 === "number" || type2 === "integer") && !isNaN(filterValue)) {
-        const o2 = set$1({}, path2, { _eq: parseFloat(filterValue) });
-        searchTermFilters.push(o2);
-      }
+      });
     });
     if (searchTermFilters.length > 0) {
       if (Object.keys(where).length > 0) {
@@ -19444,10 +19447,8 @@ function tableQueryParamsToHasuraClauses({
   if (filters && filters.length > 0) {
     const filterClauses = filters.map((filter2) => {
       let { selectedFilter, filterOn, filterValue } = filter2;
-      console.log("filterOn:", filterOn);
       const fieldSchema = ccFields[filterOn] || {};
       const { path: path2, reference: reference2, type: type2, customColumnFilter } = fieldSchema;
-      console.log("customColumnFilter:", customColumnFilter);
       if (customColumnFilter) {
         return customColumnFilter(filterValue);
       }
@@ -19527,9 +19528,7 @@ function tableQueryParamsToHasuraClauses({
               },
               {
                 [filterOn]: {
-                  _gt: new Date(
-                    new Date(arrayFilterValue[1]).setHours(23, 59)
-                  )
+                  _gt: new Date(new Date(arrayFilterValue[1]).setHours(23, 59))
                 }
               }
             ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teselagen/ui",
-  "version": "0.8.6-beta.10",
+  "version": "0.8.6-beta.12",
   "main": "./src/index.js",
   "type": "module",
   "exports": {
@@ -17,7 +17,6 @@
     "@dnd-kit/core": "^6.1.0",
     "@dnd-kit/modifiers": "^7.0.0",
     "@dnd-kit/sortable": "^8.0.0",
-    "@teselagen/react-table": "6.10.16",
     "classnames": "^2.3.2",
     "color": "^3.2.1",
     "copy-to-clipboard": "^3.3.1",

package/src/DataTable/utils/initializeHasuraWhereAndFilter.js

@@ -12,4 +12,4 @@ export function initializeHasuraWhereAndFilter(
     }
   } else if (typeof additionalFilter === "object")
     where._and.push(additionalFilter);
-}
+}

package/src/DataTable/utils/queryParams.js

@@ -5,9 +5,7 @@ import {
   tableQueryParamsToHasuraClauses
 } from "./tableQueryParamsToHasuraClauses";
 import { filterLocalEntitiesToHasura } from "./filterLocalEntitiesToHasura";
-import {
-  initializeHasuraWhereAndFilter
-} from "./initializeHasuraWhereAndFilter";
+import { initializeHasuraWhereAndFilter } from "./initializeHasuraWhereAndFilter";
 
 const defaultPageSizes = [5, 10, 15, 25, 50, 100, 200, 400];
 

package/src/DataTable/utils/tableQueryParamsToHasuraClauses.js

@@ -20,39 +20,46 @@ export function tableQueryParamsToHasuraClauses({
     // Create a map to deduplicate fields by path
     const uniqueFieldsByPath = {};
 
+    // Split the search term by comma to support multi-term searching
+    const searchTerms = searchTerm.split(',');
+
     schema.fields.forEach(field => {
       const { type, path, searchDisabled } = field;
       if (uniqueFieldsByPath[path]) return; // Skip if already added
       uniqueFieldsByPath[path] = true;
       if (searchDisabled || field.filterDisabled || type === "color") return;
-      const filterValue = searchTerm; // No cleaning needed here, we're using _ilike
-
-      if (type === "string" || type === "lookup") {
-        const o = set({}, path, { _ilike: `%${filterValue}%` });
-        searchTermFilters.push(o);
-      } else if (type === "boolean") {
-        let regex;
-        try {
-          regex = new RegExp("^" + searchTerm, "ig");
-        } catch (error) {
-          //ignore
-        }
-        if (regex) {
-          if ("true".replace(regex, "") !== "true") {
-            const o = set({}, path, { _eq: true });
-            searchTermFilters.push(o);
-          } else if ("false".replace(regex, "") !== "false") {
-            const o = set({}, path, { _eq: false });
-            searchTermFilters.push(o);
+      
+      // Process each search term
+      searchTerms.forEach(term => {
+        const filterValue = term.trim(); // Trim the term to handle spaces after commas
+        
+        if (type === "string" || type === "lookup") {
+          const o = set({}, path, { _ilike: `%${filterValue}%` });
+          searchTermFilters.push(o);
+        } else if (type === "boolean") {
+          let regex;
+          try {
+            regex = new RegExp("^" + filterValue, "ig");
+          } catch (error) {
+            //ignore
           }
+          if (regex) {
+            if ("true".replace(regex, "") !== "true") {
+              const o = set({}, path, { _eq: true });
+              searchTermFilters.push(o);
+            } else if ("false".replace(regex, "") !== "false") {
+              const o = set({}, path, { _eq: false });
+              searchTermFilters.push(o);
+            }
+          }
+        } else if (
+          (type === "number" || type === "integer") &&
+          !isNaN(filterValue)
+        ) {
+          const o = set({}, path, { _eq: parseFloat(filterValue) });
+          searchTermFilters.push(o);
         }
-      } else if (
-        (type === "number" || type === "integer") &&
-        !isNaN(filterValue)
-      ) {
-        const o = set({}, path, { _eq: parseFloat(filterValue) });
-        searchTermFilters.push(o);
-      }
+      });
     });
 
     if (searchTermFilters.length > 0) {
@@ -65,166 +72,161 @@ export function tableQueryParamsToHasuraClauses({
   }
 
   if (filters && filters.length > 0) {
-    const filterClauses = filters
-      .map(filter => {
-        let { selectedFilter, filterOn, filterValue } = filter;
-        console.log('filterOn:', filterOn)
-        const fieldSchema = ccFields[filterOn] || {};
+    const filterClauses = filters.map(filter => {
+      let { selectedFilter, filterOn, filterValue } = filter;
+      const fieldSchema = ccFields[filterOn] || {};
 
-        const { path, reference, type, customColumnFilter } = fieldSchema;
-        console.log('customColumnFilter:', customColumnFilter)
-        if (customColumnFilter) {
-          return customColumnFilter(filterValue);
-        }
-        let stringFilterValue =
-          filterValue && filterValue.toString
-            ? filterValue.toString()
-            : filterValue;
-        if (stringFilterValue === false) {
-          // we still want to be able to search for the string "false" which will get parsed to false
-          stringFilterValue = "false";
-        } else {
-          stringFilterValue = stringFilterValue || "";
-        }
-        const arrayFilterValue = Array.isArray(filterValue)
-          ? filterValue
-          : stringFilterValue.split(";");
+      const { path, reference, type, customColumnFilter } = fieldSchema;
+      if (customColumnFilter) {
+        return customColumnFilter(filterValue);
+      }
+      let stringFilterValue =
+        filterValue && filterValue.toString
+          ? filterValue.toString()
+          : filterValue;
+      if (stringFilterValue === false) {
+        // we still want to be able to search for the string "false" which will get parsed to false
+        stringFilterValue = "false";
+      } else {
+        stringFilterValue = stringFilterValue || "";
+      }
+      const arrayFilterValue = Array.isArray(filterValue)
+        ? filterValue
+        : stringFilterValue.split(";");
 
-        if (type === "number" || type === "integer") {
-          filterValue = Array.isArray(filterValue)
-            ? filterValue.map(val => Number(val))
-            : Number(filterValue);
-        }
+      if (type === "number" || type === "integer") {
+        filterValue = Array.isArray(filterValue)
+          ? filterValue.map(val => Number(val))
+          : Number(filterValue);
+      }
 
-        if (fieldSchema.normalizeFilter) {
-          filterValue = fieldSchema.normalizeFilter(
-            filterValue,
-            selectedFilter,
-            filterOn
-          );
-        }
+      if (fieldSchema.normalizeFilter) {
+        filterValue = fieldSchema.normalizeFilter(
+          filterValue,
+          selectedFilter,
+          filterOn
+        );
+      }
 
-        if (reference) {
-          filterOn = reference.sourceField;
-        } else {
-          filterOn = path || filterOn;
-        }
-        switch (selectedFilter) {
-          case "none":
-            return {};
-          case "startsWith":
-            return { [filterOn]: { _ilike: `${filterValue}%` } };
-          case "endsWith":
-            return { [filterOn]: { _ilike: `%${filterValue}` } };
-          case "contains":
-            return { [filterOn]: { _ilike: `%${filterValue}%` } };
-          case "notContains":
-            return { [filterOn]: { _nilike: `%${filterValue}%` } };
-          case "isExactly":
-            return { [filterOn]: { _eq: filterValue } };
-          case "isEmpty":
-            if (filterOn.includes(".")) {
-              // if we're filtering on a nested field, like a sequence table with parts.name
-              // we really want to just query on the top level field's existence
-              return {
-                _not: {
-                  [filterOn.split(".")[0]]: {}
-                }
-              };
-            }
-            return {
-              _or: [
-                { [filterOn]: { _eq: "" } },
-                { [filterOn]: { _is_null: true } }
-              ]
-            };
-          case "notEmpty":
-            return {
-              _and: [
-                { [filterOn]: { _neq: "" } },
-                { [filterOn]: { _is_null: false } }
-              ]
-            };
-          case "inList":
-            return { [filterOn]: { _in: filterValue } };
-          case "notInList":
-            return { [filterOn]: { _nin: filterValue } };
-          case "true":
-            return { [filterOn]: { _eq: true } };
-          case "false":
-            return { [filterOn]: { _eq: false } };
-          case "dateIs":
-            return { [filterOn]: { _eq: filterValue } };
-          case "notBetween":
-            return {
-              _or: [
-                {
-                  [filterOn]: {
-                    _lt: new Date(arrayFilterValue[0])
-                  }
-                },
-                {
-                  [filterOn]: {
-                    _gt: new Date(
-                      new Date(arrayFilterValue[1]).setHours(23, 59)
-                    )
-                  }
-                }
-              ]
-            };
-          case "isBetween":
+      if (reference) {
+        filterOn = reference.sourceField;
+      } else {
+        filterOn = path || filterOn;
+      }
+      switch (selectedFilter) {
+        case "none":
+          return {};
+        case "startsWith":
+          return { [filterOn]: { _ilike: `${filterValue}%` } };
+        case "endsWith":
+          return { [filterOn]: { _ilike: `%${filterValue}` } };
+        case "contains":
+          return { [filterOn]: { _ilike: `%${filterValue}%` } };
+        case "notContains":
+          return { [filterOn]: { _nilike: `%${filterValue}%` } };
+        case "isExactly":
+          return { [filterOn]: { _eq: filterValue } };
+        case "isEmpty":
+          if (filterOn.includes(".")) {
+            // if we're filtering on a nested field, like a sequence table with parts.name
+            // we really want to just query on the top level field's existence
             return {
-              [filterOn]: {
-                _gte: new Date(arrayFilterValue[0]),
-                _lte: new Date(new Date(arrayFilterValue[1]).setHours(23, 59))
+              _not: {
+                [filterOn.split(".")[0]]: {}
               }
             };
-          case "isBefore":
-            return { [filterOn]: { _lt: new Date(filterValue) } };
-          case "isAfter":
-            return { [filterOn]: { _gt: new Date(filterValue) } };
-          case "greaterThan":
-            return { [filterOn]: { _gt: parseFloat(filterValue) } };
-          case "lessThan":
-            return { [filterOn]: { _lt: parseFloat(filterValue) } };
-          case "inRange":
-            return {
-              [filterOn]: {
-                _gte: parseFloat(arrayFilterValue[0]),
-                _lte: parseFloat(arrayFilterValue[1])
+          }
+          return {
+            _or: [
+              { [filterOn]: { _eq: "" } },
+              { [filterOn]: { _is_null: true } }
+            ]
+          };
+        case "notEmpty":
+          return {
+            _and: [
+              { [filterOn]: { _neq: "" } },
+              { [filterOn]: { _is_null: false } }
+            ]
+          };
+        case "inList":
+          return { [filterOn]: { _in: filterValue } };
+        case "notInList":
+          return { [filterOn]: { _nin: filterValue } };
+        case "true":
+          return { [filterOn]: { _eq: true } };
+        case "false":
+          return { [filterOn]: { _eq: false } };
+        case "dateIs":
+          return { [filterOn]: { _eq: filterValue } };
+        case "notBetween":
+          return {
+            _or: [
+              {
+                [filterOn]: {
+                  _lt: new Date(arrayFilterValue[0])
+                }
+              },
+              {
+                [filterOn]: {
+                  _gt: new Date(new Date(arrayFilterValue[1]).setHours(23, 59))
+                }
               }
-            };
-          case "outsideRange":
-            return {
-              _or: [
-                {
-                  [filterOn]: {
-                    _lt: parseFloat(arrayFilterValue[0])
-                  }
-                },
-                {
-                  [filterOn]: {
-                    _gt: parseFloat(arrayFilterValue[1])
-                  }
+            ]
+          };
+        case "isBetween":
+          return {
+            [filterOn]: {
+              _gte: new Date(arrayFilterValue[0]),
+              _lte: new Date(new Date(arrayFilterValue[1]).setHours(23, 59))
+            }
+          };
+        case "isBefore":
+          return { [filterOn]: { _lt: new Date(filterValue) } };
+        case "isAfter":
+          return { [filterOn]: { _gt: new Date(filterValue) } };
+        case "greaterThan":
+          return { [filterOn]: { _gt: parseFloat(filterValue) } };
+        case "lessThan":
+          return { [filterOn]: { _lt: parseFloat(filterValue) } };
+        case "inRange":
+          return {
+            [filterOn]: {
+              _gte: parseFloat(arrayFilterValue[0]),
+              _lte: parseFloat(arrayFilterValue[1])
+            }
+          };
+        case "outsideRange":
+          return {
+            _or: [
+              {
+                [filterOn]: {
+                  _lt: parseFloat(arrayFilterValue[0])
+                }
+              },
+              {
+                [filterOn]: {
+                  _gt: parseFloat(arrayFilterValue[1])
                 }
-              ]
-            };
-          case "equalTo":
-            return {
-              [filterOn]: {
-                _eq:
-                  type === "number" || type === "integer"
-                    ? parseFloat(filterValue)
-                    : filterValue
               }
-            };
-          case "regex":
-            return { [filterOn]: { _regex: filterValue } };
-          default:
-            console.warn(`Unsupported filter type: ${selectedFilter}`);
-            return {};
-        }
-      })
+            ]
+          };
+        case "equalTo":
+          return {
+            [filterOn]: {
+              _eq:
+                type === "number" || type === "integer"
+                  ? parseFloat(filterValue)
+                  : filterValue
+            }
+          };
+        case "regex":
+          return { [filterOn]: { _regex: filterValue } };
+        default:
+          console.warn(`Unsupported filter type: ${selectedFilter}`);
+          return {};
+      }
+    });
 
     if (filterClauses.length > 0) {
       if (Object.keys(where).length > 0) {

package/src/DataTable/utils/tableQueryParamsToHasuraClauses.test.js

@@ -44,6 +44,25 @@ describe("tableQueryParamsToHasuraClauses", () => {
       offset: 0
     });
   });
+  it("should handle searchTerm with string fields with a comma in them", () => {
+    const result = tableQueryParamsToHasuraClauses({
+      searchTerm: "test,test2",
+      schema
+    });
+    expect(result).toEqual({
+      where: {
+        _or: [
+          { name: { _ilike: "%test%" } },
+          { name: { _ilike: "%test2%" } },
+          { email: { _ilike: "%test%" } },
+          { email: { _ilike: "%test2%" } }
+        ]
+      },
+      order_by: [],
+      limit: 25,
+      offset: 0
+    });
+  });
   it("should flatten queries with dup paths", () => {
     const result = tableQueryParamsToHasuraClauses({
       searchTerm: "test",