@things-factory/integration-ui 4.0.6 → 4.0.11

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 '@operato/data-grist'
 
 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/entity-selector.js

@@ -1,10 +1,12 @@
-import { i18next } from '@things-factory/i18n-base'
+import '@operato/data-grist'
+
+import { LitElement, css, html } from 'lit-element'
+import { gqlBuilder, isMobileDevice } from '@things-factory/utils'
+
+import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import { client } from '@things-factory/shell'
-import { isMobileDevice, gqlBuilder } from '@things-factory/utils'
 import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit-element'
-import { MultiColumnFormStyles } from '@things-factory/form-ui'
-import '@things-factory/grist-ui'
+import { i18next } from '@things-factory/i18n-base'
 
 export class EntitySelector extends LitElement {
   static get properties() {
@@ -32,7 +34,7 @@ export class EntitySelector extends LitElement {
           background-color: #fff;
         }
 
-        data-grist {
+        ox-grist {
           flex: 1;
         }
 
@@ -66,12 +68,12 @@ export class EntitySelector extends LitElement {
         .fields="${this.searchFields}"
       ></search-form>
 
-      <data-grist
+      <ox-grist
         .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
         .config=${this.config}
         .data=${this.data}
         .fetchHandler="${this.fetchHandler.bind(this)}"
-      ></data-grist>
+      ></ox-grist>
 
       <div class="button-container">
         <mwc-button @click=${this.oncancel.bind(this)}>${i18next.t('button.cancel')}</mwc-button>
@@ -81,7 +83,7 @@ export class EntitySelector extends LitElement {
   }
 
   get grist() {
-    return this.shadowRoot.querySelector('data-grist')
+    return this.shadowRoot.querySelector('ox-grist')
   }
 
   oncancel(e) {
@@ -313,7 +315,7 @@ export class EntitySelector extends LitElement {
   }
 
   get selected() {
-    var grist = this.shadowRoot.querySelector('data-grist')
+    var grist = this.shadowRoot.querySelector('ox-grist')
 
     var selected = grist.selected
 

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/crontab-editor.js

@@ -1,11 +1,12 @@
 import '@material/mwc-button'
 import '@material/mwc-fab'
 import '@material/mwc-icon'
-import { InputEditor } from '@things-factory/grist-ui'
-import { openPopup } from '@things-factory/layout-base'
-import { html } from 'lit-element'
 import './crontab-editor-popup'
+
+import { InputEditor } from '@operato/data-grist'
+import { html } from 'lit-element'
 import { i18next } from '@things-factory/i18n-base'
+import { openPopup } from '@things-factory/layout-base'
 
 export class CrontabEditor extends InputEditor {
   get editorTemplate() {

package/client/grist/dynamic-selector.js

@@ -1,7 +1,7 @@
-import { html } from 'lit-element'
 import '@material/mwc-icon'
 
-import { InputEditor } from '@things-factory/grist-ui'
+import { InputEditor } from '@operato/data-grist'
+import { html } from 'lit-element'
 
 const EMPTY_OPTION = { name: '', value: '' }
 

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/client/grist/task-type-selector.js

@@ -1,8 +1,7 @@
-import { html } from 'lit-element'
-import gql from 'graphql-tag'
-
+import { InputEditor } from '@operato/data-grist'
 import { client } from '@things-factory/shell'
-import { InputEditor } from '@things-factory/grist-ui'
+import gql from 'graphql-tag'
+import { html } from 'lit-element'
 
 const FETCH_TASK_TYPES_GQL = gql`
   query($connectionName: String!) {

package/client/pages/connection.js

@@ -1,13 +1,13 @@
-import '@things-factory/grist-ui'
+import '@operato/data-grist'
 
-import gql from 'graphql-tag'
+import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
+import { PageView, client, store } from '@things-factory/shell'
 import { css, html } from 'lit-element'
-import { connect } from 'pwa-helpers/connect-mixin'
+import { i18next, localize } from '@things-factory/i18n-base'
 
 import { HelpDecoratedRenderer } from '@things-factory/help'
-import { i18next, localize } from '@things-factory/i18n-base'
-import { client, PageView, store } from '@things-factory/shell'
-import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
+import { connect } from 'pwa-helpers/connect-mixin'
+import gql from 'graphql-tag'
 import { isMobileDevice } from '@things-factory/utils'
 
 export class Connection extends connect(store)(localize(i18next)(PageView)) {
@@ -36,7 +36,7 @@ export class Connection extends connect(store)(localize(i18next)(PageView)) {
           --mdc-icon-size: 24px;
         }
 
-        data-grist {
+        ox-grist {
           overflow-y: auto;
           flex: 1;
         }
@@ -65,7 +65,7 @@ export class Connection extends connect(store)(localize(i18next)(PageView)) {
 
   render() {
     return html`
-      <data-grist
+      <ox-grist
         .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
         .config=${this.gristConfig}
         .fetchHandler=${this.fetchHandler.bind(this)}
@@ -75,7 +75,7 @@ export class Connection extends connect(store)(localize(i18next)(PageView)) {
           .fields=${this.searchConfig}
           @submit=${async () => this.dataGrist.fetch()}
         ></search-form>
-      </data-grist>
+      </ox-grist>
     `
   }
 
@@ -84,7 +84,7 @@ export class Connection extends connect(store)(localize(i18next)(PageView)) {
   }
 
   get dataGrist() {
-    return this.shadowRoot.querySelector('data-grist')
+    return this.shadowRoot.querySelector('ox-grist')
   }
 
   async pageInitialized() {
@@ -358,8 +358,7 @@ export class Connection extends connect(store)(localize(i18next)(PageView)) {
   }
 
   _conditionParser() {
-    return this.searchForm
-      .getFields()
+    return this.searchForm.formFields
       .filter(field => (field.type !== 'checkbox' && field.value && field.value !== '') || field.type === 'checkbox')
       .map(field => {
         return {

package/client/pages/scenario-detail.js

@@ -1,10 +1,11 @@
-import { MultiColumnFormStyles } from '@things-factory/form-ui'
+import { LitElement, css, html } from 'lit-element'
 import { i18next, localize } from '@things-factory/i18n-base'
+
+import { HelpDecoratedRenderer } from '@things-factory/help'
+import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import { client } from '@things-factory/shell'
-import { isMobileDevice } from '@things-factory/utils'
 import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit-element'
-import { HelpDecoratedRenderer } from '@things-factory/help'
+import { isMobileDevice } from '@things-factory/utils'
 
 class ScenarioDetail extends localize(i18next)(LitElement) {
   static get properties() {
@@ -26,7 +27,7 @@ class ScenarioDetail extends localize(i18next)(LitElement) {
           background-color: #fff;
         }
 
-        data-grist {
+        ox-grist {
           flex: 1;
         }
 
@@ -50,16 +51,16 @@ class ScenarioDetail extends localize(i18next)(LitElement) {
   }
 
   get dataGrist() {
-    return this.renderRoot.querySelector('data-grist')
+    return this.renderRoot.querySelector('ox-grist')
   }
 
   render() {
     return html`
-      <data-grist
+      <ox-grist
         .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
         .config=${this.gristConfig}
         .fetchHandler=${this.fetchHandler.bind(this)}
-      ></data-grist>
+      ></ox-grist>
       <div class="button-container">
         <mwc-button raised danger @click=${this._deleteSteps.bind(this)}>${i18next.t('button.delete')}</mwc-button>
         <mwc-button raised @click=${this._updateSteps.bind(this)}>${i18next.t('button.save')}</mwc-button>

package/client/pages/scenario-importer.js

@@ -1,9 +1,11 @@
-import '@things-factory/grist-ui'
-import { i18next } from '@things-factory/i18n-base'
+import '@operato/data-grist'
+
+import { LitElement, css, html } from 'lit-element'
+
 import { client } from '@things-factory/shell'
-import { isMobileDevice } from '@things-factory/utils'
 import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit-element'
+import { i18next } from '@things-factory/i18n-base'
+import { isMobileDevice } from '@things-factory/utils'
 
 export class ScenarioImporter extends LitElement {
   static get properties() {
@@ -68,7 +70,7 @@ export class ScenarioImporter extends LitElement {
 
           background-color: #fff;
         }
-        data-grist {
+        ox-grist {
           flex: 1;
         }
         .button-container {
@@ -85,11 +87,11 @@ export class ScenarioImporter extends LitElement {
 
   render() {
     return html`
-      <data-grist
+      <ox-grist
         .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
         .config=${this.columns}
         .data="${{ records: this.scenarios }}"
-      ></data-grist>
+      ></ox-grist>
 
       <div class="button-container">
         <mwc-button raised @click="${this.save.bind(this)}">${i18next.t('button.save')}</mwc-button>

package/client/pages/scenario.js

@@ -1,17 +1,17 @@
-import '@things-factory/grist-ui'
+import '@operato/data-grist'
 import './scenario-detail'
 import './scenario-importer'
 
-import gql from 'graphql-tag'
+import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
+import { PageView, client, navigate, store } from '@things-factory/shell'
 import { css, html } from 'lit-element'
-import moment from 'moment-timezone'
-import { connect } from 'pwa-helpers/connect-mixin'
-
 import { i18next, localize } from '@things-factory/i18n-base'
 import { notify, openPopup } from '@things-factory/layout-base'
-import { client, navigate, PageView, store } from '@things-factory/shell'
-import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
+
+import { connect } from 'pwa-helpers/connect-mixin'
+import gql from 'graphql-tag'
 import { isMobileDevice } from '@things-factory/utils'
+import moment from 'moment-timezone'
 
 function IS_SCENARIO_RUNNING(state) {
   return state && state !== 'UNLOADED'
@@ -43,7 +43,7 @@ export class Scenario extends connect(store)(localize(i18next)(PageView)) {
           --mdc-icon-size: 24px;
         }
 
-        data-grist {
+        ox-grist {
           overflow-y: auto;
           flex: 1;
         }
@@ -91,7 +91,7 @@ export class Scenario extends connect(store)(localize(i18next)(PageView)) {
 
   render() {
     return html`
-      <data-grist
+      <ox-grist
         .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
         .config=${this.gristConfig}
         .fetchHandler=${this.fetchHandler.bind(this)}
@@ -101,16 +101,16 @@ export class Scenario extends connect(store)(localize(i18next)(PageView)) {
           .fields=${this.searchConfig}
           @submit=${async () => this.dataGrist.fetch()}
         ></search-form>
-      </data-grist>
+      </ox-grist>
     `
   }
 
   get searchForm() {
-    return this.shadowRoot.querySelector('search-form')
+    return this.renderRoot.querySelector('search-form')
   }
 
   get dataGrist() {
-    return this.shadowRoot.querySelector('data-grist')
+    return this.renderRoot.querySelector('ox-grist')
   }
 
   // update with url params value
@@ -416,8 +416,7 @@ export class Scenario extends connect(store)(localize(i18next)(PageView)) {
   }
 
   _conditionParser() {
-    return this.searchForm
-      .getFields()
+    return this.searchForm.formFields
       .filter(field => (field.type !== 'checkbox' && field.value && field.value !== '') || field.type === 'checkbox')
       .map(field => {
         return {

package/client/viewparts/monitoring-summary.js

@@ -1,7 +1,9 @@
-import '@things-factory/grist-ui'
+import '@operato/data-grist'
+
+import { LitElement, css, html } from 'lit-element'
 import { i18next, localize } from '@things-factory/i18n-base'
+
 import { ScrollbarStyles } from '@things-factory/styles'
-import { LitElement, css, html } from 'lit-element'
 
 export class IntegrationMonitoringSummary extends localize(i18next)(LitElement) {
   static get properties() {

package/client/viewparts/scenario-instance-monitor.js

@@ -1,15 +1,15 @@
-import '@things-factory/grist-ui'
+import '@operato/data-grist'
+import '@material/mwc-icon'
+import './scenario-instance-view'
+import './scenario-instance-view'
+
+import { LitElement, css, html } from 'lit-element'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { notify, openPopup } from '@things-factory/layout-base'
-import { client } from '@things-factory/shell'
+
 import { ScrollbarStyles } from '@things-factory/styles'
+import { client } from '@things-factory/shell'
 import gql from 'graphql-tag'
-import { LitElement, css, html } from 'lit-element'
-
-import '@material/mwc-icon'
-import './scenario-instance-view'
-
-import './scenario-instance-view'
 
 function IS_SCENARIO_RUNNING(state) {
   return state && state !== 'UNLOADED'

package/client/viewparts/scenario-monitor.js

@@ -1,13 +1,14 @@
-import '@things-factory/grist-ui'
+import '@operato/data-grist'
+import '@material/mwc-icon-button'
+import './scenario-instance-monitor'
+
+import { LitElement, css, html } from 'lit-element'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { notify, openPopup } from '@things-factory/layout-base'
-import { client } from '@things-factory/shell'
+
 import { ScrollbarStyles } from '@things-factory/styles'
+import { client } from '@things-factory/shell'
 import gql from 'graphql-tag'
-import { LitElement, css, html } from 'lit-element'
-
-import '@material/mwc-icon-button'
-import './scenario-instance-monitor'
 
 function IS_SCENARIO_RUNNING(state) {
   return state && state !== 'UNLOADED'

package/client/viewparts/scenarios-monitor.js

@@ -1,11 +1,12 @@
-import '@things-factory/grist-ui'
-import { i18next, localize } from '@things-factory/i18n-base'
-import { ScrollbarStyles } from '@things-factory/styles'
-import { LitElement, css, html } from 'lit-element'
-
+import '@operato/data-grist'
 import '@material/mwc-icon-button'
 import './scenario-monitor'
 
+import { LitElement, css, html } from 'lit-element'
+import { i18next, localize } from '@things-factory/i18n-base'
+
+import { ScrollbarStyles } from '@things-factory/styles'
+
 function IS_SCENARIO_RUNNING(state) {
   return state && state !== 'UNLOADED'
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-ui",
-  "version": "4.0.6",
+  "version": "4.0.11",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,12 +24,14 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/export-base": "^4.0.6",
-    "@things-factory/import-base": "^4.0.6",
-    "@things-factory/integration-base": "^4.0.6",
-    "@things-factory/modeller-ui": "^4.0.6",
+    "@operato/data-grist": "^0.2.35",
+    "@operato/property-editor": "^0.2.35",
+    "@things-factory/export-base": "^4.0.11",
+    "@things-factory/import-base": "^4.0.11",
+    "@things-factory/integration-base": "^4.0.11",
+    "@things-factory/modeller-ui": "^4.0.11",
     "moment-timezone": "^0.5.27",
     "subscriptions-transport-ws": "^0.11.0"
   },
-  "gitHead": "471247c3499ba439b074c7654ae8d8e9fc3972f0"
+  "gitHead": "47745d8cdbe99f11d8d69bbcab3901c9771525a0"
 }