@operato/app 1.0.1 → 1.0.2

package/package.json

@@ -3,7 +3,7 @@
   "description": "WebApplication production supporting components following open-wc recommendations",
   "license": "MIT",
   "author": "heartyoh",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "main": "dist/src/index.js",
   "module": "dist/src/index.js",
   "exports": {
@@ -106,5 +106,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "4518c7ee134a20627d81d0a41e071e4b50cf173d"
+  "gitHead": "dcd7b17f0019192e7c052bcf524acc2902e16367"
 }

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

@@ -59,9 +59,13 @@ export class OxGristEditorResourceObject extends OxGristEditor {
       queryName,
       basicArgs,
       select,
+      columns,
       list
     } = this.column.record.options || {}
 
+    /* select options is only for compatability, it might be able to be deprecated. */
+    columns = columns || select
+
     const confirmCallback = (selected?: { [field: string]: any }) => {
       this.dispatchEvent(
         new CustomEvent('field-change', {
@@ -71,7 +75,7 @@ export class OxGristEditorResourceObject extends OxGristEditor {
             before: this.value,
             after: selected
               ? {
-                  ...(this.column.record.options.select || [])
+                  ...(columns || [])
                     .map((field: any) => field.name)
                     .reduce((obj: { [field: string]: any }, fieldName: string) => {
                       return (obj = {
@@ -107,7 +111,7 @@ export class OxGristEditorResourceObject extends OxGristEditor {
           .value=${actualValue}
           .confirmCallback=${confirmCallback.bind(this)}
           .queryName=${queryName}
-          .select=${select}
+          .columns=${columns}
           .list=${list}
           .basicArgs=${basicArgs}
           .valueField=${valueField}

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

@@ -54,13 +54,12 @@ export class OxSelectorResourceObject extends LitElement {
   @property({ type: Array }) selectedRecords: GristRecord[] = []
 
   @property({ type: Array }) searchFields: any
-  @property({ type: Array }) select: {
+  @property({ type: Array }) columns: {
     type: string
     name: string
     header: string
     subFields?: string[]
     hidden: boolean
-    ignoreCondition: boolean
     queryName: string
     width: number
   }[] = []
@@ -115,7 +114,7 @@ export class OxSelectorResourceObject extends LitElement {
       query: gql`
         query($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
           fetch: ${this.queryName} (filters: $filters, pagination: $pagination, sortings: $sortings) {
-            ${this.getSelectFields()}
+            ${this.getQueryFields()}
           }
         }
       `,
@@ -180,7 +179,7 @@ export class OxSelectorResourceObject extends LitElement {
       }
     }
 
-    const select = this.select || [
+    const columns = this.columns || [
       {
         type: 'string',
         name: 'id',
@@ -215,7 +214,7 @@ export class OxSelectorResourceObject extends LitElement {
       ...this.config,
       columns: [
         ...this.config.columns,
-        ...select.map(selectField => {
+        ...columns.map(selectField => {
           return {
             ...selectField,
             type: selectField.type || 'string',
@@ -227,10 +226,10 @@ export class OxSelectorResourceObject extends LitElement {
     }
   }
 
-  getSelectFields() {
-    if (this.select && this.select.length > 0) {
+  getQueryFields() {
+    if (this.columns && this.columns.length > 0) {
       return `items {
-        ${this.select.map(selectField => {
+        ${this.columns.map(selectField => {
           return selectField.type === 'object'
             ? `${selectField.name} { ${
                 selectField.subFields && selectField.subFields.length > 0