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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@operato/board",
-  "version": "1.0.0-alpha.9",
+  "version": "1.0.0-beta.10",
   "description": "Webcomponent for board following open-wc recommendations",
   "author": "heartyoh",
   "license": "MIT",
@@ -49,29 +49,29 @@
     "storybook:build": "tsc && npm run analyze -- --exclude dist && build-storybook"
   },
   "dependencies": {
-    "@operato/app": "^1.0.0-alpha.9",
-    "@operato/data-grist": "^1.0.0-alpha.9",
-    "@operato/graphql": "^1.0.0-alpha.9",
-    "@operato/i18n": "^1.0.0-alpha.9",
-    "@operato/input": "^1.0.0-alpha.9",
-    "@operato/markdown": "^1.0.0-alpha.9",
-    "@operato/popup": "^1.0.0-alpha.9",
-    "@operato/property-editor": "^1.0.0-alpha.9",
-    "@operato/styles": "^1.0.0-alpha.9",
-    "@operato/utils": "^1.0.0-alpha.9",
+    "@operato/app": "^1.0.0-beta.10",
+    "@operato/data-grist": "^1.0.0-beta.10",
+    "@operato/font": "^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/markdown": "^1.0.0-beta.10",
+    "@operato/popup": "^1.0.0-beta.10",
+    "@operato/property-editor": "^1.0.0-beta.10",
+    "@operato/styles": "^1.0.0-beta.10",
+    "@operato/utils": "^1.0.0-beta.10",
     "@polymer/paper-dropdown-menu": "^3.2.0",
-    "@things-factory/modeller-ui": "^5.0.0-alpha.5",
     "@types/file-saver": "^2.0.4",
     "@types/sortablejs": "^1.10.7",
     "file-saver": "^2.0.5",
-    "lit": "^2.2.0",
+    "lit": "^2.2.1",
     "lodash-es": "^4.17.21",
     "sortablejs": "^1.14.0"
   },
   "devDependencies": {
     "@custom-elements-manifest/analyzer": "^0.4.17",
     "@hatiolab/prettier-config": "^1.0.0",
-    "@hatiolab/things-scene": "^2.7.34",
+    "@hatiolab/things-scene": "^3.0.5",
     "@material/mwc-fab": "^0.25.3",
     "@material/mwc-icon": "^0.25.3",
     "@open-wc/eslint-config": "^4.3.0",
@@ -107,5 +107,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "fb82c87ab8b869139076c4e74c46309460b67d35"
+  "gitHead": "90fef9c72ab5a9fec0c03bbfb0f49d31408ecb24"
 }

package/src/graphql/data-subscription.ts

@@ -0,0 +1,30 @@
+import { Component, DataSubscriptionProvider } from '@hatiolab/things-scene'
+
+import gql from 'graphql-tag'
+import { subscribe } from '@operato/graphql'
+
+export class DataSubscriptionProviderImpl implements DataSubscriptionProvider {
+  async subscribe(tag: string, component: Component) {
+    return await subscribe(
+      {
+        query: gql`
+                  subscription {
+                    data(tag: "${tag}") {
+                      tag
+                      data
+                    }
+                  }
+                `
+      },
+      {
+        next: async ({ data }: { data: any }) => {
+          if (data) {
+            component.data = data.data.data
+          }
+        }
+      }
+    )
+  }
+
+  dispose() {}
+}

package/src/graphql/scenario.ts

@@ -0,0 +1,79 @@
+import gql from 'graphql-tag'
+
+import { client } from '@operato/graphql'
+
+export const scenarios = async (): Promise<{ name: string; description: string }[]> => {
+  var response = await client.query({
+    query: gql`
+      query {
+        scenarios {
+          items {
+            name
+            description
+          }
+        }
+      }
+    `
+  })
+
+  if (response.errors) {
+    return []
+  }
+
+  return response.data.scenarios.items
+}
+
+export const startScenario = async (
+  scenarioName: string,
+  instanceName: string,
+  variables: string | number | object
+) => {
+  if (!scenarioName) {
+    return
+  }
+
+  if (client) {
+    var response = await client.query({
+      query: gql`
+        mutation ($instanceName: String, $scenarioName: String!, $variables: Object) {
+          startScenario(instanceName: $instanceName, scenarioName: $scenarioName, variables: $variables) {
+            state
+            message
+            data
+          }
+        }
+      `,
+      variables: {
+        instanceName: instanceName,
+        scenarioName: scenarioName,
+        variables
+      }
+    })
+
+    return response?.data?.startScenario?.data
+  }
+}
+
+export const runScenario = async (scenarioName: string, variables: string | number | object) => {
+  if (!scenarioName) return
+
+  if (client) {
+    var response = await client.query({
+      query: gql`
+        mutation ($scenarioName: String!, $variables: Object) {
+          runScenario(scenarioName: $scenarioName, variables: $variables) {
+            state
+            message
+            data
+          }
+        }
+      `,
+      variables: {
+        scenarioName: scenarioName,
+        variables
+      }
+    })
+
+    return response?.data?.runScenario?.data
+  }
+}

package/src/modeller/component-toolbar/component-menu.ts

@@ -4,14 +4,13 @@
 
 import './component-detail'
 
-import { css, html, LitElement, PropertyValues } from 'lit'
+import { LitElement, PropertyValues, css, html } from 'lit'
+import { Pallet, PalletItem } from '../../types'
 import { customElement, property, query, state } from 'lit/decorators.js'
 
 import { Scene } from '@hatiolab/things-scene'
 import { ScrollbarStyles } from '@operato/styles'
 
-import { Pallet, PalletItem } from '../../types'
-
 const noImage = new URL('../../../../icons/components/no-image.png', import.meta.url).href
 
 @customElement('component-menu')
@@ -177,7 +176,7 @@ class ComponentMenu extends LitElement {
 
     if (this.scene) {
       this.template = this.templates.find(template => template.type == type)
-      this.template && this.scene.add(JSON.parse(JSON.stringify(this.template.model)), { cx: 200, cy: 200 })
+      this.template && this.scene.startAddMode(JSON.parse(JSON.stringify(this.template.model)))
     }
 
     this.group = null

package/src/modeller/component-toolbar/component-toolbar.ts

@@ -98,7 +98,7 @@ class ComponentToolbar extends LitElement {
 
   render() {
     const componentList = this.componentGroupList || []
-    const modeIcon = this.icons[this.mode === SCENE_MODE.EDIT ? 'mode-edit' : 'mode-shift']
+    const modeIcon = this.icons[this.mode === SCENE_MODE.SHIFT ? 'mode-shift' : 'mode-edit']
 
     return html`
       <img id="shift" .src=${modeIcon} @click=${(e: MouseEvent) => this._onClickShift(e)} />

package/src/modeller/edit-toolbar.ts

@@ -6,7 +6,7 @@ import { html, LitElement, PropertyValues } from 'lit'
 import { customElement, property, query, queryAll } from 'lit/decorators.js'
 
 import { Component, Scene } from '@hatiolab/things-scene'
-import { isMacOS } from '@operato/utils'
+import { copyToClipboard, isMacOS } from '@operato/utils'
 
 import { style } from './edit-toolbar-style'
 
@@ -461,12 +461,12 @@ export class EditToolbar extends LitElement {
     this.scene?.cut()
   }
 
-  onTapCopy() {
+  async onTapCopy() {
     var copied = this.scene?.copy()
 
     if (!copied) return
 
-    navigator.clipboard.writeText(copied)
+    await copyToClipboard(copied)
     this.cliped = copied
   }
 

package/src/modeller/property-sidebar/abstract-property.ts

@@ -26,10 +26,6 @@ export class AbstractProperty extends LitElement {
     var value
 
     switch (element.tagName) {
-      case 'THINGS-EDITOR-ANGLE-INPUT':
-        value = Number((element as any).radian) || 0
-        break
-
       case 'INPUT':
         switch ((element as any).type) {
           case 'checkbox':

package/src/modeller/property-sidebar/data-binding/data-binding-mapper.ts

@@ -2,8 +2,8 @@
  * @license Copyright © HatioLab Inc. All rights reserved.
  */
 
-import '@things-factory/modeller-ui/client/editors/things-editor-value-map'
-import '@things-factory/modeller-ui/client/editors/things-editor-value-range'
+import '@operato/input/ox-input-value-map.js'
+import '@operato/input/ox-input-value-ranges.js'
 import '@operato/input/ox-buttons-radio.js'
 import '@operato/input/ox-input-code.js'
 import '@operato/i18n/ox-i18n.js'
@@ -156,7 +156,7 @@ export default class DataBindingMapper extends LitElement {
     text: 'string',
     ref: 'string'
   }
-  @state() _componentIds: any[] = []
+  @state() _componentIds: { value: string; description: string }[] = []
 
   @query('#eval-editor') editor!: HTMLInputElement
   @query('#target-input') target!: HTMLInputElement
@@ -192,15 +192,24 @@ export default class DataBindingMapper extends LitElement {
         list="target-list"
         .value=${mapping.target || ''}
         @focusin=${() => {
-          if (!this.scene) this._componentIds = []
-          this._componentIds = this.scene!.ids.map(info => info.key).filter(id => !!id)
+          this._componentIds =
+            (this.scene &&
+              this.scene.ids.map(i => {
+                const id = i.key
+                return { value: `#${id}`, description: this.scene!.findById(id)?.get('type') }
+              })) ||
+            []
         }}
       />
       <datalist id="target-list">
         <option value="(self)"></option>
         <option value="(key)"></option>
         ${this._componentIds.length
-          ? html` ${this._componentIds.map(id => html` <option value=${id}></option> `)} `
+          ? html`
+              ${this._componentIds.map(
+                ({ value, description }) => html` <option value=${value}>${description}</option> `
+              )}
+            `
           : html``}
       </datalist>
 
@@ -220,21 +229,21 @@ export default class DataBindingMapper extends LitElement {
       </ox-buttons-radio>
 
       <div rule-editors class="content" ?hidden=${mapping.rule == 'value'}>
-        <things-editor-value-map
+        <ox-input-value-map
           value-key="map"
           .value=${this.rule.map || {}}
           .valuetype=${this._valuetype(mapping.property!)}
           ?active=${mapping.rule == 'map'}
         >
-        </things-editor-value-map>
+        </ox-input-value-map>
 
-        <things-editor-value-range
+        <ox-input-value-ranges
           value-key="range"
           .value=${this.rule.range || []}
           .valuetype=${this._valuetype(mapping.property!)}
           ?active=${mapping.rule == 'range'}
         >
-        </things-editor-value-range>
+        </ox-input-value-ranges>
 
         <ox-input-code
           value-key="eval"

package/src/modeller/property-sidebar/data-binding/data-binding.ts

@@ -9,10 +9,9 @@ import '@operato/input/ox-buttons-radio.js'
 import '@operato/input/ox-input-data.js'
 import '@operato/i18n/ox-i18n.js'
 
-import { css, html, PropertyValues } from 'lit'
-import { customElement, property, query, state } from 'lit/decorators.js'
-
 import { Properties, Scene } from '@hatiolab/things-scene'
+import { PropertyValues, css, html } from 'lit'
+import { customElement, property, query, state } from 'lit/decorators.js'
 
 import { AbstractProperty } from '../abstract-property'
 import { PropertySharedStyle } from '../property-shared-style'
@@ -213,6 +212,9 @@ class PropertyDataBinding extends AbstractProperty {
           <label> <ox-i18n msgid="label.class">Class</ox-i18n> </label>
           <input value-key="class" .value=${value.class || ''} />
 
+          <label> <ox-i18n msgid="label.tag">Tag</ox-i18n> </label>
+          <input value-key="tag" .value=${value.tag || ''} />
+
           <label> <ox-i18n msgid="label.template-prefix">Template Prefix</ox-i18n> </label>
           <input value-key="templatePrefix" .value=${value.templatePrefix || ''} />
 
@@ -370,8 +372,8 @@ class PropertyDataBinding extends AbstractProperty {
     if (mapping && mapping.target) {
       this.scene &&
         this.scene.findAll(mapping.target, this.scene.selected && this.scene.selected[0]).forEach((c, i) => {
-          if (i == 0) c.trigger('tagreset')
-          c.trigger('tag', {})
+          if (i == 0) c.trigger('decotagreset')
+          c.trigger('decotag', {})
         })
     }
 

package/src/modeller/property-sidebar/effects/property-event-hover.ts

@@ -63,7 +63,9 @@ class PropertyEventHover extends LitElement {
             />
 
             <datalist id="target-list">
-              ${this._getTargetList(action).map(item => html` <option .value=${item}></option> `)}
+              ${this._getTargetList(action).map(
+                ({ value, description }) => html` <option .value=${value}>${description}</option> `
+              )}
             </datalist>
           `}
       ${action == 'data-set' || action == 'value-set'
@@ -93,14 +95,20 @@ class PropertyEventHover extends LitElement {
     }
   }
 
-  _getTargetList(action: string) {
+  _getTargetList(action: string): { value: string; description: string }[] {
     switch (action) {
       case 'data-toggle':
       case 'data-tristate':
       case 'data-set':
       case 'value-set':
-        let ids = (this.scene && this.scene.ids.map(i => `#${i.key}`)) || []
-        ids.unshift('(self)')
+        let ids =
+          (this.scene &&
+            this.scene.ids.map(i => {
+              const id = i.key
+              return { value: `#${id}`, description: this.scene!.findById(id)?.get('type') }
+            })) ||
+          []
+        ids.unshift({ value: '(self)', description: 'self component' })
         return ids
       case 'infoWindow':
         return (
@@ -109,7 +117,10 @@ class PropertyEventHover extends LitElement {
               .filter(i => {
                 return this.scene!.findById(i.key).get('type') == 'info-window'
               })
-              .map(i => `${i.key}`)) ||
+              .map(i => {
+                const id = i.key
+                return { value: `#${id}`, description: this.scene!.findById(id)?.get('type') }
+              })) ||
           []
         )
       default:

package/src/modeller/property-sidebar/effects/property-event-tap.ts

@@ -6,10 +6,11 @@ import '@operato/input/ox-input-data.js'
 import '@operato/i18n/ox-i18n.js'
 
 import { html, LitElement } from 'lit'
-import { customElement, property } from 'lit/decorators.js'
+import { customElement, property, state } from 'lit/decorators.js'
 
 import { Properties, Scene } from '@hatiolab/things-scene'
 
+import { scenarios } from '../../../graphql/scenario'
 import { EffectsSharedStyle } from './effects-shared-style'
 import { convert } from './value-converter'
 
@@ -20,7 +21,10 @@ class PropertyEventTap extends LitElement {
   @property({ type: Object }) value?: Properties
   @property({ type: Object }) scene?: Scene
 
-  firstUpdated() {
+  @state() scenarios: { value: string; description: string }[] = []
+  @state() targetList: { value: string; description: string }[] = []
+
+  async firstUpdated() {
     this.renderRoot.addEventListener('change', this._onValueChange.bind(this))
   }
 
@@ -32,7 +36,18 @@ class PropertyEventTap extends LitElement {
       <label for="checkbox-pressed" class="checkbox-label"> <ox-i18n msgid="label.pressed">pressed</ox-i18n> </label>
 
       <label> <ox-i18n msgid="label.action">action</ox-i18n> </label>
-      <select id="tap-select" value-key="action" .value=${action || ''}>
+      <select
+        id="tap-select"
+        value-key="action"
+        .value=${action || ''}
+        @change=${async (e: Event) => {
+          if ((e.target as HTMLSelectElement).value === 'start-scenario') {
+            this.scenarios = (await scenarios()).map(({ name, description }) => {
+              return { value: name, description }
+            })
+          }
+        }}
+      >
         <option value=""></option>
         <option value="goto">go to target board</option>
         <option value="link-open">open new window for target link</option>
@@ -47,11 +62,13 @@ class PropertyEventTap extends LitElement {
         <option value="data-tristate">tristate(0/1/2) target component data</option>
         <option value="data-set">set value to target component data</option>
         <option value="value-set">set value to target component value</option>
+        <option value="start-scenario">start the given scenario</option>
+        <option value="run-scenario">run the given scenario</option>
       </select>
 
       <label> <ox-i18n msgid="label.target">target</ox-i18n> </label>
 
-      ${action == 'goto' || action == 'popup'
+      ${action === 'goto' || action === 'popup'
         ? html`
             <things-editor-board-selector
               value-key="target"
@@ -60,13 +77,23 @@ class PropertyEventTap extends LitElement {
             ></things-editor-board-selector>
           `
         : html`
-            <input value-key="target" .value=${target} list="target-list" .placeholder=${this._getPlaceHoder(action)} />
+            <input
+              value-key="target"
+              .value=${target}
+              list="target-list"
+              .placeholder=${this._getPlaceHoder(action)}
+              @focusin=${() => {
+                this.targetList = this._getTargetList(action)
+              }}
+            />
 
             <datalist id="target-list">
-              ${this._getTargetList(action).map(item => html` <option .value=${item}></option> `)}
+              ${this.targetList.map(
+                ({ value, description }) => html` <option .value=${value}>${description}</option> `
+              )}
             </datalist>
           `}
-      ${action == 'data-set' || action == 'value-set'
+      ${action === 'data-set' || action === 'value-set' || action === 'start-scenario' || action === 'run-scenario'
         ? html`
             <label> <ox-i18n msgid="label.value">value</ox-i18n> </label>
             <ox-input-data value-key="value" .value=${value} custom-editor fullwidth></ox-input-data>
@@ -88,14 +115,20 @@ class PropertyEventTap extends LitElement {
     }
   }
 
-  _getTargetList(action: string) {
+  _getTargetList(action: string): { value: string; description: string }[] {
     switch (action) {
       case 'data-toggle':
       case 'data-tristate':
       case 'data-set':
       case 'value-set':
-        let ids = (this.scene && this.scene.ids.map(i => `#${i.key}`)) || []
-        ids.unshift('(self)')
+        let ids =
+          (this.scene &&
+            this.scene.ids.map(i => {
+              const id = i.key
+              return { value: `#${id}`, description: this.scene!.findById(id)?.get('type') }
+            })) ||
+          []
+        ids.unshift({ value: '(self)', description: 'self component' })
         return ids
       case 'infoWindow':
       case 'toggle-info-window':
@@ -105,9 +138,15 @@ class PropertyEventTap extends LitElement {
               .filter(i => {
                 return this.scene!.findById(i.key).get('type') == 'info-window'
               })
-              .map(i => `${i.key}`)) ||
+              .map(i => {
+                const id = i.key
+                return { value: `#${id}`, description: this.scene!.findById(id)?.get('type') }
+              })) ||
           []
         )
+      case 'start-scenario':
+      case 'run-scenario':
+        return this.scenarios
       default:
         return []
     }

package/src/modeller/property-sidebar/effects/property-shadow.ts

@@ -3,7 +3,7 @@
  */
 
 import '@operato/i18n/ox-i18n.js'
-import '@operato/input/ox-color-input.js'
+import '@operato/input/ox-input-color.js'
 
 import { LitElement, css, html } from 'lit'
 import { customElement, property } from 'lit/decorators.js'

package/src/modeller/property-sidebar/effects/value-converter.ts

@@ -1,8 +1,5 @@
 export function convert(element: any) {
   switch (element.tagName) {
-    case 'THINGS-EDITOR-ANGLE-INPUT':
-      return Number(element.radian) || 0
-
     case 'INPUT':
       switch (element.type) {
         case 'checkbox':

package/src/modeller/property-sidebar/specifics/specific-properties-builder.ts

@@ -2,13 +2,13 @@
  * @license Copyright © HatioLab Inc. All rights reserved.
  */
 
-import '@things-factory/modeller-ui/client/editors/things-editor-property'
+import '@operato/app/property-editor.js' /* for registering property editors */
 
-import { html, LitElement, PropertyValues } from 'lit'
+import { LitElement, PropertyValues, html } from 'lit'
 import { customElement, property } from 'lit/decorators.js'
 
-import { Properties } from '@hatiolab/things-scene'
 import { OxPropertyEditor } from '@operato/property-editor'
+import { Properties } from '@hatiolab/things-scene'
 
 /**
 모든 에디터들은 change 이벤트를 지원해야 한다. 또한, 모든 에디터들은 value속성에 값을 가져야 한다.

package/src/modeller/property-sidebar/styles/styles.ts

@@ -6,7 +6,7 @@ import '@polymer/paper-dropdown-menu/paper-dropdown-menu'
 import '@operato/help/ox-title-with-help.js'
 import '@operato/input/ox-input-color.js'
 import '@operato/app/input/ox-input-fill-style.js'
-import '@things-factory/modeller-ui/client/editors/things-editor-font-selector'
+import '@operato/font/ox-font-selector.js'
 import '@operato/i18n/ox-i18n.js'
 
 import { css, html } from 'lit'
@@ -373,12 +373,12 @@ class PropertyStyles extends AbstractProperty {
             <ox-i18n msgid="label.font-family">Font Family</ox-i18n>
           </label>
 
-          <things-editor-font-selector
+          <ox-font-selector
             value-key="fontFamily"
             .value=${fontFamily}
             class="property-full-input"
             custom-editor
-          ></things-editor-font-selector>
+          ></ox-font-selector>
 
           <label class="property-half-label icon-only-label font-size"></label>
           <input type="number" value-key="fontSize" .value=${fontSize} class="property-half-input" />

package/src/modeller/scene-viewer/ox-scene-viewer.ts

@@ -233,6 +233,8 @@ export default class OxSceneViewer extends LitElement {
 
     if (after === 2) {
       this.style.cursor = 'all-scroll'
+    } else if (after === 3) {
+      this.style.cursor = 'crosshair'
     } else {
       this.style.cursor = 'default'
     }

package/src/ox-board-modeller.ts

@@ -6,16 +6,15 @@ import './modeller/edit-toolbar'
 import '@hatiolab/things-scene'
 import './ox-board-viewer'
 
-import { saveAs } from 'file-saver'
-import { css, html, LitElement } from 'lit'
+import { ComponentGroup, ComponentTemplate } from './types'
+import { LitElement, css, html } from 'lit'
+import { SCENE_MODE, Scene } from '@hatiolab/things-scene'
 import { customElement, property, query } from 'lit/decorators.js'
-
-import { Scene, SCENE_MODE } from '@hatiolab/things-scene'
-import { OxPopup } from '@operato/popup'
 import { isMacOS, togglefullscreen } from '@operato/utils'
 
 import { EditToolbar } from './modeller/edit-toolbar'
-import { ComponentGroup, ComponentTemplate } from './types'
+import { OxPopup } from '@operato/popup'
+import { saveAs } from 'file-saver'
 
 const MACOS = isMacOS()
 
@@ -242,6 +241,7 @@ export class BoardModeller extends LitElement {
         >
           <ox-scene-layer type="selection-layer"></ox-scene-layer>
           <ox-scene-layer type="modeling-layer"></ox-scene-layer>
+          <ox-scene-layer type="add-layer"> </ox-scene-layer>
           <ox-scene-layer type="guide-layer">
             <ox-scene-property name="ruler" value="disabled"></ox-scene-property>
           </ox-scene-layer>
@@ -256,7 +256,7 @@ export class BoardModeller extends LitElement {
             <ox-scene-property name="paddingTop" value="50" type="number"></ox-scene-property>
             <ox-scene-property name="paddingLeft" value="50" type="number"></ox-scene-property>
           </ox-scene-layer>
-          <ox-scene-layer type="tag-layer"></ox-scene-layer>
+          <ox-scene-layer type="decotag-layer"></ox-scene-layer>
           <ox-scene-handler type="text-editor"></ox-scene-handler>
           <ox-scene-handler type="move-handler"></ox-scene-handler>
         </ox-scene-viewer>