@things-factory/integration-ui 5.0.0-alpha.5 → 5.0.0-alpha.52

package/client/bootstrap.js

@@ -2,22 +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 { 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

@@ -1,14 +1,14 @@
 import '@operato/data-grist'
 
-import gql from 'graphql-tag'
+import { CommonButtonStyles, ScrollbarStyles } from '@operato/styles'
+import { PageView, store } from '@operato/shell'
 import { css, html } from 'lit'
-import { connect } from 'pwa-helpers/connect-mixin'
+import { i18next, localize } from '@operato/i18n'
 
-import { client } from '@operato/graphql'
 import { HelpDecoratedRenderer } from '@operato/help/help-decorated-renderer.js'
-import { i18next, localize } from '@operato/i18n'
-import { PageView, store } from '@operato/shell'
-import { CommonButtonStyles, ScrollbarStyles } from '@operato/styles'
+import { client } from '@operato/graphql'
+import { connect } from 'pwa-helpers/connect-mixin'
+import gql from 'graphql-tag'
 import { isMobileDevice } from '@operato/utils'
 
 export class Connection extends connect(store)(localize(i18next)(PageView)) {
@@ -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
         },
@@ -364,13 +365,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

@@ -1,9 +1,9 @@
-import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit'
+import { LitElement, css, html } from 'lit'
+import { i18next, localize } from '@operato/i18n'
 
-import { client } from '@operato/graphql'
 import { HelpDecoratedRenderer } from '@operato/help/help-decorated-renderer.js'
-import { i18next, localize } from '@operato/i18n'
+import { client } from '@operato/graphql'
+import gql from 'graphql-tag'
 import { isMobileDevice } from '@operato/utils'
 
 class ScenarioDetail extends localize(i18next)(LitElement) {
@@ -179,7 +179,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
         }

package/client/pages/scenario.js

@@ -2,17 +2,17 @@ import '@operato/data-grist'
 import './scenario-detail'
 import './scenario-importer'
 
-import gql from 'graphql-tag'
+import { CommonButtonStyles, ScrollbarStyles } from '@operato/styles'
+import { PageView, navigate, store } from '@operato/shell'
 import { css, html } from 'lit'
-import moment from 'moment-timezone'
-import { connect } from 'pwa-helpers/connect-mixin'
-
-import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { notify, openPopup } from '@operato/layout'
-import { navigate, PageView, store } from '@operato/shell'
-import { CommonButtonStyles, ScrollbarStyles } from '@operato/styles'
+
+import { client } from '@operato/graphql'
+import { connect } from 'pwa-helpers/connect-mixin'
+import gql from 'graphql-tag'
 import { isMobileDevice } from '@operato/utils'
+import moment from 'moment-timezone'
 
 function IS_SCENARIO_RUNNING(state) {
   return state && state !== 'UNLOADED'
@@ -417,13 +417,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.5",
+  "version": "5.0.0-alpha.52",
   "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/data-grist": "1.0.0-alpha.4",
-    "@operato/graphql": "1.0.0-alpha.4",
-    "@operato/help": "1.0.0-alpha.4",
-    "@operato/i18n": "1.0.0-alpha.4",
-    "@operato/layout": "1.0.0-alpha.4",
-    "@operato/property-editor": "1.0.0-alpha.4",
-    "@operato/styles": "1.0.0-alpha.4",
-    "@operato/utils": "1.0.0-alpha.4",
-    "@things-factory/export-base": "^5.0.0-alpha.5",
-    "@things-factory/import-base": "^5.0.0-alpha.5",
-    "@things-factory/integration-base": "^5.0.0-alpha.5",
-    "@things-factory/modeller-ui": "^5.0.0-alpha.5",
+    "@operato/app": "^1.0.0-beta.26",
+    "@operato/data-grist": "1.0.0-beta.26",
+    "@operato/graphql": "1.0.0-beta.26",
+    "@operato/help": "1.0.0-beta.26",
+    "@operato/i18n": "1.0.0-beta.26",
+    "@operato/layout": "1.0.0-beta.26",
+    "@operato/property-editor": "1.0.0-beta.26",
+    "@operato/styles": "1.0.0-beta.26",
+    "@operato/utils": "1.0.0-beta.26",
+    "@things-factory/export-base": "^5.0.0-alpha.52",
+    "@things-factory/import-base": "^5.0.0-alpha.52",
+    "@things-factory/integration-base": "^5.0.0-alpha.52",
     "moment-timezone": "^0.5.27",
     "subscriptions-transport-ws": "^0.11.0"
   },
-  "gitHead": "379449b7be7b3d8220f1cac9ab684b812117edfd"
+  "gitHead": "dd9c8f2e256e256e42bd9bd26db5eaa955f85620"
 }