@operato/app 1.0.0-alpha.2 → 1.0.0-alpha.20

package/package.json

@@ -3,17 +3,24 @@
   "description": "WebApplication production supporting components following open-wc recommendations",
   "license": "MIT",
   "author": "heartyoh",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.20",
   "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-renderer.js": "./dist/src/grist/object-renderer.js",
-    "./grist/code-editor.js": "./dist/src/grist/code-editor.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/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",
+    "./property-editor/ox-property-editor-graphql.js": "./dist/src/property-editor/ox-property-editor-graphql.js"
   },
   "publishConfig": {
     "access": "public",
@@ -37,17 +44,29 @@
     "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/data-grist": "^1.0.0-alpha.2",
-    "@operato/form": "^1.0.0-alpha.2",
-    "@operato/graphql": "^1.0.0-alpha.2",
-    "@operato/i18n": "^1.0.0-alpha.2",
-    "@operato/layout": "^1.0.0-alpha.2",
-    "@operato/shell": "^1.0.0-alpha.2",
-    "@operato/styles": "^1.0.0-alpha.2",
-    "@operato/utils": "^1.0.0-alpha.2",
+    "@operato/attachment": "^1.0.0-alpha.20",
+    "@operato/data-grist": "^1.0.0-alpha.20",
+    "@operato/font": "^1.0.0-alpha.20",
+    "@operato/form": "^1.0.0-alpha.20",
+    "@operato/graphql": "^1.0.0-alpha.20",
+    "@operato/i18n": "^1.0.0-alpha.20",
+    "@operato/input": "^1.0.0-alpha.20",
+    "@operato/layout": "^1.0.0-alpha.20",
+    "@operato/property-editor": "^1.0.0-alpha.20",
+    "@operato/shell": "^1.0.0-alpha.20",
+    "@operato/styles": "^1.0.0-alpha.20",
+    "@operato/utils": "^1.0.0-alpha.20",
+    "codemirror": "^5.59.1",
+    "codemirror-graphql": "^0.15.2",
+    "cross-fetch": "^3.1.5",
+    "graphql": "^15.7.2",
+    "graphql-tag": "^2.12.6",
     "lit": "^2.2.0"
   },
   "devDependencies": {
@@ -82,5 +101,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "122374f065ee52631f5afa755e0c41ddd40b1e20"
+  "gitHead": "5dfb4809dcd75e15b2ccc1af713d0977a1840e7e"
 }

package/src/grist/code-editor.ts

@@ -1,9 +1,9 @@
 import '@material/mwc-icon'
-import {} from '@operato/shell'
 
 import { InputEditor, 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,6 +31,7 @@ const FETCH_COMMON_CODE_GQL = (codeName: string) => gql`
 }
 `
 
+@customElement('code-editor')
 export class CodeEditor extends InputEditor {
   async firstUpdated() {
     super.firstUpdated()
@@ -74,5 +75,3 @@ export class CodeEditor extends InputEditor {
     `
   }
 }
-
-customElements.define('code-editor', CodeEditor)

package/src/grist/index.ts

@@ -3,9 +3,11 @@ import { registerEditor, registerRenderer } from '@operato/data-grist'
 import { CodeEditor } from './code-editor'
 import { IdInput } from './id-input.js'
 import { IdRenderer } from './id-renderer.js'
+import { ObjectEditor } from './object-editor'
 
 /* register grist renderer/editor for id */
 registerEditor('id', IdInput)
+registerEditor('object', ObjectEditor as any)
 registerEditor('code', CodeEditor)
 
 registerRenderer('id', IdRenderer)

package/src/grist/object-editor.ts

@@ -1,5 +1,5 @@
 import '@material/mwc-icon'
-import '../../elements/object-selector'
+import './object-selector.js'
 
 import { ColumnConfig, GristData, GristRecord, ZERO_COLUMN, ZERO_CONFIG, ZERO_RECORD } from '@operato/data-grist'
 import { LitElement, TemplateResult, css, html } from 'lit'

package/src/grist/parameters-editor-builder.ts

@@ -0,0 +1,128 @@
+/**
+ * @license Copyright © HatioLab Inc. All rights reserved.
+ */
+
+import { LitElement, PropertyValues, html } from 'lit'
+import { OxPropertyEditor, PropertySpec } from '@operato/property-editor'
+import { customElement, property } from 'lit/decorators.js'
+
+import { connect } from 'pwa-helpers/connect-mixin'
+import { store } from '@operato/shell'
+
+/**
+모든 에디터들은 change 이벤트를 지원해야 한다. 또한, 모든 에디터들은 value속성에 값을 가져야 한다.
+
+Example:
+
+    <ox-parameters-editor-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>
+*/
+
+const DEFAULT_VALUE = {
+  legend: '',
+  number: 0,
+  angle: 0,
+  string: '',
+  text: '',
+  textarea: '',
+  checkbox: false,
+  select: '',
+  color: '#000000',
+  'solidcolor-stops': null,
+  'gradientcolor-stops': null,
+  'gltf-selector': '',
+  'image-selector': '',
+  multiplecolor: null,
+  editortable: null,
+  imageselector: '',
+  options: null,
+  date: null
+} as any
+
+@customElement('ox-parameters-editor-builder')
+class ParametersEditorBuilder extends connect(store)(LitElement) {
+  @property({ type: Object }) value: any
+  @property({ type: Array }) props?: PropertySpec[]
+  @property({ type: Object }) host: any
+
+  render() {
+    return html`<slot></slot>`
+  }
+
+  firstUpdated() {
+    this.addEventListener('change', this._onValueChanged.bind(this))
+  }
+
+  updated(changes: PropertyValues<this>) {
+    changes.has('props') && this._onPropsChanged(this.props)
+    changes.has('value') && this._setValues()
+  }
+
+  _onPropsChanged(props: PropertySpec[] | undefined) {
+    this.textContent = ''
+    ;(props || []).forEach(prop => {
+      let elementType = OxPropertyEditor.getEditor(prop.type)
+      if (!elementType) {
+        console.warn('Property Editor not defined', prop.type)
+        return
+      }
+      let element = document.createElement(elementType) as OxPropertyEditor
+
+      element.label = prop.label
+      element.type = prop.type
+      element.placeholder = prop.placeholder
+      element.host = this.host
+      // element.context = this.context
+      element.setAttribute('name', prop.name)
+
+      if (prop.observe) {
+        element.observe = prop.observe
+      }
+      element.property = prop.property
+      element.setAttribute('property-editor', '')
+
+      this.appendChild(element)
+    })
+  }
+
+  _setValues() {
+    var value = this.value || {}
+    Array.from(this.querySelectorAll('[name]')).forEach(propertyEditor => {
+      const editor = propertyEditor as OxPropertyEditor
+      let name = editor.getAttribute('name')
+      editor.value = value[name!] === undefined ? DEFAULT_VALUE[editor.type] : value[name!]
+    })
+  }
+
+  _getValues() {
+    var value = {} as any
+    Array.from(this.querySelectorAll('[name]')).forEach(propertyEditor => {
+      const editor = propertyEditor as OxPropertyEditor
+      let name = editor.getAttribute('name')
+      value[name!] = editor.value === undefined ? DEFAULT_VALUE[editor.type] : editor.value
+    })
+
+    return value
+  }
+
+  _onValueChanged(e: Event) {
+    e.stopPropagation()
+    var prop = e.target as HTMLElement
+
+    if (!prop || !prop.hasAttribute('property-editor')) {
+      return
+    }
+
+    this.dispatchEvent(
+      new CustomEvent('property-change', {
+        bubbles: true,
+        composed: true,
+        detail: this._getValues()
+      })
+    )
+  }
+}

package/src/grist/parameters-editor-popup.ts

@@ -0,0 +1,106 @@
+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-parameters-editor-popup')
+export class ParametersEditorPopup 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-parameters-editor-builder {
+        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 }) props: any
+  @property({ type: Object }) host: any
+  @property({ type: Object }) context: any
+  @property({ type: Object }) confirmCallback!: (newval: any) => void
+
+  render() {
+    var props = this.props instanceof Array ? this.props : []
+
+    return html`
+      ${props.length > 0
+        ? html`
+            <ox-parameters-editor-builder
+              .value=${this.value}
+              .props=${props}
+              .host=${this.host}
+              .context=${this.context}
+              @property-change=${this.onChange.bind(this)}
+            >
+            </ox-parameters-editor-builder>
+          `
+        : html` <span><i18n-msg msgid="text.no properties to set"></i18n-msg></span> `}
+
+      <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) {
+      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()
+  }
+}

package/src/grist/parameters-editor.ts

@@ -0,0 +1,112 @@
+/**
+ * @license Copyright © HatioLab Inc. All rights reserved.
+ */
+
+import './parameters-editor-builder.js'
+import './parameters-editor-popup.js'
+
+import { ColumnConfig, GristRecord } from '@operato/data-grist'
+import { LitElement, css, html } from 'lit'
+import { PopupHandle, openPopup } from '@operato/layout'
+import { customElement, property } 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
+
+  private popup?: PopupHandle
+
+  render() {
+    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
+    }
+
+    var { options } = this.column.record
+
+    if (typeof options === 'function') {
+      options = await options.call(this, this.value, this.column, this.record, this.row, this.field)
+    }
+
+    const { name, help, spec, context, objectified = false } = 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) : this.value
+    } catch (e) {
+      var value: any = {}
+    }
+
+    /* 
+      주의 : 이 팝업 템플릿은 layout 모듈에 의해서 render 되므로, 
+      layout의 구성에 변화가 발생하면, 다시 render된다.
+      이 팝업이 떠 있는 상태에서, 또 다른 팝업이 뜨는 경우도 layout 구성의 변화를 야기한다. (overlay의 갯수의 증가)
+      이 경우 value, options, confirmCallback 등 클로져를 사용한 것들이 초기 바인딩된 값으로 다시 바인딩되게 되는데,
+      만약, 템플릿 내부에서 이들 속성의 레퍼런스가 변화했다면, 원래 상태로 되돌아가는 현상이 발생하게 된다.
+      따라서, 가급적 이들 속성의 레퍼런스를 변화시키지 않는 것이 좋다.
+    */
+    var template = html`
+      <ox-parameters-editor-popup
+        .value=${value}
+        .props=${spec}
+        .host=${this.record}
+        .context=${context}
+        .confirmCallback=${confirmCallback}
+      >
+      </ox-parameters-editor-popup>
+    `
+
+    this.popup = openPopup(template, {
+      backdrop: true,
+      size: 'large',
+      title: `${name?.toUpperCase() || ''} ${i18next.t('field.params')}`,
+      help
+    })
+  }
+}

package/src/input/ox-input-background-pattern.ts

@@ -0,0 +1,166 @@
+/**
+ * @license Copyright © HatioLab Inc. All rights reserved.
+ */
+
+import '@operato/i18n/ox-i18n.js'
+import '@operato/attachment/ox-attachment-selector.js'
+
+import { css, html } from 'lit'
+import { customElement, property } from 'lit/decorators.js'
+
+import { OxFormField } from '@operato/input'
+
+export type BackgroundPatternOption = {
+  image?: HTMLImageElement | string
+  align?: 'left-top' | 'top' | 'right-top' | 'left' | 'center' | 'right' | 'left-bottom' | 'bottom' | 'right-bottom'
+  offsetX?: number
+  offsetY?: number
+  width?: number
+  height?: number
+  fitPattern?: boolean
+}
+
+/**
+ * 컴포넌트의 fill pattern을 편집하는 element
+ *
+ * Example:
+ *  <ox-input-background-pattern
+ *    @change="${e => { this.pattern = e.target.value }}"
+ *    .value=${this.pattern}"
+ *  ></ox-input-background-pattern>
+ */
+
+@customElement('ox-input-background-pattern')
+export class OxInputBackgroundPattern extends OxFormField {
+  static styles = css`
+    :host,
+    .grid-10 {
+      display: grid;
+      grid-template-columns: repeat(10, 1fr);
+      grid-gap: 5px;
+      grid-auto-rows: minmax(24px, auto);
+
+      align-items: center;
+    }
+
+    * {
+      align-self: stretch;
+    }
+
+    label {
+      grid-column: span 2;
+      text-align: right;
+      text-transform: capitalize;
+
+      align-self: center;
+    }
+
+    .grid-10 {
+      grid-column: span 10;
+    }
+
+    select,
+    input,
+    [custom-editor] {
+      grid-column: span 8;
+    }
+
+    select {
+      height: 100%;
+      border: 1px solid rgba(0, 0, 0, 0.2);
+    }
+
+    input[type='checkbox'] {
+      grid-column: 3 / 4;
+      align-self: center;
+    }
+
+    input[type='checkbox'] ~ label {
+      grid-column: span 7;
+      text-align: left;
+    }
+
+    .grid-10 > input[type='number'] {
+      grid-column: span 3;
+      border: 1px solid rgba(0, 0, 0, 0.2);
+    }
+
+    .grid-10 > label {
+      grid-column: span 2;
+      text-align: right;
+    }
+  `
+
+  @property({ type: Object }) value?: BackgroundPatternOption
+
+  render() {
+    const value = this.value || ({} as BackgroundPatternOption)
+
+    return html`
+      <label> <ox-i18n msgid="label.image" auto="">image</ox-i18n> </label>
+
+      <ox-attachment-selector
+        value-key="image"
+        .value=${value.image || ''}
+        .properties=${{
+          category: 'image'
+        }}
+        custom-editor
+      ></ox-attachment-selector>
+
+      <label> <ox-i18n msgid="label.align" auto="">align</ox-i18n> </label>
+
+      <select value-key="align" class="select-content" .value=${value.align}>
+        <option value="left-top">Left Top</option>
+        <option value="top">Top</option>
+        <option value="right-top">Right Top</option>
+        <option value="left">Left</option>
+        <option value="center">Center</option>
+        <option value="right">Right</option>
+        <option value="left-bottom">Left Bottom</option>
+        <option value="bottom">Bottom</option>
+        <option value="right-bottom">Right Bottom</option>
+      </select>
+
+      <div class="grid-10">
+        <label> <ox-i18n msgid="label.offset-x" auto="">offsetX</ox-i18n> </label>
+        <input type="number" value-key="offsetX" .value=${value.offsetX} />
+
+        <label> <ox-i18n msgid="label.offset-y" auto="">offsetY</ox-i18n> </label>
+        <input type="number" value-key="offsetY" .value=${value.offsetY} />
+
+        <label> <ox-i18n msgid="label.width" auto="">width</ox-i18n> </label>
+        <input type="number" value-key="width" .value=${value.width} />
+
+        <label> <ox-i18n msgid="label.height" auto="">height</ox-i18n> </label>
+        <input type="number" value-key="height" .value=${value.height} />
+      </div>
+
+      <div class="grid-10">
+        <input value-key="fitPattern" type="checkbox" .checked=${value.fitPattern} required />
+        <label> <ox-i18n msgid="label.fit" auto="">Fit</ox-i18n> </label>
+      </div>
+    `
+  }
+
+  firstUpdated() {
+    this.renderRoot.addEventListener('change', this._onChange.bind(this))
+  }
+
+  _onChange(e: Event) {
+    var element = e.target as HTMLInputElement
+    var key = element.getAttribute('value-key')
+    var value: any = element.value
+
+    if (key == 'fitPattern') {
+      value = element.checked
+    }
+
+    this.value = {
+      ...this.value,
+      [key!]: value
+    }
+
+    this.dispatchEvent(new CustomEvent('change', { bubbles: true, composed: true }))
+  }
+}