CHANGELOG.md

@@ -1,11 +1,5 @@
 # @warkypublic/zustandsyncstore
 
-## 0.0.12
-
-### Patch Changes
-
-- 57c72e6: Search String and Better GoAPI functionality
-
 ## 0.0.11
 
 ### Patch Changes

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@warkypublic/oranguru",
   "author": "Warky Devs",
-  "version": "0.0.12",
+  "version": "0.0.11",
   "type": "module",
   "scripts": {
     "dev": "vite",

src/Gridler/components/Column.tsx

@@ -23,7 +23,6 @@ export interface GridlerColumn extends Partial<BaseGridColumn> {
   disableFilter?: boolean;
   disableMove?: boolean;
   disableResize?: boolean;
-  disableSearch?: boolean;
   disableSort?: boolean;
   getMenuItems?: (
     id: string,

src/Gridler/components/GridlerStore.tsx

@@ -90,7 +90,6 @@ export interface GridlerProps extends PropsWithChildren {
 
   rowHeight?: number;
   scrollToRowKey?: number;
-  searchStr?: string;
   sections?: {
     bottom?: React.ReactNode;
     left?: React.ReactNode;
@@ -107,8 +106,8 @@ export interface GridlerProps extends PropsWithChildren {
   title?: string;
   tooltipBarProps?: React.HTMLAttributes<HTMLDivElement>;
   total_rows?: number;
-
   uniqueid: string;
+
   values?: Array<Record<string, any>>;
   width?: number | string;
 }

src/Gridler/components/adaptors/GlidlerAPIAdaptorForGoLangv2.tsx

@@ -4,11 +4,7 @@ import React, { useCallback, useEffect } from 'react';
 import type { APIOptions } from '../../utils/types';
 import type { GridlerColumn } from '../Column';
 
-import {
+import { GoAPIHeaders, type GoAPIOperation } from '../../utils/golang-restapi-v2';
-  type FetchAPIOperation,
-  GoAPIHeaders,
-  type GoAPIOperation,
-} from '../../utils/golang-restapi-v2';
 import { useGridlerStore } from '../GridlerStore';
 
 export interface GlidlerAPIAdaptorForGoLangv2Props<T = unknown> extends APIOptions {
@@ -34,63 +30,38 @@ function _GlidlerAPIAdaptorForGoLangv2<T = unknown>(props: GlidlerAPIAdaptorForG
       const colSort = getState('colSort');
       const pageSize = getState('pageSize');
       const colFilters = getState('colFilters');
-      const searchStr = getState('searchStr');
       const _active_requests = getState('_active_requests');
       setState('loadingData', true);
       try {
         //console.log('APIAdaptorGoLangv2', { _active_requests, index, pageSize, props });
         if (props && props.url) {
           const head = new Headers();
+          head.set('x-limit', String(pageSize ?? 50));
+          head.set('x-offset', String((pageSize ?? 50) * index));
 
           head.set('Authorization', `Token ${props.authtoken}`);
-          const ops: FetchAPIOperation[] = [
-            { type: 'limit', value: String(pageSize ?? 50) },
-            { type: 'offset', value: String((pageSize ?? 50) * index) },
-          ];
 
           if (colSort?.length && colSort.length > 0) {
-            ops.push({
+            head.set(
-              type: 'sort',
+              'x-sort',
-              value: colSort
+              colSort
                 ?.map((sort: any) => `${sort.id} ${sort.direction}`)
-                .reduce((acc: any, val: any) => `${acc},${val}`),
+                .reduce((acc: any, val: any) => `${acc},${val}`)
-            });
+            );
           }
 
-          colFilters
+          if (colFilters?.length && colFilters.length > 0) {
-            ?.filter((f) => f.value?.length > 0)
+            colFilters
-            ?.forEach((filter: any) => {
+              ?.filter((f) => f.value?.length > 0)
-              if (filter.value && filter.value !== '') {
-                ops.push({
-                  name: `${filter.id}`,
-                  op: filter.operator,
-                  type: 'searchop',
-                  value: filter.value,
-                });
-              }
-            });
-
-          if (searchStr && searchStr !== '') {
-            columns
-              ?.filter((f) => !f.disableFilter && !f.disableSearch)
               ?.forEach((filter: any) => {
-                ops.push({
+                if (filter.value && filter.value !== '') {
-                  name: `${filter.id}`,
+                  head.set(`x-searchop-${filter.operator}-${filter.id}`, `${filter.value}`);
-                  op: filter.operator,
+                }
-                  type: 'searchor',
-                  value: searchStr,
-                });
               });
           }
-
           if (props.filter && props.filter !== '') {
-            ops.push({
+            head.set('x-custom-sql-w-buildin-filter', props.filter);
-              name: 'sql_filter',
-              type: 'custom-sql-w',
-              value: props.filter,
-            });
           }
-
           if (props.options && props.options.length > 0) {
             const optionHeaders = GoAPIHeaders(props.options);
             for (const oh in optionHeaders) {
@@ -109,18 +80,8 @@ function _GlidlerAPIAdaptorForGoLangv2<T = unknown>(props: GlidlerAPIAdaptorForG
             col_ids?.push(props.hotfields.join(','));
           }
 
-          if (ops && ops.length > 0) {
-            const optionHeaders = GoAPIHeaders(ops);
-            for (const oh in GoAPIHeaders(ops)) {
-              head.set(oh, optionHeaders[oh]);
-            }
-          }
-
           if (col_ids && col_ids.length > 0) {
-            ops.push({
+            head.set(`x-select-fields`, col_ids.join(','));
-              type: 'select-fields',
-              value: col_ids.join(','),
-            });
           }
 
           const currentRequestIndex = _active_requests?.findIndex((f) => f.page === index) ?? -1;
@@ -129,7 +90,6 @@ function _GlidlerAPIAdaptorForGoLangv2<T = unknown>(props: GlidlerAPIAdaptorForG
               r.controller?.abort?.();
             }
           });
-
           if (
             _active_requests &&
             currentRequestIndex >= 0 &&

src/Gridler/components/adaptors/GlidlerLocalDataAdaptor.tsx

@@ -16,30 +16,23 @@ export interface GlidlerLocalDataAdaptorProps<T = unknown> {
     cols: GridlerColumns | undefined,
     data: Array<T>
   ) => Array<T>;
-  onSearch?: (
-    searchField: string | undefined,
-    cols: GridlerColumns | undefined,
-    data: Array<T>
-  ) => Array<T>;
 }
 
 //The computer component does not need to be recalculated on every render, so we use React.memo to prevent unnecessary re-renders.
 function _GlidlerLocalDataAdaptor<T = unknown>(props: GlidlerLocalDataAdaptorProps<T>) {
   const [setState, getState, mounted] = useGridlerStore((s) => [s.setState, s.getState, s.mounted]);
 
-  const { colFilters, colSort, columns, searchStr } = useGridlerStore((s) => ({
+  const { colFilters, colSort, columns } = useGridlerStore((s) => ({
     colFilters: s.colFilters,
     colOrder: s.colOrder,
     colSize: s.colSize,
     colSort: s.colSort,
     columns: s.columns,
-    searchStr: s.searchStr,
   }));
 
   const refChanged = React.useRef({
     colFilters: colFilters,
     colSort: colSort,
-    searchStr: searchStr,
   });
 
   const useAPIQuery: (index: number) => Promise<any> = async (index: number) => {
@@ -77,16 +70,6 @@ function _GlidlerLocalDataAdaptor<T = unknown>(props: GlidlerLocalDataAdaptorPro
     }
   }, [colFilters, props.onColumnFilter]);
 
-  useEffect(() => {
-    if (props.onSearch && searchStr !== refChanged?.current?.searchStr) {
-      const filteredData = props.onSearch(searchStr, columns, props.data as Array<T>);
-      setState('total_rows', filteredData.length);
-      setState('data', filteredData);
-      refChanged.current.colFilters = colFilters;
-      getState('refreshCells')?.();
-    }
-  }, [searchStr, props.onSearch]);
-
   return <></>;
 }
 export const GlidlerLocalDataAdaptor = React.memo(_GlidlerLocalDataAdaptor);

src/Gridler/index.ts

@@ -2,7 +2,7 @@ export {GlidlerAPIAdaptorForGoLangv2 } from './components/adaptors/GlidlerAPIAda
 export {GlidlerFormAdaptor } from './components/adaptors/GlidlerFormAdaptor'
 export {GlidlerLocalDataAdaptor } from './components/adaptors/GlidlerLocalDataAdaptor'
 export * from './components/Column'
-export {type GridlerProps,type GridlerState, useGridlerStore } from './components/GridlerStore'
+export {type GridlerProps, useGridlerStore } from './components/GridlerStore'
 export { GridlerRightMenuIcon } from './components/RightMenuIcon'
 export {Gridler} from './Gridler'
 export  * from './utils'