@operato/app 1.0.0 → 1.0.1

package/src/grist-editor/ox-selector-resource-object.ts

@@ -1,54 +1,46 @@
 import '@operato/data-grist'
-import '@operato/form/ox-search-form.js'
 
 import gql from 'graphql-tag'
 import { css, html, LitElement } from 'lit'
 import { customElement, property, query } from 'lit/decorators.js'
 
-import {
-  ColumnConfig,
-  DataGrist,
-  FetchHandler,
-  FetchOption,
-  GristData,
-  GristEventHandler,
-  GristRecord,
-  ZERO_DATA
-} from '@operato/data-grist'
-import { MultiColumnFormStyles, SearchForm } from '@operato/form'
-import { buildArgs, client, gqlContext } from '@operato/graphql'
+import { DataGrist, FetchHandler, GristData, GristEventHandler, GristRecord, ZERO_DATA } from '@operato/data-grist'
+import { client, gqlContext } from '@operato/graphql'
 import { i18next } from '@operato/i18n'
 import { closePopup } from '@operato/popup'
-import { isMobileDevice } from '@operato/utils'
+import { adjustFilters, isMobileDevice } from '@operato/utils'
 
 @customElement('ox-selector-resource-object')
 export class OxSelectorResourceObject extends LitElement {
   static styles = [
-    MultiColumnFormStyles,
     css`
       :host {
         display: flex;
         flex-direction: column;
 
         background-color: #fff;
+
+        width: var(--overlay-center-normal-width, 50%);
+        height: var(--overlay-center-normal-height, 50%);
       }
 
       ox-grist {
         flex: 1;
       }
 
-      .button-container {
+      #filters {
         display: flex;
-        margin-left: auto;
+        flex-direction: row;
+        justify-content: space-between;
       }
 
-      form {
-        position: relative;
+      #filters > * {
+        padding: var(--padding-default) var(--padding-wide);
       }
 
-      [search] {
-        position: absolute;
-        right: 0;
+      .button-container {
+        display: flex;
+        margin-left: auto;
       }
     `
   ]
@@ -76,29 +68,20 @@ export class OxSelectorResourceObject extends LitElement {
   @property({ type: String }) valueField: string | ((item: any) => any) = 'id'
 
   @query('ox-grist') grist!: DataGrist
-  @query('ox-search-form') searchForm!: SearchForm
 
   render() {
     return html`
-      <ox-search-form
-        id="search-form"
-        @keypress=${(e: KeyboardEvent) => {
-          if (e.key === 'Enter') {
-            this.grist.fetch()
-          }
-        }}
-        @submit=${(e: SubmitEvent) => this.grist.fetch()}
-        .fields=${this.searchFields}
-        autofocus
-      ></ox-search-form>
-
       <ox-grist
         .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
         .config=${this.config}
         .data=${this.data}
         .fetchHandler=${this.fetchHandler.bind(this)}
         .selectedRecords=${this.selectedRecords}
-      ></ox-grist>
+      >
+        <div id="filters" slot="headroom">
+          <ox-filters-form autofocus></ox-filters-form>
+        </div>
+      </ox-grist>
 
       <div class="button-container">
         <mwc-button @click=${this.onempty.bind(this)}>${i18next.t('button.empty')}</mwc-button>
@@ -122,15 +105,21 @@ export class OxSelectorResourceObject extends LitElement {
     closePopup(this)
   }
 
-  fetchHandler: FetchHandler = async ({ filters, page, limit, sorters = [] }) => {
+  fetchHandler: FetchHandler = async ({ filters = [], page, limit, sortings = [] }) => {
+    if (this.basicArgs) {
+      filters = adjustFilters(filters, this.basicArgs)
+    }
+    const pagination = { page, limit }
+
     const response = await client.query({
       query: gql`
-        query {
-          fetch: ${this.queryName} (${buildArgs(await this._buildConditions({ filters, page, limit, sorters }))}) {
+        query($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+          fetch: ${this.queryName} (filters: $filters, pagination: $pagination, sortings: $sortings) {
             ${this.getSelectFields()}
           }
         }
       `,
+      variables: { filters, pagination, sortings },
       context: gqlContext()
     })
 
@@ -191,118 +180,51 @@ export class OxSelectorResourceObject extends LitElement {
       }
     }
 
-    if (this.select && this.select.length > 0) {
-      let _searchFields = this.select.filter(selectField => !selectField.hidden && !selectField.ignoreCondition)
-      if (this.list && this.list.fields && this.list.fields.length > 0) {
-        _searchFields = _searchFields.filter(searchField => this.list.fields.indexOf(searchField.name) >= 0)
-      } else {
-        _searchFields = _searchFields.slice(0, 4)
-      }
-
-      this.searchFields = _searchFields.map(selectField => {
-        const fieldType = (selectField.type && selectField.type.toLowerCase()) || 'string'
-        const numberTypes = ['integer', 'float']
-        return {
-          label: selectField.header || i18next.t(`field.${selectField.name}`),
-          name: selectField.name,
-          type:
-            fieldType === 'string'
-              ? 'text'
-              : numberTypes.indexOf(fieldType) >= 0
-              ? 'number'
-              : fieldType === 'boolean'
-              ? 'checkbox'
-              : fieldType,
-          queryName: selectField.queryName,
-          props:
-            fieldType === 'string'
-              ? { searchOper: 'i_like' }
-              : fieldType === 'object'
-              ? { searchOper: 'in' }
-              : { searchOper: 'eq' },
-          attrs: fieldType === 'boolean' ? ['indeterminated'] : []
-        }
-      })
-      this.config = {
-        ...this.config,
-        columns: [
-          ...this.config.columns,
-          ...this.select.map(selectField => {
-            return {
-              ...selectField,
-              type: selectField.type || 'string',
-              width: selectField.width || 160,
-              header: selectField.header || i18next.t(`field.${selectField.name}`)
-            }
-          })
-        ]
-      }
-    } else {
-      this.searchFields = [
-        {
-          label: i18next.t('field.name'),
-          name: 'name',
-          type: 'text',
-          props: { searchOper: 'i_like' }
+    const select = this.select || [
+      {
+        type: 'string',
+        name: 'id',
+        header: i18next.t('field.id'),
+        hidden: true
+      },
+      {
+        type: 'string',
+        name: 'name',
+        header: i18next.t('field.name'),
+        record: {
+          align: 'left'
         },
-        {
-          label: i18next.t('field.description'),
-          name: 'description',
-          type: 'text',
-          props: { searchOper: 'i_like' }
-        }
-      ]
-
-      this.config = {
-        ...this.config,
-        columns: [
-          ...this.config.columns,
-          {
-            type: 'string',
-            name: 'id',
-            header: i18next.t('field.id'),
-            hidden: true
-          },
-          {
-            type: 'string',
-            name: 'name',
-            header: i18next.t('field.name'),
-            record: {
-              align: 'left'
-            },
-            sortable: true,
-            width: 160
-          },
-          {
-            type: 'string',
-            name: 'description',
-            header: i18next.t('field.description'),
-            record: {
-              align: 'left'
-            },
-            sortable: true,
-            width: 300
-          }
-        ]
+        sortable: true,
+        filter: 'search',
+        width: 160
+      },
+      {
+        type: 'string',
+        name: 'description',
+        header: i18next.t('field.description'),
+        record: {
+          align: 'left'
+        },
+        sortable: true,
+        filter: 'search',
+        width: 300
       }
-    }
+    ]
 
     this.config = {
       ...this.config,
-      list: {
-        ...this.list,
-        fields:
-          this.list && this.list.fields && this.list.fields.length > 0
-            ? this.list.fields
-            : (this.config.columns as ColumnConfig[])
-                .filter(column => column.type !== 'gutter')
-                .slice(0, 3)
-                .map(column => column.name)
-      }
+      columns: [
+        ...this.config.columns,
+        ...select.map(selectField => {
+          return {
+            ...selectField,
+            type: selectField.type || 'string',
+            width: selectField.width || 160,
+            header: selectField.header || i18next.t(`field.${selectField.name}`)
+          }
+        })
+      ]
     }
-
-    await this.updateComplete
-    this.grist && this.grist.focus()
   }
 
   getSelectFields() {
@@ -331,19 +253,6 @@ export class OxSelectorResourceObject extends LitElement {
     }
   }
 
-  async _buildConditions({ filters, page, limit, sorters }: FetchOption) {
-    const queryConditions = {
-      filters: [],
-      ...this.basicArgs
-    }
-
-    queryConditions.filters = [...queryConditions.filters, ...(await this.searchForm.getQueryFilters())]
-    queryConditions.pagination = { page, limit }
-    queryConditions.sortings = sorters
-
-    return queryConditions
-  }
-
   get selected() {
     var grist = this.renderRoot.querySelector('ox-grist') as DataGrist