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

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 { html, TemplateResult } 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-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 OxGristEditor {
   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
@@ -85,6 +46,8 @@ export class ObjectEditor extends LitElement {
 
       this.openSelector()
     })
+
+    this.openSelector()
   }
 
   openSelector() {
@@ -92,7 +55,7 @@ export class ObjectEditor extends LitElement {
       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(
@@ -101,19 +64,21 @@ export class ObjectEditor extends LitElement {
           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
@@ -134,7 +99,7 @@ export class ObjectEditor extends LitElement {
     var template =
       this.template ||
       html`
-        <object-selector
+        <ox-selector-resource-object
           .value=${actualValue}
           .confirmCallback=${confirmCallback.bind(this)}
           .queryName=${this.column.record.options.queryName}
@@ -142,7 +107,7 @@ export class ObjectEditor extends LitElement {
           .list=${this.column.record.options.list}
           .basicArgs=${this.column.record.options.basicArgs}
           .valueField=${this.column.record.options.valueField}
-        ></object-selector>
+        ></ox-selector-resource-object>
       `
 
     this.popup = openPopup(template, {

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, OxGristEditor } 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 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, 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-editor/ox-grist-renderer-crontab.ts

@@ -0,0 +1,30 @@
+import { FieldRenderer } from '@operato/data-grist'
+import cronstrue from 'cronstrue/i18n'
+import { detectOverflow } from '@operato/utils'
+import { html } from 'lit'
+import i18next from 'i18next'
+
+function onmouseover(e: Event) {
+  const element = e.target as HTMLSpanElement
+  if (detectOverflow(element)) {
+    element.setAttribute('data-tooltip', element.textContent!)
+  }
+}
+
+function onmouseout(e: Event) {
+  const element = e.target as HTMLSpanElement
+  element.removeAttribute('data-tooltip')
+}
+
+export const OxGristRendererCrontab: FieldRenderer = (value, column, record, rowIndex, field) => {
+  let text = ''
+
+  try {
+    const language = (i18next.language || 'en').substring(0, 2)
+    text = value === undefined ? '' : cronstrue.toString(value, { locale: language || 'en' })
+  } catch (e) {
+    console.error(e)
+  }
+
+  return html`<span @mouseover=${onmouseover} @mouseout=${onmouseout}>${text}</span>`
+}

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

@@ -1,12 +1,13 @@
-import { FieldRenderer } from '@operato/data-grist'
 import { html } from 'lit'
 
-export const IdRenderer: FieldRenderer = (value, column, record, rowIndex, field) => {
+import { FieldRenderer } from '@operato/data-grist'
+
+export const OxGristRendererResourceId: FieldRenderer = (value, column, record, rowIndex, field) => {
   if (!value) {
     return ''
   }
 
   var { nameField = 'name', descriptionField = 'description' } = column.record.options || {}
 
-  return html` ${value[nameField] || ''}(${value[descriptionField] || ''}) `
+  return html`<span>${value[nameField] || ''}(${value[descriptionField] || ''})</span> `
 }

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

@@ -0,0 +1,26 @@
+import { html } from 'lit-html'
+
+import { FieldRenderer } from '@operato/data-grist'
+
+export const OxGristRendererResourceObject: FieldRenderer = (value, column, record, rowIndex, field) => {
+  if (!value) {
+    return ''
+  }
+
+  var { nameField = 'name', descriptionField = 'description' } = column.record.options || {}
+  var name, description
+
+  if (typeof nameField === 'function') {
+    name = nameField(value)
+  } else {
+    name = value[nameField]
+  }
+
+  if (typeof descriptionField === 'function') {
+    description = descriptionField(value)
+  } else {
+    description = value[descriptionField] && `(${value[descriptionField]})`
+  }
+
+  return html`<span>${name || ''}${description || ''}</span> `
+}

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

@@ -2,8 +2,6 @@
  * @license Copyright © HatioLab Inc. All rights reserved.
  */
 
-import '@things-factory/modeller-ui'
-
 import { LitElement, PropertyValues, html } from 'lit'
 import { OxPropertyEditor, PropertySpec } from '@operato/property-editor'
 import { customElement, property } from 'lit/decorators.js'
@@ -16,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 = {
@@ -45,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,65 @@
+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;
+      }
+
+      .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()
+  }
+}

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

@@ -0,0 +1,74 @@
+import '@operato/input/ox-input-crontab.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-crontab-input')
+export class OxPopupCrontabInput 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-crontab {
+        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: Object }) confirmCallback!: (newval: any) => void
+
+  render() {
+    return html`
+      <ox-input-crontab .value=${this.value} @change=${this.onChange.bind(this)}> </ox-input-crontab>
+
+      <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()
+  }
+}

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

@@ -4,8 +4,8 @@ import { customElement, property } from 'lit/decorators.js'
 import { ScrollbarStyles } from '@operato/styles'
 import { i18next } from '@operato/i18n'
 
-@customElement('ox-parameters-editor-popup')
-export class ParametersEditorPopup extends LitElement {
+@customElement('ox-popup-parameters-builder')
+export class OxPopupParametersBuilder extends LitElement {
   static styles = [
     ScrollbarStyles,
     css`
@@ -19,7 +19,7 @@ export class ParametersEditorPopup extends LitElement {
         height: var(--overlay-center-normal-height, 50%);
       }
 
-      ox-parameters-editor-builder {
+      ox-parameters-builder {
         flex: 1;
         overflow-y: auto;
       }
@@ -53,14 +53,14 @@ export class ParametersEditorPopup extends LitElement {
     return html`
       ${props.length > 0
         ? html`
-            <ox-parameters-editor-builder
+            <ox-parameters-builder
               .value=${this.value}
               .props=${props}
               .host=${this.host}
               .context=${this.context}
               @property-change=${this.onChange.bind(this)}
             >
-            </ox-parameters-editor-builder>
+            </ox-parameters-builder>
           `
         : html` <span><i18n-msg msgid="text.no properties to set"></i18n-msg></span> `}
 

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

@@ -0,0 +1,95 @@
+import '@operato/input/ox-input-partition-keys.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-partition-keys-input')
+export class OxPopupPartitionKeysInput 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-partition-keys {
+        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 }) valuetype: string = 'string'
+  @property({ type: Object }) confirmCallback!: (newval: any) => void
+
+  render() {
+    return html`
+      <ox-input-partition-keys .value=${this.value} @change=${this.onChange.bind(this)}> </ox-input-partition-keys>
+
+      <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()
+
+    /* 
+      주의 : 이 팝업 템플릿은 layout 모듈에 의해서 render 되므로, 
+      layout의 구성에 변화가 발생하면, 다시 render된다.
+      이 팝업이 떠 있는 상태에서, 또 다른 팝업이 뜨는 경우도 layout 구성의 변화를 야기한다. (overlay의 갯수의 증가)
+      이 경우 value, options, confirmCallback 등 클로져를 사용한 것들이 초기 바인딩된 값으로 다시 바인딩되게 되는데,
+      만약, 템플릿 내부에서 이들 속성의 레퍼런스가 변화했다면, 원래 상태로 되돌아가는 현상이 발생하게 된다.
+      따라서, 가급적 이들 속성의 레퍼런스를 변화시키지 않는 것이 좋다.
+      (이 팝업 클래스를 템플릿으로 사용한 곳의 코드를 참조하세요.)
+      => 
+      이런 이유로, Object.assign(...)을 사용하였다.
+    */
+
+    if (!this.value || typeof this.value !== 'object') {
+      this.value = {}
+    }
+
+    for (let key in this.value) {
+      delete this.value[key]
+    }
+
+    Object.assign(this.value, e.detail)
+  }
+
+  private onCancel(e: Event) {
+    history.back()
+  }
+
+  private onConfirm(e: Event) {
+    this.confirmCallback && this.confirmCallback(this.value)
+    history.back()
+  }
+}