@things-factory/integration-ui 4.0.9 → 4.0.10

package/client/bootstrap.js

@@ -1,15 +1,15 @@
 import '@material/mwc-icon'
-import { registerEditor as registerGristEditor } from '@things-factory/grist-ui'
-import { ADD_MODELLER_EDITORS } from '@things-factory/modeller-ui'
-import { store } from '@things-factory/shell'
 import './editors/entity-editor'
 import './editors/property-editor'
+
 import { ConnectionSelector } from './grist/connection-selector'
 import { ConnectorSelector } from './grist/connector-selector'
 import { CrontabEditor } from './grist/crontab-editor'
 import { JsonGristEditor } from './grist/json-grist-editor'
+import { OxPropertyEditor } from '@operato/property-editor'
 import { ParametersEditor } from './grist/parameters-editor'
 import { TaskTypeSelector } from './grist/task-type-selector'
+import { registerEditor as registerGristEditor } from '@things-factory/grist-ui'
 
 export default function bootstrap() {
   registerGristEditor('task-type', TaskTypeSelector)
@@ -19,14 +19,11 @@ export default function bootstrap() {
   registerGristEditor('parameters', ParametersEditor)
   registerGristEditor('crontab', CrontabEditor)
 
-  store.dispatch({
-    type: ADD_MODELLER_EDITORS,
-    editors: {
-      'http-headers': 'property-editor-http-headers',
-      'http-parameters': 'property-editor-http-parameters',
-      'http-body': 'property-editor-http-body',
-      'entity-selector': 'property-editor-entity-selector',
-      'scenario-step-input': 'property-editor-scenario-step-input'
-    }
+  OxPropertyEditor.register({
+    'http-headers': 'property-editor-http-headers',
+    'http-parameters': 'property-editor-http-parameters',
+    'http-body': 'property-editor-http-body',
+    'entity-selector': 'property-editor-entity-selector',
+    'scenario-step-input': 'property-editor-scenario-step-input'
   })
 }

package/client/editors/entity-editor.js

@@ -1,15 +1,17 @@
 /*
  * Copyright © HatioLab Inc. All rights reserved.
  */
-import { html, css } from 'lit-element'
-import { ThingsEditorProperty, ThingsEditorPropertyStyles } from '@things-factory/modeller-ui'
-import { deepClone } from '@things-factory/utils'
 
 import './things-editor-entity-selector'
 
-export class PropertyEditorEntitySelector extends ThingsEditorProperty {
+import { css, html } from 'lit-element'
+
+import { OxPropertyEditor } from '@operato/property-editor'
+import { deepClone } from '@things-factory/utils'
+
+export class PropertyEditorEntitySelector extends OxPropertyEditor {
   static get styles() {
-    return [ThingsEditorPropertyStyles]
+    return [...OxPropertyEditor.styles]
   }
 
   editorTemplate(props) {

package/client/editors/property-editor.js

@@ -1,16 +1,16 @@
 /*
  * Copyright © HatioLab Inc. All rights reserved.
  */
-import { html, css } from 'lit-element'
-import { ThingsEditorProperty, ThingsEditorPropertyStyles } from '@things-factory/modeller-ui'
-
 import './things-editor-http-headers'
 import './things-editor-http-parameters'
 import './things-editor-http-body'
 
-export class PropertyEditorScenarioStepInput extends ThingsEditorProperty {
+import { OxPropertyEditor } from '@operato/property-editor'
+import { html } from 'lit-element'
+
+export class PropertyEditorScenarioStepInput extends OxPropertyEditor {
   static get styles() {
-    return [ThingsEditorPropertyStyles]
+    return [...OxPropertyEditor.styles]
   }
 
   editorTemplate(props) {
@@ -27,9 +27,9 @@ export class PropertyEditorScenarioStepInput extends ThingsEditorProperty {
 
 customElements.define('property-editor-scenario-step-input', PropertyEditorScenarioStepInput)
 
-export class PropertyEditorHttpHeaders extends ThingsEditorProperty {
+export class PropertyEditorHttpHeaders extends OxPropertyEditor {
   static get styles() {
-    return [ThingsEditorPropertyStyles]
+    return [...OxPropertyEditor.styles]
   }
 
   editorTemplate(props) {
@@ -45,9 +45,9 @@ export class PropertyEditorHttpHeaders extends ThingsEditorProperty {
 
 customElements.define('property-editor-http-headers', PropertyEditorHttpHeaders)
 
-export class PropertyEditorHttpParameters extends ThingsEditorProperty {
+export class PropertyEditorHttpParameters extends OxPropertyEditor {
   static get styles() {
-    return [ThingsEditorPropertyStyles]
+    return [...OxPropertyEditor.styles]
   }
 
   editorTemplate(props) {
@@ -63,9 +63,9 @@ export class PropertyEditorHttpParameters extends ThingsEditorProperty {
 
 customElements.define('property-editor-http-parameters', PropertyEditorHttpParameters)
 
-export class PropertyEditorHttpBody extends ThingsEditorProperty {
+export class PropertyEditorHttpBody extends OxPropertyEditor {
   static get styles() {
-    return [ThingsEditorPropertyStyles]
+    return [...OxPropertyEditor.styles]
   }
 
   editorTemplate(props) {

package/client/grist/parameters-editor-builder.js

@@ -2,10 +2,12 @@
  * @license Copyright © HatioLab Inc. All rights reserved.
  */
 
+import '@things-factory/modeller-ui'
+
 import { LitElement } from 'lit-element'
+import { OxPropertyEditor } from '@operato/property-editor'
 import { connect } from 'pwa-helpers/connect-mixin'
 import { store } from '@things-factory/shell'
-import '@things-factory/modeller-ui'
 
 /**
 모든 에디터들은 change 이벤트를 지원해야 한다. 또한, 모든 에디터들은 value속성에 값을 가져야 한다.
@@ -60,14 +62,12 @@ class ParametersEditorBuilder extends connect(store)(LitElement) {
     change.has('value') && this._setValues()
   }
 
-  stateChanged(state) {
-    this.propertyEditor = state.modeller.editors
-  }
+  stateChanged(state) {}
 
   _onPropsChanged(props) {
     this.renderRoot.textContent = ''
     ;(props || []).forEach(prop => {
-      let elementType = this.propertyEditor[prop.type]
+      let elementType = OxPropertyEditor.getEditor(prop.type)
       if (!elementType) {
         console.warn('Property Editor not defined', prop.type)
         return

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-ui",
-  "version": "4.0.9",
+  "version": "4.0.10",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,12 +24,13 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/export-base": "^4.0.9",
-    "@things-factory/import-base": "^4.0.9",
-    "@things-factory/integration-base": "^4.0.9",
-    "@things-factory/modeller-ui": "^4.0.9",
+    "@operato/property-editor": "^0.2.35",
+    "@things-factory/export-base": "^4.0.10",
+    "@things-factory/import-base": "^4.0.10",
+    "@things-factory/integration-base": "^4.0.10",
+    "@things-factory/modeller-ui": "^4.0.10",
     "moment-timezone": "^0.5.27",
     "subscriptions-transport-ws": "^0.11.0"
   },
-  "gitHead": "81c8ae24487cfe79da62717f12bb6752761911ae"
+  "gitHead": "1815d5f855c0e4613bd286e1ca9e7d8fd632605a"
 }