@operato/data-grist 2.0.0-alpha.102 → 2.0.0-alpha.104

package/src/renderers/ox-grist-renderer-select.ts

@@ -1,11 +1,41 @@
 import { html } from 'lit'
+import { until } from 'lit/directives/until.js'
 
-import { FieldRenderer } from '../types'
+import { FieldRenderer, SelectOption, SelectOptionObject } from '../types'
+
+function buildOptions(options: SelectOption[], value: any) {
+  const selectOptionObjects = options.map(option => {
+    switch (typeof option) {
+      case 'string':
+        return {
+          display: option,
+          value: option
+        }
+      case 'object':
+        return {
+          display: option.display || option.name,
+          value: option.value
+        }
+      default:
+        return option
+    }
+  }) as SelectOptionObject[]
+
+  var res = selectOptionObjects
+    ? selectOptionObjects.filter((option: any) => option.value == String(value == null ? '' : value))
+    : []
+
+  if (res.length) {
+    return html`<span>${res[0].display || res[0].name || ''}</span>`
+  }
+  return html`<span>${value}</span>`
+}
 
 export const OxGristRendererSelect: FieldRenderer = (value, column, record, rowIndex, field) => {
   if (value == null) {
     return ''
   }
+
   var rowOptionField = column.record.rowOptionField && record[column.record.rowOptionField]
   var options = rowOptionField?.options ? rowOptionField.options : column.record.options
 
@@ -13,11 +43,16 @@ export const OxGristRendererSelect: FieldRenderer = (value, column, record, rowI
     console.error(`options value for select '${column.name}' column is mandatory.`)
   } else if (typeof options == 'function') {
     options = options.call(null, value, column, record, rowIndex, field)
-  }
 
-  var res = options ? options.filter((option: any) => option.value == String(value == null ? '' : value)) : []
-  if (res.length) {
-    return html`<span>${res[0].display}</span>`
+    if (options instanceof Promise) {
+      return html`${until(
+        options.then(options => buildOptions(options, value)),
+        value
+      )}`
+    } else {
+      return buildOptions((options || []) as SelectOption[], value)
+    }
+  } else {
+    return buildOptions((options || []) as SelectOption[], value)
   }
-  return html`<span>${value}</span>`
 }

package/src/types.ts

@@ -9,7 +9,7 @@ import { DataListGutter } from './data-list/data-list-gutter'
 import { RecordPartial } from './data-list/record-partial'
 import { DataReportField } from './data-report/data-report-field'
 import { OxGristEditor } from './editors'
-import { QueryFilter } from './filters'
+import { QueryFilter, OxFiltersForm } from './filters'
 import { OxGristRenderer } from './renderers/ox-grist-renderer'
 
 /**
@@ -83,6 +83,22 @@ export type FilterOperator =
   | 'i_nlike'
   | 'nlike'
 
+export type SelectOptionObject =
+  | {
+      name: string
+      display?: never
+      value: string
+    }
+  | {
+      display: string
+      name?: never
+      value: string
+    }
+
+export type SelectOption = SelectOptionObject | string
+
+export type FilterChangedCallback = (value: any, form: OxFiltersForm) => boolean
+
 /**
  * Configuration object for specifying filter conditions.
  *
@@ -99,6 +115,8 @@ export type FilterConfigObject = {
   options?: { [key: string]: any }
   value?: string | number | boolean | string[] | number[] | undefined
   label?: string
+  boundTo?: string[]
+  onchange?: FilterChangedCallback
 }
 
 /**

package/stories/bounded-select-filters.stories.ts

@@ -0,0 +1,313 @@
+import '../src/index.js'
+import '../src/filters/filters-form.js'
+import '../src/sorters/sorters-control.js'
+import '@operato/popup/ox-popup-list.js'
+import '@material/web/icon/icon.js'
+
+import { html, TemplateResult } from 'lit'
+import { sleep } from '@operato/utils'
+
+import { ColumnConfig, FetchHandler, GristRecord, SelectOption } from '../src/types.js'
+
+import { CommonHeaderStyles, CommonGristStyles } from '@operato/styles'
+import { DataGridField } from '../src/data-grid/data-grid-field.js'
+
+const fetchHandler: FetchHandler = async ({ sorters = [], filters, page, limit }) => {
+  var total = 120993
+  var start = (page! - 1) * limit!
+
+  await new Promise(resolve => setTimeout(resolve, 500))
+
+  return {
+    total,
+    records: Array(limit! * page! > total ? total % limit! : limit)
+      .fill('')
+      .map((item, idx) => {
+        const warehouse = idx % 2 ? '01' : '02'
+        const zone = idx % 2 ? 'Z001' : 'Z002'
+
+        return {
+          id: String(idx),
+          name: idx % 2 ? `shnam-${start + idx + 1}` : `heartyoh-${start + idx + 1}`,
+          description: idx % 2 ? `hatiolabmanager${start + idx + 1}1234567890` : `hatiosea manager-${start + idx + 1}`,
+          warehouse,
+          zone,
+          location: `L${warehouse}-${zone}-0${(idx % 5) + 1}`,
+          createdAt: Date.now(),
+          updatedAt: Date.now()
+        }
+      })
+  }
+}
+
+function buildConfig({ headerFilter }: { headerFilter: boolean }) {
+  return {
+    list: {
+      fields: ['name', 'description'],
+      details: ['updatedAt', 'createdAt']
+    },
+    columns: [
+      {
+        type: 'gutter',
+        gutterName: 'sequence'
+      },
+      {
+        type: 'string',
+        name: 'id',
+        hidden: true
+      },
+      {
+        type: 'string',
+        name: 'name',
+        label: true,
+        header: 'name',
+        filter: {
+          operator: 'eq',
+          value: 'shnam'
+        },
+        sortable: true,
+        width: 120
+      },
+      {
+        type: 'string',
+        name: 'description',
+        header: 'description',
+        record: {
+          align: 'left'
+        },
+        width: 200
+      },
+      {
+        type: 'select',
+        name: 'warehouse',
+        header: 'warehouse',
+        filter: {
+          operator: 'eq'
+        },
+        record: {
+          align: 'left',
+          options: async (
+            value: any,
+            column: ColumnConfig,
+            record: GristRecord,
+            rowIndex: number,
+            field: DataGridField
+          ): Promise<SelectOption[]> => {
+            await sleep(1000) // 테스트를 위해서 강제로 1초 쉬기
+            return [
+              {
+                display: '',
+                value: ''
+              }
+            ].concat(
+              WAREHOUSE.map(w => {
+                return {
+                  display: w.name,
+                  value: w.id
+                }
+              })
+            )
+          }
+        },
+        width: 200
+      },
+      {
+        type: 'select',
+        name: 'zone',
+        header: 'zone',
+        filter: {
+          operator: 'eq',
+          boundTo: ['warehouse'],
+          onchange: () => {
+            console.log('warehousde filter value changed.')
+          }
+        },
+        record: {
+          align: 'left',
+          options: async (
+            value: any,
+            column: ColumnConfig,
+            record: GristRecord,
+            rowIndex: number,
+            field: DataGridField
+          ): Promise<SelectOption[]> => {
+            console.log('arguments', arguments)
+            await sleep(1000) // 테스트를 위해서 강제로 1초 쉬기
+            const warehouse = record.warehouse
+            console.log('warehouse', warehouse)
+
+            const targetWH = warehouse && WAREHOUSE.find(w => w.id == warehouse)
+            const zones = targetWH
+              ? targetWH.zones
+              : WAREHOUSE.reduce((sum, warehouse) => {
+                  sum = sum.concat(warehouse.zones)
+                  return sum
+                }, [] as any[])
+
+            return [
+              {
+                display: '',
+                value: ''
+              }
+            ].concat(
+              zones.map((z: any) => {
+                return {
+                  display: z.name,
+                  value: z.id
+                }
+              })
+            )
+          }
+        },
+        width: 200
+      },
+      {
+        type: 'select',
+        name: 'location',
+        header: 'location',
+        filter: {
+          operator: 'eq',
+          boundTo: ['warehouse', 'zone']
+        },
+        record: {
+          align: 'left',
+          options: async (
+            value: any,
+            column: ColumnConfig,
+            record: GristRecord,
+            rowIndex: number,
+            field: DataGridField
+          ): Promise<SelectOption[]> => {
+            await sleep(1000) // 테스트를 위해서 강제로 1초 쉬기
+            const warehouse = record.warehouse
+            const zone = record.zone
+            console.log('warehouse, zone', warehouse, zone)
+
+            const targetWH = (warehouse && WAREHOUSE.find(w => w.id == warehouse)) || null
+            const targetZone = zone && targetWH?.zones.find((z: any) => z.id == zone)
+            return targetZone ? ['', ...targetZone.locations] : []
+          }
+        },
+        width: 200
+      },
+      {
+        type: 'datetime',
+        name: 'updatedAt',
+        header: 'updated at',
+        width: 180
+      },
+      {
+        type: 'datetime',
+        name: 'createdAt',
+        header: 'created at',
+        width: 180
+      }
+    ],
+    rows: {},
+    sorters: [
+      {
+        name: 'name',
+        desc: true
+      }
+    ],
+    filters: {
+      header: headerFilter
+    },
+    pagination: {
+      pages: [30, 50, 100, 200]
+    }
+  }
+}
+
+const WAREHOUSE = [
+  {
+    id: '01',
+    name: '제 1 창고',
+    zones: [
+      {
+        id: 'Z001',
+        name: 'Zone 01-001',
+        locations: ['L01-001-01', 'L01-001-02', 'L01-001-03', 'L01-001-04', 'L01-001-05']
+      },
+      {
+        id: 'Z002',
+        name: 'Zone 01-002',
+        locations: ['L01-002-01', 'L01-002-02', 'L01-002-03', 'L01-002-04', 'L01-002-05']
+      }
+    ]
+  },
+  {
+    id: '02',
+    name: '제 2 창고',
+    zones: [
+      {
+        id: 'Z001',
+        name: 'Zone 02-001',
+        locations: ['L02-001-01', 'L02-001-02', 'L02-001-03', 'L02-001-04', 'L02-001-05']
+      },
+      {
+        id: 'Z002',
+        name: 'Zone 02-002',
+        locations: ['L02-002-01', 'L02-002-02', 'L02-002-03', 'L02-002-04', 'L02-002-05']
+      }
+    ]
+  }
+]
+
+export default {
+  title: 'bounded select filters for ox-grist',
+  component: 'ox-grist',
+  argTypes: {
+    headerFilter: { control: 'boolean' }
+  }
+}
+
+interface Story<T> {
+  (args: T): TemplateResult
+  args?: Partial<T>
+  argTypes?: Record<string, unknown>
+}
+
+interface ArgTypes {
+  headerFilter: boolean
+}
+
+const Template: Story<ArgTypes> = ({ headerFilter }: ArgTypes) =>
+  html` <link
+      href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL@20..48,100..700,0..1"
+      rel="stylesheet"
+    />
+    <link
+      href="https://fonts.googleapis.com/css2?family=Material+Symbols+Rounded:opsz,wght,FILL@20..48,100..700,0..1"
+      rel="stylesheet"
+    />
+    <link
+      href="https://fonts.googleapis.com/css2?family=Material+Symbols+Sharp:opsz,wght,FILL@20..48,100..700,0..1"
+      rel="stylesheet"
+    />
+    <link href="/themes/app-theme.css" rel="stylesheet" />
+    <link href="/themes/oops-theme.css" rel="stylesheet" />
+    <link href="/themes/grist-theme.css" rel="stylesheet" />
+
+    <style>
+      ${CommonGristStyles.cssText}
+      ${CommonHeaderStyles.cssText}
+    </style>
+
+    <ox-grist
+      .config=${buildConfig({ headerFilter })}
+      mode="GRID"
+      .fetchHandler=${fetchHandler}
+      @filters-change=${(e: Event) => console.log('filters', (e.target as any).filters)}
+    >
+      <div slot="headroom">
+        <div id="filters">
+          <ox-filters-form></ox-filters-form>
+        </div>
+      </div>
+    </ox-grist>`
+
+export const Regular = Template.bind({})
+Regular.args = {
+  headerFilter: true
+}