@operato/app 1.0.0-beta.1 → 1.0.0-beta.2

package/package.json

@@ -3,7 +3,7 @@
   "description": "WebApplication production supporting components following open-wc recommendations",
   "license": "MIT",
   "author": "heartyoh",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.2",
   "main": "dist/src/index.js",
   "module": "dist/src/index.js",
   "exports": {
@@ -58,18 +58,18 @@
     "@material/mwc-button": "^0.25.3",
     "@material/mwc-icon": "^0.25.3",
     "@material/mwc-icon-button": "^0.25.3",
-    "@operato/attachment": "^1.0.0-beta.1",
-    "@operato/data-grist": "^1.0.0-beta.1",
-    "@operato/font": "^1.0.0-beta.1",
-    "@operato/form": "^1.0.0-beta.1",
-    "@operato/graphql": "^1.0.0-beta.1",
-    "@operato/i18n": "^1.0.0-beta.1",
-    "@operato/input": "^1.0.0-beta.1",
-    "@operato/layout": "^1.0.0-beta.1",
-    "@operato/property-editor": "^1.0.0-beta.1",
-    "@operato/shell": "^1.0.0-beta.1",
-    "@operato/styles": "^1.0.0-beta.1",
-    "@operato/utils": "^1.0.0-beta.1",
+    "@operato/attachment": "^1.0.0-beta.2",
+    "@operato/data-grist": "^1.0.0-beta.2",
+    "@operato/font": "^1.0.0-beta.2",
+    "@operato/form": "^1.0.0-beta.2",
+    "@operato/graphql": "^1.0.0-beta.2",
+    "@operato/i18n": "^1.0.0-beta.2",
+    "@operato/input": "^1.0.0-beta.2",
+    "@operato/layout": "^1.0.0-beta.2",
+    "@operato/property-editor": "^1.0.0-beta.2",
+    "@operato/shell": "^1.0.0-beta.2",
+    "@operato/styles": "^1.0.0-beta.2",
+    "@operato/utils": "^1.0.0-beta.2",
     "codemirror": "^5.59.1",
     "codemirror-graphql": "^0.15.2",
     "cronstrue": "^2.2.0",
@@ -110,5 +110,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "cfa0be4c72d93b2bf3f851c09b5c62c6025edf0f"
+  "gitHead": "514a836d3f5e959695701ba41913aee18a1efe66"
 }

package/src/grist-editor/ox-grist-editor-code.ts

@@ -1,8 +1,9 @@
 import './ox-popup-code-input.js'
 
-import { OxGristEditor } from '@operato/data-grist'
-import { customElement } from 'lit/decorators.js'
 import { html } from 'lit'
+import { customElement } from 'lit/decorators.js'
+
+import { OxGristEditor } from '@operato/data-grist'
 import { i18next } from '@operato/i18n'
 import { openPopup } from '@operato/layout'
 
@@ -29,7 +30,7 @@ export class OxGristEditorCode extends OxGristEditor {
 
     var change = (value: string) => {
       this.dispatchEvent(
-        new CustomEvent('change', {
+        new CustomEvent('field-change', {
           bubbles: true,
           composed: true,
           detail: {
@@ -48,15 +49,12 @@ export class OxGristEditorCode extends OxGristEditor {
         <ox-popup-code-input
           .value=${this.value}
           mode=${mode}
-          @change=${(e: CustomEvent) => {
-            change(e.detail.value)
-            popup.close()
-          }}
+          .confirmCallback=${change.bind(this)}
         ></ox-popup-code-input>
       `,
       {
         backdrop: true,
-        title: i18next.t('title.setting schedule'),
+        title: i18next.t('title.edit code'),
         help: 'data-grist/grist-editor/code'
       }
     )

package/src/grist-editor/ox-grist-editor-partition-keys.ts

@@ -4,13 +4,13 @@
 
 import './ox-popup-partition-keys-input.js'
 
-import { PopupHandle, openPopup } from '@operato/layout'
-import { customElement, property } from 'lit/decorators.js'
+import { html } from 'lit'
+import { customElement } from 'lit/decorators.js'
+import { cloneDeep } from 'lodash-es'
 
 import { OxGristEditor } from '@operato/data-grist'
-import { cloneDeep } from 'lodash-es'
-import { html } from 'lit'
 import { i18next } from '@operato/i18n'
+import { openPopup, PopupHandle } from '@operato/layout'
 
 @customElement('ox-grist-editor-partition-keys')
 export class OxGristEditorPartitionKeys extends OxGristEditor {

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

@@ -1,12 +1,12 @@
 import '@material/mwc-icon'
 import './ox-selector-resource-id.js'
 
-import { GristRecord, OxGristEditor } from '@operato/data-grist'
-import { PopupHandle, openPopup } from '@operato/layout'
-import { TemplateResult, html } from 'lit'
-
+import { html } from 'lit'
 import { customElement } from 'lit/decorators.js'
 
+import { GristRecord, OxGristEditor } from '@operato/data-grist'
+import { openPopup, PopupHandle } from '@operato/layout'
+
 @customElement('ox-input-resource-id')
 export class OxGristEditorResourceId extends OxGristEditor {
   private popup?: PopupHandle
@@ -38,7 +38,7 @@ export class OxGristEditorResourceId extends OxGristEditor {
       delete this.popup
     }
 
-    const confirmCallback: (record: GristRecord | undefined) => void = selected => {
+    const confirmCallback: (record?: GristRecord) => void = selected => {
       if (!selected) {
         return
       }
@@ -51,11 +51,13 @@ export class OxGristEditorResourceId extends OxGristEditor {
           composed: true,
           detail: {
             before: this.value,
-            after: {
-              [idField]: selected[idField],
-              [nameField]: selected[nameField],
-              [descriptionField]: selected[descriptionField]
-            },
+            after: selected
+              ? {
+                  [idField]: selected[idField],
+                  [nameField]: selected[nameField],
+                  [descriptionField]: selected[descriptionField]
+                }
+              : null,
             record: this.record,
             column: this.column,
             row: this.row

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

@@ -1,12 +1,12 @@
 import '@material/mwc-icon'
 import './ox-selector-resource-object.js'
 
-import { PopupHandle, openPopup } from '@operato/layout'
-import { TemplateResult, css, html } from 'lit'
+import { html, TemplateResult } from 'lit'
+import { customElement } from 'lit/decorators.js'
 
 import { OxGristEditor } from '@operato/data-grist'
-import { customElement } from 'lit/decorators.js'
 import { i18next } from '@operato/i18n'
+import { openPopup, PopupHandle } from '@operato/layout'
 
 @customElement('ox-grist-editor-resource-object')
 export class OxGristEditorResourceObject extends OxGristEditor {
@@ -55,7 +55,7 @@ export class OxGristEditorResourceObject extends OxGristEditor {
       delete this.popup
     }
 
-    const confirmCallback = (selected: { [field: string]: any }) => {
+    const confirmCallback = (selected?: { [field: string]: any }) => {
       var { idField = 'id', nameField = 'name', descriptionField = 'description' } = this.column.record.options || {}
 
       this.dispatchEvent(
@@ -64,19 +64,21 @@ export class OxGristEditorResourceObject extends OxGristEditor {
           composed: true,
           detail: {
             before: this.value,
-            after: {
-              ...(this.column.record.options.select || [])
-                .map((field: any) => field.name)
-                .reduce((obj: { [field: string]: any }, fieldName: string) => {
-                  return (obj = {
-                    ...obj,
-                    [fieldName]: selected[fieldName]
-                  })
-                }, {} as { [field: string]: any }),
-              [idField]: selected[idField],
-              [nameField]: selected[nameField],
-              [descriptionField]: selected[descriptionField]
-            },
+            after: selected
+              ? {
+                  ...(this.column.record.options.select || [])
+                    .map((field: any) => field.name)
+                    .reduce((obj: { [field: string]: any }, fieldName: string) => {
+                      return (obj = {
+                        ...obj,
+                        [fieldName]: selected[fieldName]
+                      })
+                    }, {} as { [field: string]: any }),
+                  [idField]: selected[idField],
+                  [nameField]: selected[nameField],
+                  [descriptionField]: selected[descriptionField]
+                }
+              : null,
             record: this.record,
             column: this.column,
             row: this.row

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

@@ -1,11 +1,11 @@
 import '@operato/data-grist'
 
-import { DataGrist, FetchOption, GristData, GristRecord, ZERO_DATA } from '@operato/data-grist'
-import { LitElement, css, html } from 'lit'
+import gql from 'graphql-tag'
+import { css, html, LitElement } from 'lit'
 import { customElement, property, query } from 'lit/decorators.js'
 
+import { DataGrist, FetchOption, GristData, GristRecord, ZERO_DATA } from '@operato/data-grist'
 import { client } from '@operato/graphql'
-import gql from 'graphql-tag'
 import { i18next } from '@operato/i18n'
 import { isMobileDevice } from '@operato/utils'
 
@@ -47,7 +47,7 @@ export class OxSelectorResourceId extends LitElement {
   @property({ type: Object }) data: GristData = ZERO_DATA
   @property({ type: String }) queryName!: string
   @property({ type: Object }) basicArgs: any
-  @property({ type: Object }) confirmCallback?: (record: GristRecord | undefined) => void
+  @property({ type: Object }) confirmCallback?: (record?: GristRecord) => void
   @property({ type: Array }) selectedRecords: GristRecord[] = []
 
   @query('ox-grist') grist!: DataGrist
@@ -66,12 +66,18 @@ export class OxSelectorResourceId extends LitElement {
       </ox-grist>
 
       <div class="button-container">
+        <mwc-button @click=${this.onempty.bind(this)}>${i18next.t('button.empty')}</mwc-button>
         <mwc-button @click=${this.oncancel.bind(this)}>${i18next.t('button.cancel')}</mwc-button>
         <mwc-button @click=${this.onconfirm.bind(this)}>${i18next.t('button.confirm')}</mwc-button>
       </div>
     `
   }
 
+  onempty() {
+    this.confirmCallback && this.confirmCallback()
+    history.back()
+  }
+
   oncancel() {
     history.back()
   }

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

@@ -1,6 +1,10 @@
 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,
@@ -11,12 +15,8 @@ import {
   GristRecord,
   ZERO_DATA
 } from '@operato/data-grist'
-import { LitElement, css, html } from 'lit'
 import { MultiColumnFormStyles, SearchForm } from '@operato/form'
 import { buildArgs, client, gqlContext } from '@operato/graphql'
-import { customElement, property, query } from 'lit/decorators.js'
-
-import gql from 'graphql-tag'
 import { i18next } from '@operato/i18n'
 import { isMobileDevice } from '@operato/utils'
 
@@ -57,7 +57,7 @@ export class OxSelectorResourceObject extends LitElement {
   @property({ type: Object }) data: GristData = ZERO_DATA
   @property({ type: String }) queryName!: string
   @property({ type: Object }) basicArgs: any
-  @property({ type: Object }) confirmCallback?: (record: GristRecord | undefined) => void
+  @property({ type: Object }) confirmCallback?: (record?: GristRecord | null) => void
   @property({ type: Array }) selectedRecords: GristRecord[] = []
 
   @property({ type: Array }) searchFields: any
@@ -99,12 +99,18 @@ export class OxSelectorResourceObject extends LitElement {
       ></ox-grist>
 
       <div class="button-container">
+        <mwc-button @click=${this.onempty.bind(this)}>${i18next.t('button.empty')}</mwc-button>
         <mwc-button @click=${this.oncancel.bind(this)}>${i18next.t('button.cancel')}</mwc-button>
         <mwc-button @click=${this.onconfirm.bind(this)}>${i18next.t('button.confirm')}</mwc-button>
       </div>
     `
   }
 
+  onempty() {
+    this.confirmCallback && this.confirmCallback()
+    history.back()
+  }
+
   oncancel() {
     history.back()
   }