@things-factory/integration-ui 5.0.0-y.0 → 5.0.0-zeta.2

package/client/pages/connection.js

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

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 = {
@@ -223,8 +221,6 @@ class ScenarioDetail extends localize(i18next)(LitElement) {
       `
     })
 
-    this.requestRefresh()
-
     return {
       total: response.data.steps.total || 0,
       records: response.data.steps.items || []
@@ -284,7 +280,10 @@ class ScenarioDetail extends localize(i18next)(LitElement) {
         }
       })
 
-      if (!response.errors) this.dataGrist.fetch()
+      if (!response.errors) {
+        this.dataGrist.fetch()
+        this.requestRefresh()
+      }
     }
   }
 
@@ -308,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

@@ -2,17 +2,17 @@ import '@operato/data-grist'
 import './scenario-detail'
 import './scenario-importer'
 
-import { CommonButtonStyles, ScrollbarStyles } from '@operato/styles'
-import { PageView, navigate, store } from '@operato/shell'
+import gql from 'graphql-tag'
 import { css, html } from 'lit'
-import { i18next, localize } from '@operato/i18n'
-import { notify, openPopup } from '@operato/layout'
+import moment from 'moment-timezone'
+import { connect } from 'pwa-helpers/connect-mixin'
 
 import { client } from '@operato/graphql'
-import { connect } from 'pwa-helpers/connect-mixin'
-import gql from 'graphql-tag'
+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 { isMobileDevice } from '@operato/utils'
-import moment from 'moment-timezone'
 
 function IS_SCENARIO_RUNNING(state) {
   return state && state !== 'UNLOADED'
@@ -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({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-ui",
-  "version": "5.0.0-y.0",
+  "version": "5.0.0-zeta.2",
   "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.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-y.0",
-    "@things-factory/import-base": "^5.0.0-y.0",
-    "@things-factory/integration-base": "^5.0.0-y.0",
+    "@operato/app": "^1.0.0-beta.32",
+    "@operato/data-grist": "1.0.0-beta.30",
+    "@operato/graphql": "1.0.0-beta.30",
+    "@operato/help": "1.0.0-beta.30",
+    "@operato/i18n": "1.0.0-beta.30",
+    "@operato/layout": "1.0.0-beta.30",
+    "@operato/property-editor": "1.0.0-beta.30",
+    "@operato/styles": "1.0.0-beta.30",
+    "@operato/utils": "1.0.0-beta.30",
+    "@things-factory/export-base": "^5.0.0-zeta.2",
+    "@things-factory/import-base": "^5.0.0-zeta.2",
+    "@things-factory/integration-base": "^5.0.0-zeta.2",
     "moment-timezone": "^0.5.27",
     "subscriptions-transport-ws": "^0.11.0"
   },
-  "gitHead": "2fb8066dae72d864b0fc3a5b439a18579fa39ee6"
+  "gitHead": "fe921b76f32ac48ceddf3c290110509bdb5750d6"
 }