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

package/client/bootstrap.js

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

package/client/editors/entity-editor.js

@@ -14,12 +14,12 @@ export class PropertyEditorEntitySelector extends OxPropertyEditor {
     return [...OxPropertyEditor.styles]
   }
 
-  editorTemplate(props) {
+  editorTemplate(value, spec) {
     return html`
       <things-editor-entity-selector
         id="editor"
-        .value=${props.value}
-        .properties=${props.property}
+        .value=${value}
+        .properties=${spec.property}
       ></things-editor-entity-selector>
     `
   }

package/client/editors/property-editor.js

@@ -14,13 +14,13 @@ export class PropertyEditorScenarioStepInput extends OxPropertyEditor {
     return [...OxPropertyEditor.styles]
   }
 
-  editorTemplate(props) {
+  editorTemplate(value, spec) {
     /* context must be a datagrid(grist) instance, and host must be a record */
-    const { context: grid, host: record } = props
+    const { context: grid, host: record } = spec
     const steps = grid?.dirtyData.records.filter(rec => rec.name !== record.name).map(rec => rec.name) || []
 
     return html`
-      <input id="editor" .value=${props.value || ''} list="step-list" />
+      <input id="editor" .value=${value || ''} list="step-list" />
       <datalist id="step-list">${steps.map(id => html` <option value=${id}></option> `)}</datalist>
     `
   }
@@ -33,13 +33,9 @@ export class PropertyEditorHttpHeaders extends OxPropertyEditor {
     return [...OxPropertyEditor.styles]
   }
 
-  editorTemplate(props) {
+  editorTemplate(value, spec) {
     return html`
-      <things-editor-http-headers
-        id="editor"
-        .value=${props.value}
-        .properties=${props.property}
-      ></things-editor-http-headers>
+      <things-editor-http-headers id="editor" .value=${value} .properties=${spec.property}></things-editor-http-headers>
     `
   }
 }
@@ -51,12 +47,12 @@ export class PropertyEditorHttpParameters extends OxPropertyEditor {
     return [...OxPropertyEditor.styles]
   }
 
-  editorTemplate(props) {
+  editorTemplate(value, spec) {
     return html`
       <things-editor-http-parameters
         id="editor"
-        .value=${props.value}
-        .properties=${props.property}
+        .value=${value}
+        .properties=${spec.property}
       ></things-editor-http-parameters>
     `
   }
@@ -69,13 +65,9 @@ export class PropertyEditorHttpBody extends OxPropertyEditor {
     return [...OxPropertyEditor.styles]
   }
 
-  editorTemplate(props) {
+  editorTemplate(value, spec) {
     return html`
-      <things-editor-http-body
-        id="editor"
-        .value=${props.value}
-        .properties=${props.property}
-      ></things-editor-http-body>
+      <things-editor-http-body id="editor" .value=${value} .properties=${spec.property}></things-editor-http-body>
     `
   }
 }

package/client/pages/connection.js

@@ -78,7 +78,7 @@ export class Connection extends connect(store)(localize(i18next)(PageView)) {
         .fetchHandler=${this.fetchHandler.bind(this)}
       >
         <div slot="headroom" id="filters">
-          <ox-filters-form></ox-filters-form>
+          <ox-filters-form autofocus></ox-filters-form>
         </div>
       </ox-grist>
     `

package/client/pages/integration-monitor.js

@@ -195,21 +195,21 @@ export class IntegrationMonitor extends localize(i18next)(PageView) {
 
     this.scenarioInstanceStateSubscription = await subscribe(
       {
-        query: `
-            subscription {
-              scenarioInstanceState {
-                instanceName
-                scenarioName
-                state
-                progress {
-                  rate
-                  steps
-                  step
-                  rounds
-                }
+        query: gql`
+          subscription {
+            scenarioInstanceState {
+              instanceName
+              scenarioName
+              state
+              progress {
+                rate
+                steps
+                step
+                rounds
               }
             }
-          `
+          }
+        `
       },
       {
         next: async ({ data }) => {
@@ -246,24 +246,33 @@ export class IntegrationMonitor extends localize(i18next)(PageView) {
             this.scenarios.splice(this.scenarios.indexOf(scenario), 1, { ...scenario })
             this.scenarios = [...this.scenarios]
           }
+        },
+        start: subscription => {
+          console.log(subscription)
+        },
+        error: error => {
+          console.log(error)
+        },
+        complete: () => {
+          console.log('complete')
         }
       }
     )
 
     this.scenarioQueueStateSubscription = await subscribe(
       {
-        query: `
-            subscription {
-              scenarioQueueState {
-                queue {
-                  stuff
-                  due
-                  priority
-                  tag
-                }
+        query: gql`
+          subscription {
+            scenarioQueueState {
+              queue {
+                stuff
+                due
+                priority
+                tag
               }
             }
-          `
+          }
+        `
       },
       {
         next: ({ data }) => {
@@ -276,17 +285,17 @@ export class IntegrationMonitor extends localize(i18next)(PageView) {
 
     this.connectionStateSubscription = await subscribe(
       {
-        query: `
-            subscription {
-              connectionState {
-                id,
-                name,
-                description,
-                type,
-                state
-              }
+        query: gql`
+          subscription {
+            connectionState {
+              id
+              name
+              description
+              type
+              state
             }
-          `
+          }
+        `
       },
       {
         next: async ({ data }) => {

package/client/pages/scenario.js

@@ -104,7 +104,7 @@ export class Scenario extends connect(store)(localize(i18next)(PageView)) {
         .fetchHandler=${this.fetchHandler.bind(this)}
       >
         <div slot="headroom" id="filters">
-          <ox-filters-form></ox-filters-form>
+          <ox-filters-form autofocus></ox-filters-form>
         </div>
       </ox-grist>
     `
@@ -276,11 +276,11 @@ export class Scenario extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  // async pageUpdated(changes, lifecycle) {
-  //   if (this.active) {
-  //     this.grist.fetch()
-  //   }
-  // }
+  async pageUpdated(changes, lifecycle) {
+    if (this.active) {
+      this.grist.fetch()
+    }
+  }
 
   async fetchHandler({ page, limit, sortings = [], filters = [] }) {
     const response = await client.query({
@@ -418,7 +418,6 @@ export class Scenario extends connect(store)(localize(i18next)(PageView)) {
             patchField[key] = dirtyFields[key].after
           }
         }
-        this._setDefaultFieldsValue(patchField)
         patchField.cuFlag = patch.__dirty__
 
         return patchField
@@ -459,12 +458,12 @@ export class Scenario extends connect(store)(localize(i18next)(PageView)) {
     const state = response.data.startScenario.state
     record.state = state
 
-    this.grist.refresh()
-
     notify({
       level: 'info',
       message: `${IS_SCENARIO_RUNNING(state) ? 'success' : 'fail'} to start scenario : ${record.name}`
     })
+
+    this.grist.fetch()
   }
 
   async stopScenario(record) {
@@ -481,15 +480,19 @@ export class Scenario extends connect(store)(localize(i18next)(PageView)) {
       }
     })
 
-    const state = response.data.stopScenario.state
-    record.state = state
-
-    this.grist.refresh()
+    if (!response.errors) {
+      notify({
+        level: 'info',
+        message: `success to stop scenario : ${record.name}`
+      })
+    } else {
+      notify({
+        level: 'error',
+        message: `${response.errors.map(error => error.message).join('\n')}`
+      })
+    }
 
-    notify({
-      level: 'info',
-      message: `${IS_SCENARIO_RUNNING(state) ? 'fail' : 'success'} to stop scenario : ${record.name}`
-    })
+    this.grist.fetch()
   }
 
   async exportHandler() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-ui",
-  "version": "5.0.0-zeta.8",
+  "version": "5.0.1",
   "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-beta.39",
-    "@operato/data-grist": "^1.0.0-beta.39",
-    "@operato/graphql": "^1.0.0-beta.39",
-    "@operato/help": "^1.0.0-beta.39",
-    "@operato/i18n": "^1.0.0-beta.39",
-    "@operato/layout": "^1.0.0-beta.39",
-    "@operato/property-editor": "^1.0.0-beta.39",
-    "@operato/styles": "^1.0.0-beta.39",
-    "@operato/utils": "^1.0.0-beta.39",
-    "@things-factory/export-base": "^5.0.0-zeta.8",
-    "@things-factory/import-base": "^5.0.0-zeta.8",
-    "@things-factory/integration-base": "^5.0.0-zeta.8",
-    "moment-timezone": "^0.5.27",
-    "subscriptions-transport-ws": "^0.11.0"
+    "@operato/app": "^1.0.1",
+    "@operato/data-grist": "^1.0.1",
+    "@operato/graphql": "^1.0.0",
+    "@operato/grist-editor": "^1.0.0",
+    "@operato/help": "^1.0.1",
+    "@operato/i18n": "^1.0.0",
+    "@operato/layout": "^1.0.1",
+    "@operato/property-editor": "^1.0.0",
+    "@operato/styles": "^1.0.0",
+    "@operato/utils": "^1.0.1",
+    "@things-factory/export-base": "^5.0.1",
+    "@things-factory/import-base": "^5.0.1",
+    "@things-factory/integration-base": "^5.0.1",
+    "moment-timezone": "^0.5.27"
   },
-  "gitHead": "486693b3774b872157c83b623579ac63da1ed53c"
+  "gitHead": "47225f76058999bb8bb075ac960cfb24f058093f"
 }