@things-factory/integration-ui 5.0.0-alpha.8 → 5.0.0-zeta.0

package/client/bootstrap.js

@@ -2,23 +2,26 @@ import '@material/mwc-icon'
 import './editors/entity-editor'
 import './editors/property-editor'
 
+import { registerEditor as registerGristEditor, registerRenderer as registerGristRenderer } from '@operato/data-grist'
+
 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 { OxGristEditorCrontab } from '@operato/app/grist-editor/ox-grist-editor-crontab.js'
+import { OxGristEditorJson } from '@operato/app/grist-editor/ox-grist-editor-json.js'
+import { OxGristEditorParameters } from '@operato/app/grist-editor/ox-grist-editor-parameters.js'
+import { OxGristRendererCrontab } from '@operato/app/grist-editor/ox-grist-renderer-crontab.js'
 import { OxPropertyEditor } from '@operato/property-editor'
-// import { ParametersEditor } from './grist/parameters-editor'
 import { TaskTypeSelector } from './grist/task-type-selector'
-import { ParametersEditor } from '@operato/app/grist/parameters-editor.js'
-import { registerEditor as registerGristEditor } from '@operato/data-grist'
 
 export default function bootstrap() {
   registerGristEditor('task-type', TaskTypeSelector)
   registerGristEditor('connector', ConnectorSelector)
   registerGristEditor('connection', ConnectionSelector)
-  registerGristEditor('json', JsonGristEditor)
-  registerGristEditor('parameters', ParametersEditor)
-  registerGristEditor('crontab', CrontabEditor)
+  registerGristEditor('json', OxGristEditorJson)
+  registerGristEditor('parameters', OxGristEditorParameters)
+  registerGristEditor('crontab', OxGristEditorCrontab)
+
+  registerGristRenderer('crontab', OxGristRendererCrontab)
 
   OxPropertyEditor.register({
     'http-headers': 'property-editor-http-headers',

package/client/grist/dynamic-selector.js

@@ -1,12 +1,11 @@
 import '@material/mwc-icon'
 
+import { OxGristEditor } from '@operato/data-grist'
 import { html } from 'lit'
 
-import { InputEditor } from '@operato/data-grist'
-
 const EMPTY_OPTION = { name: '', value: '' }
 
-export class DynamicSelector extends InputEditor {
+export class DynamicSelector extends OxGristEditor {
   getOptions() {
     return []
   }

package/client/grist/task-type-selector.js

@@ -1,9 +1,8 @@
+import { OxGristEditor } from '@operato/data-grist'
+import { client } from '@operato/graphql'
 import gql from 'graphql-tag'
 import { html } from 'lit'
 
-import { InputEditor } from '@operato/data-grist'
-import { client } from '@operato/graphql'
-
 const FETCH_TASK_TYPES_GQL = gql`
   query ($connectionName: String!) {
     taskTypesByConnection(connectionName: $connectionName) {
@@ -16,7 +15,7 @@ const FETCH_TASK_TYPES_GQL = gql`
 
 const EMPTY_OPTION = { name: '', value: '' }
 
-export class TaskTypeSelector extends InputEditor {
+export class TaskTypeSelector extends OxGristEditor {
   async getOptions() {
     var { connectionName = '' } = this.column.record
     if (typeof connectionName === 'function') {

package/client/pages/connection.js

@@ -203,7 +203,8 @@ export class Connection extends connect(store)(localize(i18next)(PageView)) {
               const { name, help, parameterSpec: spec } = record.type ? this.connectors?.[record.type] : {}
               const context = this.grist
               return { name, help, spec, context }
-            }
+            },
+            renderer: 'json5'
           },
           width: 100
         },
@@ -239,18 +240,6 @@ export class Connection extends connect(store)(localize(i18next)(PageView)) {
         }
       ]
     }
-
-    await this.updateComplete
-
-    this.grist.fetch()
-  }
-
-  async pageUpdated(changes, lifecycle) {
-    if (this.active) {
-      await this.updateComplete
-
-      this.grist.fetch()
-    }
   }
 
   async fetchHandler({ page, limit, sortings = [], filters = [] }) {
@@ -364,13 +353,6 @@ export class Connection extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  async stateChanged(state) {
-    if (this.active && this._currentPopupName && !state.layout.viewparts[this._currentPopupName]) {
-      this.grist.fetch()
-      this._currentPopupName = null
-    }
-  }
-
   async _updateConnectionManager() {
     let patches = this.grist.dirtyRecords
     if (patches && patches.length) {

package/client/pages/scenario-detail.js

@@ -66,8 +66,6 @@ class ScenarioDetail extends localize(i18next)(LitElement) {
     `
   }
 
-  async updated(changedProps) {}
-
   async firstUpdated() {
     this.select = ['name', 'description', 'sequence', 'task', 'connection', 'params', 'skip', 'log']
     this.gristConfig = {
@@ -179,7 +177,8 @@ class ScenarioDetail extends localize(i18next)(LitElement) {
               var { name, parameterSpec: spec, help } = record.task ? this.taskTypes?.[record.task] : {}
               const context = this.dataGrist
               return { name, spec, help, context }
-            }
+            },
+            renderer: 'json5'
           },
           width: 200
         }
@@ -206,7 +205,7 @@ class ScenarioDetail extends localize(i18next)(LitElement) {
         query {
           steps ( 
             filters: { 
-              name: "scenario",
+              name: "scenarioId",
               value: "${this.scenario.id}",
               operator: "eq" 
             },
@@ -222,8 +221,6 @@ class ScenarioDetail extends localize(i18next)(LitElement) {
       `
     })
 
-    this.requestRefresh()
-
     return {
       total: response.data.steps.total || 0,
       records: response.data.steps.items || []
@@ -283,7 +280,10 @@ class ScenarioDetail extends localize(i18next)(LitElement) {
         }
       })
 
-      if (!response.errors) this.dataGrist.fetch()
+      if (!response.errors) {
+        this.dataGrist.fetch()
+        this.requestRefresh()
+      }
     }
   }
 
@@ -307,6 +307,8 @@ class ScenarioDetail extends localize(i18next)(LitElement) {
     if (response.errors) return
 
     this.dataGrist.fetch()
+    this.requestRefresh()
+
     await document.dispatchEvent(
       new CustomEvent('notify', {
         detail: {

package/client/pages/scenario.js

@@ -114,32 +114,9 @@ export class Scenario extends connect(store)(localize(i18next)(PageView)) {
     return this.renderRoot.querySelector('ox-grist')
   }
 
-  // update with url params value
-  _updateSearchConfig(lifecycle) {
-    // this.searchConfig = this.searchConfig.map(conf => {
-    // if (conf.name in lifecycle.params) {
-    //   conf.value = lifecycle.params[conf.name]
-    // } else {
-    //   delete conf.value
-    // }
-    // return conf
-    // })
-  }
-
-  // set default field value to record with searchConfig
-  _setDefaultFieldsValue(fields) {
-    // this.searchConfig.forEach(conf => {
-    //   if (!fields[conf.name] && conf.value) {
-    //     fields[conf.name] = conf.value
-    //   }
-    // })
-  }
-
   async pageInitialized(lifecycle) {
     this.fetchTaskTypes()
 
-    this._updateSearchConfig(lifecycle)
-
     this.gristConfig = {
       list: { fields: ['name', 'description', 'schedule', 'active'] },
       columns: [
@@ -297,21 +274,13 @@ export class Scenario extends connect(store)(localize(i18next)(PageView)) {
         }
       ]
     }
-
-    await this.updateComplete
-
-    this.grist.fetch()
   }
 
-  async pageUpdated(changes, lifecycle) {
-    if (this.active) {
-      // update with url params value
-      this._updateSearchConfig(lifecycle)
-      await this.updateComplete
-
-      this.grist.fetch()
-    }
-  }
+  // async pageUpdated(changes, lifecycle) {
+  //   if (this.active) {
+  //     this.grist.fetch()
+  //   }
+  // }
 
   async fetchHandler({ page, limit, sortings = [], filters = [] }) {
     const response = await client.query({
@@ -417,13 +386,6 @@ export class Scenario extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  async stateChanged(state) {
-    if (this.active && this._currentPopupName && !state.layout.viewparts[this._currentPopupName]) {
-      this.grist.fetch()
-      this._currentPopupName = null
-    }
-  }
-
   async _copyScenario() {
     var selected = this.grist.selected
     if (selected.length == 0) return

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-ui",
-  "version": "5.0.0-alpha.8",
+  "version": "5.0.0-zeta.0",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,20 +24,20 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@operato/app": "^1.0.0-alpha.19",
-    "@operato/data-grist": "1.0.0-alpha.19",
-    "@operato/graphql": "1.0.0-alpha.19",
-    "@operato/help": "1.0.0-alpha.19",
-    "@operato/i18n": "1.0.0-alpha.19",
-    "@operato/layout": "1.0.0-alpha.19",
-    "@operato/property-editor": "1.0.0-alpha.19",
-    "@operato/styles": "1.0.0-alpha.19",
-    "@operato/utils": "1.0.0-alpha.19",
-    "@things-factory/export-base": "^5.0.0-alpha.8",
-    "@things-factory/import-base": "^5.0.0-alpha.8",
-    "@things-factory/integration-base": "^5.0.0-alpha.8",
+    "@operato/app": "^1.0.0-beta.29",
+    "@operato/data-grist": "1.0.0-beta.29",
+    "@operato/graphql": "1.0.0-beta.29",
+    "@operato/help": "1.0.0-beta.29",
+    "@operato/i18n": "1.0.0-beta.29",
+    "@operato/layout": "1.0.0-beta.29",
+    "@operato/property-editor": "1.0.0-beta.29",
+    "@operato/styles": "1.0.0-beta.29",
+    "@operato/utils": "1.0.0-beta.29",
+    "@things-factory/export-base": "^5.0.0-zeta.0",
+    "@things-factory/import-base": "^5.0.0-zeta.0",
+    "@things-factory/integration-base": "^5.0.0-zeta.0",
     "moment-timezone": "^0.5.27",
     "subscriptions-transport-ws": "^0.11.0"
   },
-  "gitHead": "45da542dc9c876c0a1fa1837f1606210ae600b73"
+  "gitHead": "92cc88054dfbf35cc54fb9612a067b811fb2db39"
 }