@operato/app 1.0.0-alpha.9 → 1.0.0-beta.10

package/package.json

@@ -3,21 +3,33 @@
   "description": "WebApplication production supporting components following open-wc recommendations",
   "license": "MIT",
   "author": "heartyoh",
-  "version": "1.0.0-alpha.9",
+  "version": "1.0.0-beta.10",
   "main": "dist/src/index.js",
   "module": "dist/src/index.js",
   "exports": {
     ".": "./dist/src/index.js",
-    "./grist/id-input.js": "./dist/src/grist/id-input.js",
-    "./grist/id-selector.js": "./dist/src/grist/id-selector.js",
-    "./grist/id-renderer.js": "./dist/src/grist/id-renderer.js",
-    "./grist/object-selector.js": "./dist/src/grist/object-selector.js",
-    "./grist/object-editor.js": "./dist/src/grist/object-editor.js",
-    "./grist/code-editor.js": "./dist/src/grist/code-editor.js",
-    "./grist/parameters-editor.js": "./dist/src/grist/parameters-editor.js",
+    "./input.js": "./dist/src/input/index.js",
+    "./input/ox-input-graphql.js": "./dist/src/input/ox-input-graphql.js",
     "./input/ox-input-background-pattern.js": "./dist/src/input/ox-input-background-pattern.js",
-    "./input/ox-input-color-gradient.js": "./dist/src/input/ox-input-color-gradient.js",
-    "./input/ox-input-fill-style.js": "./dist/src/input/ox-input-fill-style.js"
+    "./input/ox-input-fill-style.js": "./dist/src/input/ox-input-fill-style.js",
+    "./property-editor.js": "./dist/src/property-editor/index.js",
+    "./property-editor/ox-property-editor-graphql.js": "./dist/src/property-editor/ox-property-editor-graphql.js",
+    "./grist-editor.js": "./dist/src/grist-editor/index.js",
+    "./grist-editor/ox-grist-editor-resource-id.js": "./dist/src/grist-editor/ox-grist-editor-resource-id.js",
+    "./grist-editor/ox-selector-resource-id.js": "./dist/src/grist-editor/ox-selector-resource-id.js",
+    "./grist-editor/ox-grist-renderer-resource-id.js": "./dist/src/grist-editor/ox-grist-renderer-resource-id.js",
+    "./grist-editor/ox-selector-resource-object.js": "./dist/src/grist-editor/ox-selector-resource-object.js",
+    "./grist-editor/ox-grist-renderer-resource-object.js": "./dist/src/grist-editor/ox-grist-renderer-resource-object.js",
+    "./grist-editor/ox-grist-editor-crontab.js": "./dist/src/grist-editor/ox-grist-editor-crontab.js",
+    "./grist-editor/ox-grist-renderer-crontab.js": "./dist/src/grist-editor/ox-grist-renderer-crontab.js",
+    "./grist-editor/ox-grist-editor-json.js": "./dist/src/grist-editor/ox-grist-editor-json.js",
+    "./grist-editor/ox-grist-editor-code.js": "./dist/src/grist-editor/ox-grist-editor-code.js",
+    "./grist-editor/ox-grist-editor-resource-object.js": "./dist/src/grist-editor/ox-grist-editor-resource-object.js",
+    "./grist-editor/ox-grist-editor-resource-code.js": "./dist/src/grist-editor/ox-grist-editor-resource-code.js",
+    "./grist-editor/ox-grist-editor-parameters.js": "./dist/src/grist-editor/ox-grist-editor-parameters.js",
+    "./grist-editor/ox-grist-editor-value-map.js": "./dist/src/grist-editor/ox-grist-editor-value-map.js",
+    "./grist-editor/ox-grist-editor-partition-keys.js": "./dist/src/grist-editor/ox-grist-editor-partition-keys.js",
+    "./filter-renderer.js": "./dist/src/filter-renderer/index.js"
   },
   "publishConfig": {
     "access": "public",
@@ -41,20 +53,31 @@
     "storybook:build": "tsc && npm run analyze -- --exclude dist && build-storybook"
   },
   "dependencies": {
+    "@graphql-tools/load": "^7.3.2",
+    "@graphql-tools/url-loader": "^7.2.0",
+    "@graphql-tools/wrap": "^8.1.1",
     "@material/mwc-button": "^0.25.3",
     "@material/mwc-icon": "^0.25.3",
     "@material/mwc-icon-button": "^0.25.3",
-    "@operato/attachment": "^1.0.0-alpha.9",
-    "@operato/data-grist": "^1.0.0-alpha.9",
-    "@operato/form": "^1.0.0-alpha.9",
-    "@operato/graphql": "^1.0.0-alpha.9",
-    "@operato/i18n": "^1.0.0-alpha.9",
-    "@operato/layout": "^1.0.0-alpha.9",
-    "@operato/property-editor": "^1.0.0-alpha.9",
-    "@operato/shell": "^1.0.0-alpha.9",
-    "@operato/styles": "^1.0.0-alpha.9",
-    "@operato/utils": "^1.0.0-alpha.9",
-    "lit": "^2.2.0"
+    "@operato/attachment": "^1.0.0-beta.10",
+    "@operato/data-grist": "^1.0.0-beta.10",
+    "@operato/font": "^1.0.0-beta.10",
+    "@operato/form": "^1.0.0-beta.10",
+    "@operato/graphql": "^1.0.0-beta.10",
+    "@operato/i18n": "^1.0.0-beta.10",
+    "@operato/input": "^1.0.0-beta.10",
+    "@operato/layout": "^1.0.0-beta.10",
+    "@operato/property-editor": "^1.0.0-beta.10",
+    "@operato/shell": "^1.0.0-beta.10",
+    "@operato/styles": "^1.0.0-beta.10",
+    "@operato/utils": "^1.0.0-beta.10",
+    "codemirror": "^5.59.1",
+    "codemirror-graphql": "^0.15.2",
+    "cronstrue": "^2.2.0",
+    "cross-fetch": "^3.1.5",
+    "graphql": "^15.7.2",
+    "graphql-tag": "^2.12.6",
+    "lit": "^2.2.1"
   },
   "devDependencies": {
     "@custom-elements-manifest/analyzer": "^0.4.17",
@@ -88,5 +111,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "fb82c87ab8b869139076c4e74c46309460b67d35"
+  "gitHead": "90fef9c72ab5a9fec0c03bbfb0f49d31408ecb24"
 }

package/src/filter-renderer/filter-resource-select.ts

@@ -0,0 +1,95 @@
+import '@operato/input/ox-checkbox.js'
+import '../grist-editor/ox-selector-resource-id'
+
+import { html } from 'lit-html'
+
+import { ColumnConfig, FilterConfigObject, FilterSelectRenderer } from '@operato/data-grist'
+import { i18next } from '@operato/i18n'
+import { openPopup } from '@operato/layout'
+
+type SelectedCallback = (value: { id: string; name: string; description: string }) => void
+
+function openResourceSelector(column: ColumnConfig, value: any, confirmCallback: SelectedCallback) {
+  const { queryName, select, list, basicArgs, valueField = 'id' } = column.record.options
+
+  var actualValue
+  if (typeof valueField === 'function') {
+    actualValue = valueField(value)
+  } else {
+    actualValue = value?.[valueField]
+  }
+
+  var template = html`
+    <ox-selector-resource-id
+      .value=${actualValue}
+      .confirmCallback=${confirmCallback}
+      .queryName=${queryName}
+      .select=${select}
+      .list=${list}
+      .basicArgs=${basicArgs}
+      .valueField=${valueField}
+    ></ox-selector-resource-id>
+  `
+
+  const popup = openPopup(template, {
+    backdrop: true,
+    size: 'large',
+    title: i18next.t('title.select_item')
+  })
+}
+
+export const FilterResourceSelect: FilterSelectRenderer = (column, value, owner) => {
+  const filter = column.filter as FilterConfigObject
+  const { operator = 'like' } = filter
+
+  return operator === 'like'
+    ? html` <input
+        type="text"
+        name=${column.name}
+        .value=${value}
+        @change=${(e: CustomEvent) => {
+          const input = e.target as HTMLInputElement
+          input.dispatchEvent(
+            new CustomEvent('filter-change', {
+              bubbles: true,
+              composed: true,
+              detail: {
+                name: column.name,
+                operator,
+                value: input.value
+              }
+            })
+          )
+        }}
+      />`
+    : operator == 'in'
+    ? html``
+    : operator === 'eq'
+    ? html`
+        <input
+          style="min-width: 100px; min-height: 24px"
+          type="text"
+          name=${column.name}
+          .value=${value}
+          readonly
+          @click=${(e: Event) => {
+            e.stopPropagation()
+
+            const confirmCallback = (selected?: { [field: string]: any }) => {
+              var { idField = 'id', nameField = 'name', descriptionField = 'description' } = column.record.options || {}
+
+              owner.dispatchEvent(
+                new CustomEvent('filter-change', {
+                  bubbles: true,
+                  composed: true,
+                  detail: selected ? selected[idField] : ''
+                })
+              )
+            }
+
+            openResourceSelector(column, value, confirmCallback)
+          }}
+        />
+      `
+    : html``
+}

package/src/filter-renderer/index.ts

@@ -0,0 +1,6 @@
+import { registerFilterRenderer } from '@operato/data-grist'
+
+import { FilterResourceSelect } from './filter-resource-select.js'
+
+registerFilterRenderer('resource-object', [FilterResourceSelect])
+registerFilterRenderer('resource-id', [FilterResourceSelect])

package/src/grist-editor/index.ts

@@ -0,0 +1,30 @@
+import { OxGristRendererJson5, registerEditor, registerRenderer } from '@operato/data-grist'
+
+import { OxGristEditorCrontab } from './ox-grist-editor-crontab.js'
+import { OxGristEditorJson } from './ox-grist-editor-json.js'
+import { OxGristEditorParameters } from './ox-grist-editor-parameters.js'
+import { OxGristEditorPartitionKeys } from './ox-grist-editor-partition-keys.js'
+import { OxGristEditorResourceCode } from './ox-grist-editor-resource-code.js'
+import { OxGristEditorResourceId } from './ox-grist-editor-resource-id.js'
+import { OxGristEditorResourceObject } from './ox-grist-editor-resource-object.js'
+import { OxGristEditorValueMap } from './ox-grist-editor-value-map.js'
+import { OxGristRendererCrontab } from './ox-grist-renderer-crontab.js'
+import { OxGristRendererResourceId } from './ox-grist-renderer-resource-id.js'
+import { OxGristRendererResourceObject } from './ox-grist-renderer-resource-object.js'
+
+/* register grist renderer/editor for id */
+registerEditor('resource-id', OxGristEditorResourceId)
+registerEditor('resource-object', OxGristEditorResourceObject)
+registerEditor('resource-code', OxGristEditorResourceCode)
+registerEditor('parameters', OxGristEditorParameters)
+registerEditor('value-map', OxGristEditorValueMap)
+registerEditor('partition-keys', OxGristEditorPartitionKeys)
+registerEditor('crontab', OxGristEditorCrontab)
+registerEditor('json', OxGristEditorJson)
+
+registerRenderer('resource-id', OxGristRendererResourceId)
+registerRenderer('resource-object', OxGristRendererResourceObject)
+registerRenderer('parameters', OxGristRendererJson5)
+registerRenderer('value-map', OxGristRendererJson5)
+registerRenderer('partition-keys', OxGristRendererJson5)
+registerRenderer('crontab', OxGristRendererCrontab)

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

@@ -0,0 +1,62 @@
+import './ox-popup-code-input.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'
+
+@customElement('ox-grist-editor-code')
+export class OxGristEditorCode extends OxGristEditor {
+  get editorTemplate() {
+    return html` <input type="text" .value=${this.value || ''} /> `
+  }
+
+  async firstUpdated() {
+    await this.updateComplete
+
+    this.renderRoot.addEventListener('click', e => {
+      e.stopPropagation()
+
+      this.showEditorPopup()
+    })
+
+    this.showEditorPopup()
+  }
+
+  showEditorPopup() {
+    var { mode } = this.column.record?.options || {}
+
+    var change = (value: string) => {
+      this.dispatchEvent(
+        new CustomEvent('field-change', {
+          bubbles: true,
+          composed: true,
+          detail: {
+            before: this.value,
+            after: value,
+            column: this.column,
+            record: this.record,
+            row: this.row
+          }
+        })
+      )
+    }
+
+    var popup = openPopup(
+      html`
+        <ox-popup-code-input
+          .value=${this.value}
+          mode=${mode}
+          .confirmCallback=${change.bind(this)}
+        ></ox-popup-code-input>
+      `,
+      {
+        backdrop: true,
+        title: i18next.t('title.edit code'),
+        help: 'data-grist/grist-editor/code'
+      }
+    )
+  }
+}

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

@@ -0,0 +1,62 @@
+import './ox-popup-crontab-input.js'
+
+import { html } from 'lit'
+import { customElement } from 'lit/decorators.js'
+
+import { OxGristEditor } from '@operato/data-grist'
+import { i18next } from '@operato/i18n'
+import { openPopup, PopupHandle } from '@operato/layout'
+
+@customElement('ox-grist-editor-crontab')
+export class OxGristEditorCrontab extends OxGristEditor {
+  private popup?: PopupHandle
+
+  get editorTemplate() {
+    return html` <input type="text" .value=${this.value || ''} /> `
+  }
+
+  async firstUpdated() {
+    await this.updateComplete
+
+    this.renderRoot.addEventListener('click', e => {
+      e.stopPropagation()
+
+      this.showEditorPopup()
+    })
+
+    this.showEditorPopup()
+  }
+
+  showEditorPopup() {
+    if (this.popup) {
+      delete this.popup
+    }
+
+    const confirmCallback = (newval: any) => {
+      this.dispatchEvent(
+        new CustomEvent('field-change', {
+          bubbles: true,
+          composed: true,
+          detail: {
+            before: this.value,
+            after: newval,
+            record: this.record,
+            column: this.column,
+            row: this.row
+          }
+        })
+      )
+    }
+
+    this.popup = openPopup(
+      html`
+        <ox-popup-crontab-input .value=${this.value} .confirmCallback=${confirmCallback}></ox-popup-crontab-input>
+      `,
+      {
+        backdrop: true,
+        title: i18next.t('title.setting schedule'),
+        help: 'data-grist/grist-editor/crontab'
+      }
+    )
+  }
+}

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

@@ -0,0 +1,62 @@
+import './ox-popup-code-input.js'
+
+import { OxGristEditor } from '@operato/data-grist'
+import { customElement } from 'lit/decorators.js'
+import { html } from 'lit'
+import { i18next } from '@operato/i18n'
+import { openPopup } from '@operato/layout'
+
+@customElement('ox-grist-editor-json')
+export class OxGristEditorJson extends OxGristEditor {
+  get editorTemplate() {
+    return html` <input type="text" .value=${this.value || ''} /> `
+  }
+
+  async firstUpdated() {
+    await this.updateComplete
+
+    this.renderRoot.addEventListener('click', e => {
+      e.stopPropagation()
+
+      this.showEditorPopup()
+    })
+
+    this.showEditorPopup()
+  }
+
+  showEditorPopup() {
+    var change = (value: string) => {
+      this.dispatchEvent(
+        new CustomEvent('change', {
+          bubbles: true,
+          composed: true,
+          detail: {
+            before: this.value,
+            after: value,
+            column: this.column,
+            record: this.record,
+            row: this.row
+          }
+        })
+      )
+    }
+
+    var popup = openPopup(
+      html`
+        <ox-popup-code-input
+          .value=${this.value}
+          mode="javascript"
+          @change=${(e: CustomEvent) => {
+            change(e.detail.value)
+            popup.close()
+          }}
+        ></ox-popup-code-input>
+      `,
+      {
+        backdrop: true,
+        title: i18next.t('title.setting schedule'),
+        help: 'data-grist/grist-editor/code'
+      }
+    )
+  }
+}

package/src/{grist/parameters-editor.ts → grist-editor/ox-grist-editor-parameters.ts}

@@ -2,36 +2,22 @@
  * @license Copyright © HatioLab Inc. All rights reserved.
  */
 
-import './parameters-editor-builder.js'
-import './parameters-editor-popup.js'
+import './ox-parameters-builder.js'
+import './ox-popup-parameters-builder.js'
 
-import { ColumnConfig, GristRecord } from '@operato/data-grist'
-import { LitElement, css, html } from 'lit'
+import { ColumnConfig, GristRecord, OxGristEditor } from '@operato/data-grist'
 import { PopupHandle, openPopup } from '@operato/layout'
-import { customElement, property } from 'lit/decorators.js'
+import { css, html } from 'lit'
 
+import { cloneDeep } from 'lodash-es'
+import { customElement } from 'lit/decorators.js'
 import { i18next } from '@operato/i18n'
 
-@customElement('ox-parameters-editor')
-export class ParametersEditor extends LitElement {
-  static styles = css`
-    :host {
-      color: black;
-
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-  `
-
-  @property({ type: Object }) value: any
-  @property({ type: Object }) column!: ColumnConfig
-  @property({ type: Object }) record!: GristRecord
-  @property({ type: Number }) row!: number
-  @property({ type: Object }) field!: any
-
+@customElement('ox-grist-editor-parameters')
+export class OxGristEditorParameters extends OxGristEditor {
   private popup?: PopupHandle
 
-  render() {
+  get editorTemplate() {
     const value = typeof this.value === 'object' ? JSON.stringify(this.value) : this.value
     return html` ${value || ''} `
   }
@@ -78,7 +64,8 @@ export class ParametersEditor extends LitElement {
     }
 
     try {
-      var value: any = !objectified && typeof this.value === 'string' ? JSON.parse(this.value) : this.value
+      var value: any =
+        !objectified && typeof this.value === 'string' ? JSON.parse(this.value) : cloneDeep(this.value || {})
     } catch (e) {
       var value: any = {}
     }
@@ -92,14 +79,14 @@ export class ParametersEditor extends LitElement {
       따라서, 가급적 이들 속성의 레퍼런스를 변화시키지 않는 것이 좋다.
     */
     var template = html`
-      <ox-parameters-editor-popup
+      <ox-popup-parameters-builder
         .value=${value}
         .props=${spec}
         .host=${this.record}
         .context=${context}
         .confirmCallback=${confirmCallback}
       >
-      </ox-parameters-editor-popup>
+      </ox-popup-parameters-builder>
     `
 
     this.popup = openPopup(template, {

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

@@ -0,0 +1,86 @@
+/**
+ * @license Copyright © HatioLab Inc. All rights reserved.
+ */
+
+import './ox-popup-partition-keys-input.js'
+
+import { html } from 'lit'
+import { customElement } from 'lit/decorators.js'
+import { cloneDeep } from 'lodash-es'
+
+import { OxGristEditor } from '@operato/data-grist'
+import { i18next } from '@operato/i18n'
+import { openPopup, PopupHandle } from '@operato/layout'
+
+@customElement('ox-grist-editor-partition-keys')
+export class OxGristEditorPartitionKeys extends OxGristEditor {
+  private popup?: PopupHandle
+
+  get editorTemplate() {
+    const value = typeof this.value === 'object' ? JSON.stringify(this.value) : this.value
+    return html` ${value || ''} `
+  }
+
+  async firstUpdated() {
+    await this.updateComplete
+
+    this.renderRoot.addEventListener('click', e => {
+      e.stopPropagation()
+
+      this.openSelector()
+    })
+
+    this.openSelector()
+  }
+
+  async openSelector() {
+    if (this.popup) {
+      delete this.popup
+    }
+
+    const { name, help, objectified = false } = this.column.record?.options || {}
+
+    const confirmCallback = (newval: any) => {
+      this.dispatchEvent(
+        new CustomEvent('field-change', {
+          bubbles: true,
+          composed: true,
+          detail: {
+            before: this.value,
+            after: !objectified ? JSON.stringify(newval) : newval,
+            record: this.record,
+            column: this.column,
+            row: this.row
+          }
+        })
+      )
+    }
+
+    try {
+      var value: any =
+        !objectified && typeof this.value === 'string' ? JSON.parse(this.value) : cloneDeep(this.value || {})
+    } catch (e) {
+      var value: any = {}
+    }
+
+    /* 
+      주의 : 이 팝업 템플릿은 layout 모듈에 의해서 render 되므로, 
+      layout의 구성에 변화가 발생하면, 다시 render된다.
+      이 팝업이 떠 있는 상태에서, 또 다른 팝업이 뜨는 경우도 layout 구성의 변화를 야기한다. (overlay의 갯수의 증가)
+      이 경우 value, options, confirmCallback 등 클로져를 사용한 것들이 초기 바인딩된 값으로 다시 바인딩되게 되는데,
+      만약, 템플릿 내부에서 이들 속성의 레퍼런스가 변화했다면, 원래 상태로 되돌아가는 현상이 발생하게 된다.
+      따라서, 가급적 이들 속성의 레퍼런스를 변화시키지 않는 것이 좋다.
+    */
+    var template = html`
+      <ox-popup-partition-keys-input .value=${value} .confirmCallback=${confirmCallback}>
+      </ox-popup-partition-keys-input>
+    `
+
+    this.popup = openPopup(template, {
+      backdrop: true,
+      size: 'large',
+      title: `${name?.toUpperCase() || i18next.t('field.partition-keys')} `,
+      help
+    })
+  }
+}

package/src/{grist/code-editor.ts → grist-editor/ox-grist-editor-resource-code.ts}

@@ -1,9 +1,9 @@
 import '@material/mwc-icon'
-import {} from '@operato/shell'
 
-import { InputEditor, RecordConfig } from '@operato/data-grist'
+import { OxGristEditor, RecordConfig } from '@operato/data-grist'
 import { client, gqlContext } from '@operato/graphql'
 
+import { customElement } from 'lit/decorators.js'
 import gql from 'graphql-tag'
 import { html } from 'lit'
 
@@ -31,7 +31,8 @@ const FETCH_COMMON_CODE_GQL = (codeName: string) => gql`
 }
 `
 
-export class CodeEditor extends InputEditor {
+@customElement('ox-grist-editor-resource-code')
+export class OxGristEditorResourceCode extends OxGristEditor {
   async firstUpdated() {
     super.firstUpdated()
 
@@ -74,5 +75,3 @@ export class CodeEditor extends InputEditor {
     `
   }
 }
-
-customElements.define('code-editor', CodeEditor)