@operato/app 1.0.0-alpha.21 → 1.0.0-alpha.24

package/package.json

@@ -3,23 +3,28 @@
   "description": "WebApplication production supporting components following open-wc recommendations",
   "license": "MIT",
   "author": "heartyoh",
-  "version": "1.0.0-alpha.21",
+  "version": "1.0.0-alpha.24",
   "main": "dist/src/index.js",
   "module": "dist/src/index.js",
   "exports": {
     ".": "./dist/src/index.js",
-    "./property-editor.js": "./dist/src/property-editor/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-fill-style.js": "./dist/src/input/ox-input-fill-style.js",
-    "./property-editor/ox-property-editor-graphql.js": "./dist/src/property-editor/ox-property-editor-graphql.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-renderer-resource-id.js": "./dist/src/grist-editor/ox-renderer-resource-id.js",
+    "./grist-editor/ox-selector-resource-object.js": "./dist/src/grist-editor/ox-selector-resource-object.js",
+    "./grist-editor/ox-grist-editor-crontab.js": "./dist/src/grist-editor/ox-grist-editor-crontab.js",
+    "./grist-editor/ox-grist-editor-json.js": "./dist/src/grist-editor/ox-grist-editor-json.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"
   },
   "publishConfig": {
     "access": "public",
@@ -49,18 +54,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-alpha.21",
-    "@operato/data-grist": "^1.0.0-alpha.21",
-    "@operato/font": "^1.0.0-alpha.21",
-    "@operato/form": "^1.0.0-alpha.21",
-    "@operato/graphql": "^1.0.0-alpha.21",
-    "@operato/i18n": "^1.0.0-alpha.21",
-    "@operato/input": "^1.0.0-alpha.21",
-    "@operato/layout": "^1.0.0-alpha.21",
-    "@operato/property-editor": "^1.0.0-alpha.21",
-    "@operato/shell": "^1.0.0-alpha.21",
-    "@operato/styles": "^1.0.0-alpha.21",
-    "@operato/utils": "^1.0.0-alpha.21",
+    "@operato/attachment": "^1.0.0-alpha.24",
+    "@operato/data-grist": "^1.0.0-alpha.24",
+    "@operato/font": "^1.0.0-alpha.24",
+    "@operato/form": "^1.0.0-alpha.24",
+    "@operato/graphql": "^1.0.0-alpha.24",
+    "@operato/i18n": "^1.0.0-alpha.24",
+    "@operato/input": "^1.0.0-alpha.24",
+    "@operato/layout": "^1.0.0-alpha.24",
+    "@operato/property-editor": "^1.0.0-alpha.24",
+    "@operato/shell": "^1.0.0-alpha.24",
+    "@operato/styles": "^1.0.0-alpha.24",
+    "@operato/utils": "^1.0.0-alpha.24",
     "codemirror": "^5.59.1",
     "codemirror-graphql": "^0.15.2",
     "cross-fetch": "^3.1.5",
@@ -100,5 +105,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "7f0823771e6442e68eff668ca44420744c1cd230"
+  "gitHead": "83b1479e80639e5bc365f3dc8ad4b119a84dc31e"
 }

package/src/grist-editor/index.ts

@@ -0,0 +1,23 @@
+import { Json5Renderer, 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 { 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 { OxGristRendererResourceId } from './ox-grist-renderer-resource-id.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('crontab', OxGristEditorCrontab)
+registerEditor('json', OxGristEditorJson)
+
+registerRenderer('resource-id', OxGristRendererResourceId)
+registerRenderer('parameters', Json5Renderer)
+registerRenderer('value-map', Json5Renderer)

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

@@ -0,0 +1,62 @@
+import './ox-popup-crontab-input.js'
+
+import { PopupHandle, openPopup } from '@operato/layout'
+
+import { InputEditor } from '@operato/data-grist'
+import { customElement } from 'lit/decorators.js'
+import { html } from 'lit'
+import { i18next } from '@operato/i18n'
+
+@customElement('ox-grist-editor-crontab')
+export class OxGristEditorCrontab extends InputEditor {
+  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 { InputEditor } 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 InputEditor {
+  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, InputEditor } 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 InputEditor {
   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/code-editor.ts → grist-editor/ox-grist-editor-resource-code.ts}

@@ -31,8 +31,8 @@ const FETCH_COMMON_CODE_GQL = (codeName: string) => gql`
 }
 `
 
-@customElement('code-editor')
-export class CodeEditor extends InputEditor {
+@customElement('ox-grist-editor-resource-code')
+export class OxGristEditorResourceCode extends InputEditor {
   async firstUpdated() {
     super.firstUpdated()
 

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

@@ -0,0 +1,83 @@
+import '@material/mwc-icon'
+import './ox-selector-resource-id.js'
+
+import { GristRecord, InputEditor } from '@operato/data-grist'
+import { PopupHandle, openPopup } from '@operato/layout'
+import { TemplateResult, html } from 'lit'
+
+import { customElement } from 'lit/decorators.js'
+
+@customElement('ox-input-resource-id')
+export class OxGristEditorResourceId extends InputEditor {
+  private popup?: PopupHandle
+
+  render() {
+    var { nameField = 'name', descriptionField = 'description' } = this.column.record.options || {}
+    var value = this.value
+
+    return html`
+      ${!value ? html`` : html` <span>${value[nameField]} (${value[descriptionField]})</span> `}
+      <mwc-icon>arrow_drop_down</mwc-icon>
+    `
+  }
+
+  async firstUpdated() {
+    await this.updateComplete
+
+    this.renderRoot.addEventListener('click', e => {
+      e.stopPropagation()
+
+      this.openSelector()
+    })
+
+    this.openSelector()
+  }
+
+  openSelector() {
+    if (this.popup) {
+      delete this.popup
+    }
+
+    const confirmCallback: (record: GristRecord | undefined) => void = selected => {
+      if (!selected) {
+        return
+      }
+
+      var { idField = 'id', nameField = 'name', descriptionField = 'description' } = this.column.record.options || {}
+
+      this.dispatchEvent(
+        new CustomEvent('field-change', {
+          bubbles: true,
+          composed: true,
+          detail: {
+            before: this.value,
+            after: {
+              [idField]: selected[idField],
+              [nameField]: selected[nameField],
+              [descriptionField]: selected[descriptionField]
+            },
+            record: this.record,
+            column: this.column,
+            row: this.row
+          }
+        })
+      )
+    }
+
+    var value = this.value || {}
+    var template = html`
+      <ox-selector-resource-id
+        .value=${value.id}
+        .confirmCallback=${confirmCallback.bind(this)}
+        .queryName=${this.column.record.options.queryName}
+        .basicArgs=${this.column.record.options.basicArgs}
+      ></ox-selector-resource-id>
+    `
+
+    this.popup = openPopup(template, {
+      backdrop: true,
+      size: 'large',
+      title: 'select item'
+    })
+  }
+}

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

@@ -1,57 +1,19 @@
 import '@material/mwc-icon'
-import './object-selector.js'
+import './ox-selector-resource-object.js'
 
-import { ColumnConfig, GristData, GristRecord, ZERO_COLUMN, ZERO_CONFIG, ZERO_RECORD } from '@operato/data-grist'
-import { LitElement, TemplateResult, css, html } from 'lit'
 import { PopupHandle, openPopup } from '@operato/layout'
-import { customElement, property } from 'lit/decorators.js'
+import { TemplateResult, css, html } from 'lit'
 
+import { InputEditor } from '@operato/data-grist'
+import { customElement } from 'lit/decorators.js'
 import { i18next } from '@operato/i18n'
 
-@customElement('ox-object-editor')
-export class ObjectEditor extends LitElement {
-  static styles = css`
-    :host {
-      display: flex;
-      flex-flow: row nowrap;
-
-      padding: 7px 0px;
-      box-sizing: border-box;
-
-      width: 100%;
-      height: 100%;
-
-      border: 0;
-      background-color: transparent;
-
-      font: var(--grist-object-editor-font);
-      color: var(--grist-object-editor-color);
-      justify-content: inherit;
-    }
-
-    span {
-      display: flex;
-      flex: auto;
-
-      justify-content: inherit;
-    }
-
-    mwc-icon {
-      width: 20px;
-      font-size: 1.5em;
-      margin-left: auto;
-    }
-  `
-
-  @property({ type: Object }) value: { [prop: string]: any } = {}
-  @property({ type: Object }) column: ColumnConfig = ZERO_COLUMN
-  @property({ type: Object }) record: GristRecord = ZERO_RECORD
-  @property({ type: Number }) row?: number
-
+@customElement('ox-grist-editor-resource-object')
+export class OxGristEditorResourceObject extends InputEditor {
   private popup?: PopupHandle
   private template?: TemplateResult
 
-  render() {
+  get editorTemplate() {
     var value = this.value || {}
 
     var { nameField = 'name', descriptionField = 'description' } = this.column.record.options || {}
@@ -75,7 +37,6 @@ export class ObjectEditor extends LitElement {
   }
 
   async firstUpdated() {
-    this.value = this.record[this.column.name]
     this.template = ((this.column.record || {}).options || {}).template
 
     await this.updateComplete

package/src/grist-editor/ox-grist-editor-value-map.ts

@@ -0,0 +1,86 @@
+/**
+ * @license Copyright © HatioLab Inc. All rights reserved.
+ */
+
+import './ox-popup-value-map-input.js'
+
+import { ColumnConfig, GristRecord, InputEditor } from '@operato/data-grist'
+import { PopupHandle, openPopup } from '@operato/layout'
+import { css, html } from 'lit'
+import { customElement, property } from 'lit/decorators.js'
+
+import { cloneDeep } from 'lodash-es'
+import { i18next } from '@operato/i18n'
+
+@customElement('ox-grist-editor-value-map')
+export class OxGristEditorValueMap extends InputEditor {
+  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, valuetype = 'string', 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-value-map-input .value=${value} .valuetype=${valuetype} .confirmCallback=${confirmCallback}>
+      </ox-popup-value-map-input>
+    `
+
+    this.popup = openPopup(template, {
+      backdrop: true,
+      size: 'large',
+      title: `${name?.toUpperCase() || i18next.t('field.value-map')} `,
+      help
+    })
+  }
+}

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

@@ -1,7 +1,7 @@
 import { FieldRenderer } from '@operato/data-grist'
 import { html } from 'lit'
 
-export const IdRenderer: FieldRenderer = (value, column, record, rowIndex, field) => {
+export const OxGristRendererResourceId: FieldRenderer = (value, column, record, rowIndex, field) => {
   if (!value) {
     return ''
   }

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

@@ -14,12 +14,12 @@ import { store } from '@operato/shell'
 
 Example:
 
-    <ox-parameters-editor-builder value="{{value}}">
+    <ox-parameters-builder value="{{value}}">
       <label>Center X</label>
       <input type="number" .value="${value.cx}">
       <label>Width</label>
       <input type="number" .value="${value.width}">
-    </ox-parameters-editor-builder>
+    </ox-parameters-builder>
 */
 
 const DEFAULT_VALUE = {
@@ -43,8 +43,8 @@ const DEFAULT_VALUE = {
   date: null
 } as any
 
-@customElement('ox-parameters-editor-builder')
-class ParametersEditorBuilder extends connect(store)(LitElement) {
+@customElement('ox-parameters-builder')
+class OxParametersBuilder extends connect(store)(LitElement) {
   @property({ type: Object }) value: any
   @property({ type: Array }) props?: PropertySpec[]
   @property({ type: Object }) host: any

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

@@ -0,0 +1,75 @@
+import '@operato/input/ox-input-code.js'
+
+import { LitElement, css, html } from 'lit'
+import { customElement, property } from 'lit/decorators.js'
+
+import { ScrollbarStyles } from '@operato/styles'
+import { i18next } from '@operato/i18n'
+
+@customElement('ox-popup-code-input')
+export class OxPopupCodeInput extends LitElement {
+  static styles = [
+    ScrollbarStyles,
+    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-input-code {
+        flex: 1;
+        overflow-y: auto;
+      }
+
+      span {
+        flex: 1;
+
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        color: var(--primary-color);
+      }
+
+      .button-container {
+        display: flex;
+        margin-left: auto;
+      }
+    `
+  ]
+
+  @property({ type: Object }) value: any
+  @property({ type: String }) mode: string = 'javascript'
+  @property({ type: Object }) confirmCallback!: (newval: any) => void
+
+  render() {
+    return html`
+      <ox-input-code .value=${this.value} .mode=${this.mode} @change=${this.onChange.bind(this)}> </ox-input-code>
+
+      <div class="button-container">
+        <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>
+    `
+  }
+
+  private onChange(e: CustomEvent) {
+    e.stopPropagation()
+
+    this.value = e.detail
+  }
+
+  private onCancel(e: Event) {
+    history.back()
+  }
+
+  private onConfirm(e: Event) {
+    this.confirmCallback && this.confirmCallback(this.value)
+    history.back()
+  }
+}