Merge branch 'main' into postgrest-scroll

Author: davidsklar99

packages/data-sheet/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format
 is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this
 project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [unreleased] - 2025-07-10
+
+- PostgREST sheet has full table search ability
+
 ## [2.1.1] - 2025-06-25
 
 - Fix issue with exports and Parcel

packages/data-sheet/src/postgrest-table/data-loaders.ts

@@ -2,7 +2,7 @@
 
 import { useAsyncEffect } from "@macrostrat/ui-components";
 import { debounce } from "underscore";
-import { useCallback, useMemo, useReducer, useRef } from "react";
+import { useCallback, useMemo, useReducer, useRef, useEffect } from "react";
 import update, { Spec } from "immutability-helper";
 
 interface ChunkIndex {
@@ -36,7 +36,8 @@ type LazyLoaderAction<T> =
   | { type: "loaded"; data: T[]; offset: number; totalSize: number }
   | { type: "error"; error: Error }
   | { type: "set-visible"; region: RowRegion }
-  | { type: "update-data"; changes: Spec<T[]> };
+  | { type: "update-data"; changes: Spec<T[]> }
+  | { type: "reset" };
 
 function adjustArraySize<T>(arr: T[], newSize: number) {
   if (newSize == null || arr.length === newSize) {
@@ -84,6 +85,15 @@ function lazyLoadingReducer<T>(
         data,
         loading: false,
       };
+
+    case "reset":
+      return {
+        data: [],
+        loading: false,
+        error: null,
+        visibleRegion: { rowIndexStart: 0, rowIndexEnd: 0 },
+        initialized: false,
+      };
     case "error":
       return {
         ...state,
@@ -138,6 +148,7 @@ interface QueryConfig {
   offset?: number;
   order?: PostgrestOrder<any>;
   after?: any;
+  fullTextSearch?: string;
   filter?: (
     query: PostgrestFilterBuilder<any, any, any>,
   ) => PostgrestFilterBuilder<any, any, any>;
@@ -150,6 +161,8 @@ function buildQuery<T>(
   const { columns = "*", count } = config;
   const opts = { count };
 
+  console.log("config", config);
+
   let cols: string;
   if (Array.isArray(columns)) {
     cols = columns.join(", ");
@@ -162,6 +175,7 @@ function buildQuery<T>(
   if (config.filter) {
     query = config.filter(query);
   }
+  console.log("query", query.url.search);
 
   if (config.order != null) {
     const { key: orderKey, ...rest } = config.order;

packages/data-sheet/src/postgrest-table/index.ts

@@ -4,13 +4,14 @@ import styles from "./main.module.sass";
 import { DataSheet, getRowsToDelete } from "../core"; //getRowsToDelete
 import { LithologyTag, Tag, TagSize } from "@macrostrat/data-components";
 import { PostgrestOrder, usePostgRESTLazyLoader } from "./data-loaders";
-import { Spinner } from "@blueprintjs/core";
+import { Spinner, InputGroup } from "@blueprintjs/core";
 
 export * from "./data-loaders";
-import { useCallback } from "react";
+import { useCallback, useState, useRef } from "react";
 import {
   ErrorBoundary,
   ToasterContext,
+  useAPIResult,
   useToaster,
 } from "@macrostrat/ui-components";
 import { Spec } from "immutability-helper";
@@ -40,6 +41,8 @@ interface PostgRESTTableViewProps<T extends object>
   columns?: string;
   editable?: boolean;
   identityKey?: string;
+  enableFullTableSearch?: boolean;
+  dataSheetActions?: any;
   filter(
     query: PostgrestFilterBuilder<T, any, any>,
   ): PostgrestFilterBuilder<T, any, any>;
@@ -61,10 +64,32 @@ function _PostgRESTTableView<T>({
   order,
   columns,
   editable = false,
-  filter,
+  filter = undefined,
+  enableFullTableSearch = false,
+  dataSheetActions,
   identityKey = "id",
   ...rest
 }: PostgRESTTableViewProps<T>) {
+  const [input, setInput] = useState("");
+
+  if (enableFullTableSearch) {
+    const columnList = columns ?? getColumnList(endpoint, table);
+
+    filter = (query) => {
+      const urlParams = new URLSearchParams(query.url.search);
+      urlParams.delete("or");
+      query.url.search = urlParams.toString() ? `?${urlParams.toString()}` : "";
+
+      if (input.length > 2 && enableFullTableSearch) {
+        const conditions = columnList?.map((col) => `${col}.ilike.*${input}*`);
+
+        return query.or(conditions.join(","));
+      }
+
+      return query;
+    };
+  }
+
   const { data, onScroll, dispatch, client } = usePostgRESTLazyLoader(
     endpoint,
     table,
@@ -99,6 +124,9 @@ function _PostgRESTTableView<T>({
   return h("div.data-sheet-outer", [
     h(DataSheet, {
       ...rest,
+      dataSheetActions: enableFullTableSearch
+        ? h(SearchAction, { input, setInput, dispatch })
+        : dataSheetActions,
       data,
       columnSpecOptions: columnOptions ?? {},
       editable,
@@ -231,3 +259,33 @@ export function ExpandedLithologies({ value, onChange }) {
     ]),
   ]);
 }
+
+export function SearchAction({ input, setInput, dispatch }) {
+  return h(InputGroup, {
+    type: "search",
+    placeholder: "Search table...",
+    value: input,
+    onChange(event) {
+      const search = event.target.value;
+      if (search.length > 2 || (input.length === 3 && search.length < 3)) {
+        dispatch({ type: "reset" });
+      }
+      setInput(search.toLowerCase());
+    },
+  });
+}
+
+function getColumnList(endpoint: string, table: string) {
+  const url = `${endpoint}/${table}?select=*&limit=1`;
+  const res = useAPIResult(url);
+
+  if (!res || !Array.isArray(res) || res.length === 0) return [];
+
+  const sampleRow = res[0];
+
+  return Object.entries(sampleRow)
+    .filter(([_, value]) => {
+      return typeof value === "string";
+    })
+    .map(([key]) => key);
+}

packages/data-sheet/stories/postgrest-sheet.stories.ts

@@ -97,6 +97,12 @@ export const Simple = {
   args: {},
 };
 
+export const FullTableSearch = {
+  args: {
+    enableFullTableSearch: true,
+  },
+};
+
 export const ReorderableColumns = {
   args: {
     columnOptions: defaultColumnOptions,

packages/feedback-components/CHANGELOG.md

@@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file. The format
 is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this
 project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.2] - 2025-07-10
+
+- Increased the default line spacing in the paragraph text (made it configurable
+  via a CSS variable)
+- Added a toggle in the graph view to show labels for all nodes, and made nodes
+  slightly bigger
+- Unified selection interactions
+- Updated tags in the "select list" on the right to have styling for
+  selected/unselected states consistent with the rest of the interface
+- Added "assistant panel" style entity types selector
+- Added a border to selected tags in the paragraph area, similar to the list
+  view
+- Snapped tag selections to word boundaries
+
 ## [1.1.1] - 2025-07-01
 
 - new text component, following same clicking rules as tree

packages/feedback-components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@macrostrat/feedback-components",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "",
   "source": "src/index.ts",
   "type": "module",