@operato/attachment 1.0.0-beta.9 → 1.0.6

package/src/ox-attachment-list.ts

@@ -2,19 +2,19 @@ import '@operato/data-grist'
 import '@operato/input/ox-input-file.js'
 
 import gql from 'graphql-tag'
-import i18next from 'i18next'
-import { css, html, LitElement, PropertyValues } from 'lit'
+import { css, html, LitElement } from 'lit'
 import { customElement, property, query } from 'lit/decorators.js'
 
 import {
   ColumnConfig,
   DataGrist,
+  FetchOption,
   FieldRenderer,
   FiltersForm,
+  FilterValue,
   GristData,
   GristRecord,
   PaginationConfig,
-  QueryFilter,
   SortersConfig
 } from '@operato/data-grist'
 import { buildArgs, client } from '@operato/graphql'
@@ -120,7 +120,6 @@ export class OxAttachmentList extends LitElement {
     `
   ]
 
-  @property({ type: Array }) categories: any[] = ['audio', 'video', 'image', 'text', 'application']
   @property({ type: String }) category: string = ''
   @property({ type: Boolean }) creatable: boolean = false
 
@@ -132,25 +131,8 @@ export class OxAttachmentList extends LitElement {
     return html`
       <ox-grist .config=${this.gristConfig} .mode=${'CARD'} auto-fetch .fetchHandler=${this.fetchHandler.bind(this)}>
         <div slot="headroom" id="headroom">
-        
           <div id="filters">
-            <ox-filters-form
-              slot="headroom"
-              @change=${(e: Event) => this.grist.fetch(true)}
-            ></ox-filters-form>
-
-            <select
-              @change=${(e: Event) => {
-                this.category = (e.currentTarget as HTMLInputElement)?.value
-                this.requestUpdate()
-              }}
-            >
-              <option value="">${i18next.t('text.please choose a category')}</option>
-              ${this.categories.map(
-                category =>
-                  html` <option value=${category} ?selected=${this.category == category}>${category}</option> `
-              )}
-            </select>
+            <ox-filters-form autofocus></ox-filters-form>
           </div>
 
           <ox-input-file
@@ -159,13 +141,13 @@ export class OxAttachmentList extends LitElement {
             hide-filelist
             @change=${this.onCreateAttachment.bind(this)}
           ></ox-input-file>
+        </div>
       </ox-grist>
     `
   }
 
-  async fetchHandler({ page, limit, sorters = [] }: { page: number; limit: number; sorters: SortersConfig }) {
-    const filters: QueryFilter[] = await this.filtersForm.getQueryFilters()
-    const { items: records, total } = await this.getAttachments({ page, limit, filters, sortings: sorters })
+  async fetchHandler({ page = 1, limit = 100, sortings = [], filters = [] }: FetchOption) {
+    const { items: records, total } = await this.getAttachments({ page, limit, filters, sortings })
 
     return {
       total,
@@ -306,6 +288,19 @@ export class OxAttachmentList extends LitElement {
             }
           }
         },
+        {
+          type: 'select',
+          name: 'category',
+          header: 'category',
+          record: {
+            options: ['', 'audio', 'video', 'image', 'text', 'application'],
+            editable: false
+          },
+          hidden: true,
+          filter: {
+            value: this.category
+          }
+        },
         {
           type: 'image',
           name: 'thumbnail',
@@ -387,12 +382,6 @@ export class OxAttachmentList extends LitElement {
     this.refreshAttachments()
   }
 
-  updated(changes: PropertyValues<this>) {
-    if (changes.has('category')) {
-      this.refreshAttachments()
-    }
-  }
-
   onClickSelect(attachment: any) {
     this.dispatchEvent(
       new CustomEvent('attachment-selected', {
@@ -427,19 +416,12 @@ export class OxAttachmentList extends LitElement {
     limit = 30,
     filters = [],
     sortings = []
-  }: { page?: number; limit?: number; filters?: QueryFilter[]; sortings?: SortersConfig } = {}) {
+  }: { page?: number; limit?: number; filters?: FilterValue[]; sortings?: SortersConfig } = {}) {
     var pagination: PaginationConfig = {
       limit,
       page
     }
 
-    if (this.category)
-      filters.push({
-        name: 'category',
-        operator: 'eq',
-        value: this.category
-      })
-
     var params = {
       filters,
       sortings,

package/src/ox-property-editor-attachment-selector.ts

@@ -1,14 +1,15 @@
 import './ox-attachment-selector'
 
-import { OxPropertyEditor } from '@operato/property-editor'
-import { customElement } from 'lit/decorators.js'
 import { html } from 'lit'
+import { customElement } from 'lit/decorators.js'
+
+import { OxPropertyEditor, PropertySpec } from '@operato/property-editor'
 
 @customElement('ox-property-editor-attachment-selector')
 class OxPropertyEditorAttachmentSelector extends OxPropertyEditor {
-  editorTemplate() {
+  editorTemplate(value: any, spec: PropertySpec) {
     return html`
-      <ox-attachment-selector id="editor" .value=${this.value} .properties=${this.property}></ox-attachment-selector>
+      <ox-attachment-selector id="editor" .value=${value} .properties=${spec.property}></ox-attachment-selector>
     `
   }
 }

package/src/ox-property-editor-image-selector.ts

@@ -1,18 +1,19 @@
 import './ox-attachment-selector'
 
-import { OxPropertyEditor } from '@operato/property-editor'
-import { customElement } from 'lit/decorators.js'
 import { html } from 'lit'
+import { customElement } from 'lit/decorators.js'
+
+import { OxPropertyEditor, PropertySpec } from '@operato/property-editor'
 
 @customElement('ox-property-editor-image-selector')
 class OxPropertyEditorImageSelector extends OxPropertyEditor {
-  editorTemplate() {
+  editorTemplate(value: any, spec: PropertySpec) {
     return html`
       <ox-attachment-selector
         id="editor"
-        .value=${this.value}
+        .value=${value}
         .properties=${{
-          ...this.property,
+          ...spec.property,
           category: 'image'
         }}
       ></ox-attachment-selector>