@operato/data-grist 1.1.14 → 1.1.15

package/src/filters/filters-form.ts

@@ -116,13 +116,15 @@ export class FiltersForm extends LitElement {
   }
 
   render(): TemplateResult {
-    const { name: firstSearchFilterName } = this.searchColumns[0] || {}
+    // const { name: firstSearchFilterName } = this.searchColumns[0] || {}
+    // const searchValue =
+    //   (firstSearchFilterName &&
+    //     (this.value?.find(filter => filter.name === firstSearchFilterName)?.value as string)?.match(
+    //       /^\%(.*)\%$/
+    //     )?.[1]) ||
+    //   ''
     const searchValue =
-      (firstSearchFilterName &&
-        (this.value?.find(filter => filter.name === firstSearchFilterName)?.value as string)?.match(
-          /^\%(.*)\%$/
-        )?.[1]) ||
-      ''
+      (this.value?.find(filter => filter.operator === 'search')?.value as string)?.match(/^\%(.*)\%$/)?.[1] || ''
 
     return html`
       <form
@@ -268,7 +270,7 @@ export class FiltersForm extends LitElement {
   }
 
   public setInputValue(name: string, value: any) {
-    const input = this.renderRoot.querySelector(`form > [name="${name}"]`) as HTMLInputElement
+    const input = this.renderRoot.querySelector(`form [name="${name}"]`) as HTMLInputElement
     if (input) {
       input.value = value
       input.dispatchEvent(new Event('change', { bubbles: true }))

package/src/index.ts

@@ -12,3 +12,5 @@ export * from './gutters'
 export * from './filters'
 export * from './sorters/sorters-control'
 export * from './record-view'
+
+export * from './utils/list-param'

package/src/types.ts

@@ -111,6 +111,7 @@ export type ColumnConfig = {
   filter?: FilterConfig
   imex?: ImexConfig
   multiple?: boolean
+  rowCount?: boolean
 }
 
 export type ValidationCallback = (after: any, before: any, record: GristRecord, column: ColumnConfig) => boolean

package/src/utils/index.ts

@@ -1 +1,2 @@
 export * from './supports-passive'
+export * from './list-param'

package/src/utils/list-param.ts

@@ -0,0 +1,72 @@
+import json5 from 'json5'
+import pickBy from 'lodash-es/pickBy'
+
+import { FilterValue, SortersConfig } from '../types'
+
+export function convertListParamToSearchString({
+  filters,
+  sorters,
+  page,
+  limit,
+  base
+}: {
+  filters?: FilterValue[]
+  sorters?: SortersConfig
+  page?: number
+  limit?: number
+  base?: string
+}) {
+  const urlParams = new URLSearchParams(base)
+
+  if (sorters) {
+    if (sorters.length > 0) {
+      urlParams.set('sorters', json5.stringify(sorters))
+    } else {
+      urlParams.delete('sorters')
+    }
+  }
+
+  if (filters) {
+    if (filters.length > 0) {
+      urlParams.set('filters', json5.stringify(filters))
+    } else {
+      urlParams.delete('filters')
+    }
+  }
+
+  if (!isNaN(page as any)) {
+    urlParams.set('page', String(page))
+  }
+
+  if (!isNaN(limit as any)) {
+    urlParams.set('limit', String(limit))
+  }
+
+  return String(urlParams)
+}
+
+export function convertSearchStringToListParam(searchParams: string): {
+  filters?: FilterValue[]
+  sorters?: SortersConfig
+  pagination?: {
+    page?: number
+    limit?: number
+  }
+} {
+  const urlParams = new URLSearchParams(searchParams)
+
+  return pickBy(
+    {
+      filters: json5.parse(urlParams.get('filters') || '[]'),
+      sorters: json5.parse(urlParams.get('sorters') || '[]'),
+      pagination: pickBy(
+        {
+          page: Number(urlParams.get('page')),
+          limit: Number(urlParams.get('limit'))
+        },
+        v => !isNaN(v)
+      )
+    },
+    v => v !== undefined && !(typeof v === 'object' && Object.keys(v).length == 0)
+  )
+}