@things-factory/integration-ui 4.0.42 → 4.1.1

package/client/editors/entity-editor.js

@@ -4,7 +4,7 @@
 
 import './things-editor-entity-selector'
 
-import { css, html } from 'lit-element'
+import { html } from 'lit'
 
 import { OxPropertyEditor } from '@operato/property-editor'
 import { deepClone } from '@things-factory/utils'

package/client/editors/entity-selector.js

@@ -1,12 +1,12 @@
 import '@operato/data-grist'
 
-import { LitElement, css, html } from 'lit-element'
-import { gqlBuilder, isMobileDevice } from '@things-factory/utils'
+import gql from 'graphql-tag'
+import { css, html, LitElement } from 'lit'
 
 import { MultiColumnFormStyles } from '@things-factory/form-ui'
-import { client } from '@things-factory/shell'
-import gql from 'graphql-tag'
 import { i18next } from '@things-factory/i18n-base'
+import { client } from '@things-factory/shell'
+import { gqlBuilder, isMobileDevice } from '@things-factory/utils'
 
 export class EntitySelector extends LitElement {
   static get properties() {

package/client/editors/property-editor.js

@@ -5,8 +5,9 @@ import './things-editor-http-headers'
 import './things-editor-http-parameters'
 import './things-editor-http-body'
 
+import { html } from 'lit'
+
 import { OxPropertyEditor } from '@operato/property-editor'
-import { html } from 'lit-element'
 
 export class PropertyEditorScenarioStepInput extends OxPropertyEditor {
   static get styles() {

package/client/editors/things-editor-entity-selector.js

@@ -2,13 +2,13 @@
  * @license Copyright © HatioLab Inc. All rights reserved.
  */
 
-import { LitElement, html, css } from 'lit-element'
 import '@material/mwc-icon'
+import './entity-selector'
 
-import { openPopup } from '@things-factory/layout-base'
-import { i18next } from '@things-factory/i18n-base'
+import { css, html, LitElement } from 'lit'
 
-import './entity-selector'
+import { i18next } from '@things-factory/i18n-base'
+import { openPopup } from '@things-factory/layout-base'
 
 export default class ThingsEditorEntitySelector extends LitElement {
   static get properties() {

package/client/editors/things-editor-http-body.js

@@ -2,7 +2,7 @@
  * @license Copyright © HatioLab Inc. All rights reserved.
  */
 
-import { LitElement, html, css } from 'lit-element'
+import { css, html, LitElement } from 'lit'
 
 /**
 http body editor element

package/client/editors/things-editor-http-headers.js

@@ -2,7 +2,7 @@
  * @license Copyright © HatioLab Inc. All rights reserved.
  */
 
-import { LitElement, html, css } from 'lit-element'
+import { css, html, LitElement } from 'lit'
 
 /**
 http headers editor element

package/client/editors/things-editor-http-parameters.js

@@ -2,7 +2,7 @@
  * @license Copyright © HatioLab Inc. All rights reserved.
  */
 
-import { LitElement, html, css } from 'lit-element'
+import { css, html, LitElement } from 'lit'
 
 /**
 http parameters editor element

package/client/grist/crontab-editor-popup.js

@@ -1,7 +1,9 @@
 import '@material/mwc-button'
-import { ScrollbarStyles } from '@things-factory/styles'
+
+import { css, html, LitElement } from 'lit'
+
 import { i18next } from '@things-factory/i18n-base'
-import { css, html, LitElement } from 'lit-element'
+import { ScrollbarStyles } from '@things-factory/styles'
 
 function createCronRegex(type) {
   // https://gist.github.com/dkandalov/a2aed17cfdeb65243022

package/client/grist/crontab-editor.js

@@ -3,8 +3,9 @@ import '@material/mwc-fab'
 import '@material/mwc-icon'
 import './crontab-editor-popup'
 
+import { html } from 'lit'
+
 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'
 

package/client/grist/dynamic-selector.js

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

package/client/grist/json-editor.js

@@ -2,17 +2,17 @@
  * @license Copyright © HatioLab Inc. All rights reserved.
  */
 
-import { LitElement, html, css, unsafeCSS } from 'lit-element'
-import { i18next } from '@things-factory/i18n-base'
+import 'codemirror/mode/javascript/javascript'
+import 'codemirror/addon/display/fullscreen'
+import 'codemirror/addon/display/autorefresh'
 
-import CodeMirrorStyle from '!!text-loader!codemirror/lib/codemirror.css'
 import FullScreenStyle from '!!text-loader!codemirror/addon/display/fullscreen.css'
+import CodeMirrorStyle from '!!text-loader!codemirror/lib/codemirror.css'
 import NightThemeStyle from '!!text-loader!codemirror/theme/night.css'
-
 import CodeMirror from 'codemirror'
-import 'codemirror/mode/javascript/javascript'
-import 'codemirror/addon/display/fullscreen'
-import 'codemirror/addon/display/autorefresh'
+import { css, html, LitElement, unsafeCSS } from 'lit'
+
+import { i18next } from '@things-factory/i18n-base'
 
 /**
   WEB Component for code-mirror json editor.

package/client/grist/json-grist-editor.js

@@ -1,9 +1,9 @@
-import { LitElement, html, css } from 'lit-element'
-
 import '@material/mwc-icon'
+import './json-editor'
+
+import { css, html, LitElement } from 'lit'
 
 import { openPopup } from '@things-factory/layout-base'
-import './json-editor'
 
 export class JsonGristEditor extends LitElement {
   static get properties() {

package/client/grist/parameters-editor-builder.js

@@ -4,7 +4,7 @@
 
 import '@things-factory/modeller-ui'
 
-import { html, LitElement } from 'lit-element'
+import { html, LitElement } from 'lit'
 import { connect } from 'pwa-helpers/connect-mixin'
 
 import { OxPropertyEditor } from '@operato/property-editor'

package/client/grist/parameters-editor-popup.js

@@ -1,6 +1,7 @@
+import { css, html, LitElement } from 'lit'
+
 import { i18next } from '@things-factory/i18n-base'
 import { ScrollbarStyles } from '@things-factory/styles'
-import { css, html, LitElement } from 'lit-element'
 
 export class ParametersEditorPopup extends LitElement {
   static get properties() {

package/client/grist/parameters-editor.js

@@ -2,12 +2,14 @@
  * @license Copyright © HatioLab Inc. All rights reserved.
  */
 
-import { css, html, LitElement } from 'lit-element'
-import { i18next } from '@things-factory/i18n-base'
-import { openPopup } from '@things-factory/layout-base'
 import './parameters-editor-builder'
 import './parameters-editor-popup'
 
+import { css, html, LitElement } from 'lit'
+
+import { i18next } from '@things-factory/i18n-base'
+import { openPopup } from '@things-factory/layout-base'
+
 export class ParametersEditor extends LitElement {
   static get properties() {
     return {

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

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

package/client/pages/connection.js

@@ -1,7 +1,7 @@
 import '@operato/data-grist'
 
 import gql from 'graphql-tag'
-import { css, html } from 'lit-element'
+import { css, html } from 'lit'
 import { connect } from 'pwa-helpers/connect-mixin'
 
 import { HelpDecoratedRenderer } from '@operato/help/help-decorated-renderer.js'
@@ -75,16 +75,12 @@ export class Connection extends connect(store)(localize(i18next)(PageView)) {
         .fetchHandler=${this.fetchHandler.bind(this)}
       >
         <div slot="headroom" id="filters">
-          <ox-filters-form @change=${e => this.grist.fetch()}></ox-filters-form>
+          <ox-filters-form></ox-filters-form>
         </div>
       </ox-grist>
     `
   }
 
-  get filtersForm() {
-    return this.renderRoot.querySelector('ox-filters-form')
-  }
-
   get grist() {
     return this.renderRoot.querySelector('ox-grist')
   }
@@ -254,7 +250,7 @@ export class Connection extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  async fetchHandler({ page, limit, sorters = [] }) {
+  async fetchHandler({ page, limit, sortings = [], filters = [] }) {
     const response = await client.query({
       query: gql`
         query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
@@ -285,9 +281,9 @@ export class Connection extends connect(store)(localize(i18next)(PageView)) {
         }
       `,
       variables: {
-        filters: await this.filtersForm.getQueryFilters(),
+        filters,
         pagination: { page, limit },
-        sortings: sorters
+        sortings
       }
     })
 

package/client/pages/integration-monitor.js

@@ -1,14 +1,15 @@
-import { i18next, localize } from '@things-factory/i18n-base'
-import { client, PageView, subscribe } from '@things-factory/shell'
-import { ScrollbarStyles, CommonButtonStyles } from '@things-factory/styles'
-import gql from 'graphql-tag'
-import { css, html } from 'lit-element'
-
 import '../viewparts/monitoring-summary'
 import '../viewparts/pending-q-monitor'
 import '../viewparts/scenarios-monitor'
 import '../viewparts/connections-monitor'
 
+import gql from 'graphql-tag'
+import { css, html } from 'lit'
+
+import { i18next, localize } from '@things-factory/i18n-base'
+import { client, PageView, subscribe } from '@things-factory/shell'
+import { ScrollbarStyles } from '@things-factory/styles'
+
 function IS_SCENARIO_RUNNING(state) {
   return state && state !== 'UNLOADED'
 }

package/client/pages/scenario-detail.js

@@ -1,5 +1,5 @@
 import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit-element'
+import { css, html, LitElement } from 'lit'
 
 import { client } from '@operato/graphql'
 import { HelpDecoratedRenderer } from '@operato/help/help-decorated-renderer.js'

package/client/pages/scenario-importer.js

@@ -1,10 +1,10 @@
 import '@operato/data-grist'
 
-import { LitElement, css, html } from 'lit-element'
-
-import { client } from '@things-factory/shell'
 import gql from 'graphql-tag'
+import { css, html, LitElement } from 'lit'
+
 import { i18next } from '@things-factory/i18n-base'
+import { client } from '@things-factory/shell'
 import { isMobileDevice } from '@things-factory/utils'
 
 export class ScenarioImporter extends LitElement {

package/client/pages/scenario.js

@@ -3,7 +3,7 @@ import './scenario-detail'
 import './scenario-importer'
 
 import gql from 'graphql-tag'
-import { css, html } from 'lit-element'
+import { css, html } from 'lit'
 import moment from 'moment-timezone'
 import { connect } from 'pwa-helpers/connect-mixin'
 
@@ -101,16 +101,12 @@ export class Scenario extends connect(store)(localize(i18next)(PageView)) {
         .fetchHandler=${this.fetchHandler.bind(this)}
       >
         <div slot="headroom" id="filters">
-          <ox-filters-form @change=${e => this.grist.fetch()}></ox-filters-form>
+          <ox-filters-form></ox-filters-form>
         </div>
       </ox-grist>
     `
   }
 
-  get filtersForm() {
-    return this.renderRoot.querySelector('ox-filters-form')
-  }
-
   get grist() {
     return this.renderRoot.querySelector('ox-grist')
   }
@@ -314,7 +310,7 @@ export class Scenario extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  async fetchHandler({ page, limit, sorters = [] }) {
+  async fetchHandler({ page, limit, sortings = [], filters = [] }) {
     const response = await client.query({
       query: gql`
         query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
@@ -349,9 +345,9 @@ export class Scenario extends connect(store)(localize(i18next)(PageView)) {
         }
       `,
       variables: {
-        filters: await this.filtersForm.getQueryFilters(),
+        filters,
         pagination: { page, limit },
-        sortings: sorters
+        sortings
       }
     })
 

package/client/viewparts/connections-monitor.js

@@ -1,10 +1,11 @@
-import { LitElement, html, css } from 'lit-element'
+import '@material/mwc-icon-button'
+
 import gql from 'graphql-tag'
+import { css, html, LitElement } from 'lit'
+
 import { client } from '@things-factory/shell'
 import { ScrollbarStyles } from '@things-factory/styles'
 
-import '@material/mwc-icon-button'
-
 export class ConnectionsMonitor extends LitElement {
   static get styles() {
     return [
@@ -43,10 +44,10 @@ export class ConnectionsMonitor extends LitElement {
           border-bottom: var(--border-dark-color);
           color: var(--secondary-color);
         }
-        [card] *{
-          overflow:hidden;
-          text-overflow:ellipsis;
-          white-space:nowrap;
+        [card] * {
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
         }
         [card] strong {
           color: var(--primary-color);
@@ -65,23 +66,23 @@ export class ConnectionsMonitor extends LitElement {
           background-color: var(--status-success-color);
           margin-left: var(--margin-narrow);
         }
-        [buttons]{
+        [buttons] {
           --mdc-icon-button-size: 20px;
           --mdc-icon-size: 20px;
-          border-top:1px dashed rgba(0,0,0,.1);
-          margin:var(--margin-narrow) 0 0 0;
-          padding:var(--padding-narrow) 0 0 0;
-          text-align:right;
+          border-top: 1px dashed rgba(0, 0, 0, 0.1);
+          margin: var(--margin-narrow) 0 0 0;
+          padding: var(--padding-narrow) 0 0 0;
+          text-align: right;
         }
-        [buttons] mwc-icon-button{
-          color:rgba(var(--secondary-color-rgb),.8);
+        [buttons] mwc-icon-button {
+          color: rgba(var(--secondary-color-rgb), 0.8);
         }
         @media screen and (max-width: 480px) {
           h2 {
             padding: var(--padding-narrow);
           }
-          [card] span{
-            display:none
+          [card] span {
+            display: none;
           }
         }
       `
@@ -129,7 +130,7 @@ export class ConnectionsMonitor extends LitElement {
   async connect(connection) {
     var response = await client.mutate({
       mutation: gql`
-        mutation($name: String!) {
+        mutation ($name: String!) {
           connectConnection(name: $name) {
             state
           }
@@ -157,7 +158,7 @@ export class ConnectionsMonitor extends LitElement {
   async disconnect(connection) {
     var response = await client.mutate({
       mutation: gql`
-        mutation($name: String!) {
+        mutation ($name: String!) {
           disconnectConnection(name: $name) {
             state
           }

package/client/viewparts/monitoring-summary.js

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

package/client/viewparts/scenario-instance-log-view.js

@@ -1,8 +1,9 @@
-import { LitElement, html, css } from 'lit-element'
-import { connect } from 'pwa-helpers/connect-mixin'
 import gql from 'graphql-tag'
-import { ScrollbarStyles } from '@things-factory/styles'
+import { css, html, LitElement } from 'lit'
+import { connect } from 'pwa-helpers/connect-mixin'
+
 import { store, subscribe } from '@things-factory/shell'
+import { ScrollbarStyles } from '@things-factory/styles'
 
 export class ScenarioInstanceLogView extends connect(store)(LitElement) {
   static get styles() {
@@ -71,7 +72,7 @@ export class ScenarioInstanceLogView extends connect(store)(LitElement) {
     this.subscription = await subscribe(
       {
         query: gql`
-          subscription($instanceName: String, $scenarioName: String, $level: String) {
+          subscription ($instanceName: String, $scenarioName: String, $level: String) {
             log: scenarioInstanceLog(instanceName: $instanceName, scenarioName: $scenarioName, level: $level) {
               level
               message

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

@@ -1,15 +1,14 @@
 import '@operato/data-grist'
 import '@material/mwc-icon'
 import './scenario-instance-view'
-import './scenario-instance-view'
 
-import { LitElement, css, html } from 'lit-element'
+import gql from 'graphql-tag'
+import { css, html, LitElement } from 'lit'
+
 import { i18next, localize } from '@things-factory/i18n-base'
 import { notify, openPopup } from '@things-factory/layout-base'
-
-import { ScrollbarStyles } from '@things-factory/styles'
 import { client } from '@things-factory/shell'
-import gql from 'graphql-tag'
+import { ScrollbarStyles } from '@things-factory/styles'
 
 function IS_SCENARIO_RUNNING(state) {
   return state && state !== 'UNLOADED'
@@ -128,7 +127,7 @@ export class ScenarioInstanceMonitor extends localize(i18next)(LitElement) {
   async startScenario(instance) {
     var response = await client.mutate({
       mutation: gql`
-        mutation($scenarioName: String!, $instanceName: String) {
+        mutation ($scenarioName: String!, $instanceName: String) {
           startScenario(scenarioName: $scenarioName, instanceName: $instanceName) {
             state
           }
@@ -151,7 +150,7 @@ export class ScenarioInstanceMonitor extends localize(i18next)(LitElement) {
   async stopScenario(instance) {
     var response = await client.mutate({
       mutation: gql`
-        mutation($instanceName: String!) {
+        mutation ($instanceName: String!) {
           stopScenario(instanceName: $instanceName) {
             state
           }

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

@@ -1,10 +1,11 @@
-import { LitElement, html, css } from 'lit-element'
-import { connect } from 'pwa-helpers/connect-mixin'
+import './scenario-instance-log-view'
+
 import gql from 'graphql-tag'
-import { ScrollbarStyles } from '@things-factory/styles'
-import { store, subscribe } from '@things-factory/shell'
+import { css, html, LitElement } from 'lit'
+import { connect } from 'pwa-helpers/connect-mixin'
 
-import './scenario-instance-log-view'
+import { store, subscribe } from '@things-factory/shell'
+import { ScrollbarStyles } from '@things-factory/styles'
 
 export class ScenarioInstanceView extends connect(store)(LitElement) {
   static get styles() {
@@ -224,7 +225,7 @@ export class ScenarioInstanceView extends connect(store)(LitElement) {
     this.subscription = await subscribe(
       {
         query: gql`
-          subscription($instanceName: String, $scenarioName: String) {
+          subscription ($instanceName: String, $scenarioName: String) {
             scenarioInstanceState(instanceName: $instanceName, scenarioName: $scenarioName) {
               instanceName
               scenarioName

package/client/viewparts/scenario-monitor.js

@@ -2,13 +2,13 @@ import '@operato/data-grist'
 import '@material/mwc-icon-button'
 import './scenario-instance-monitor'
 
-import { LitElement, css, html } from 'lit-element'
+import gql from 'graphql-tag'
+import { css, html, LitElement } from 'lit'
+
 import { i18next, localize } from '@things-factory/i18n-base'
 import { notify, openPopup } from '@things-factory/layout-base'
-
-import { ScrollbarStyles } from '@things-factory/styles'
 import { client } from '@things-factory/shell'
-import gql from 'graphql-tag'
+import { ScrollbarStyles } from '@things-factory/styles'
 
 function IS_SCENARIO_RUNNING(state) {
   return state && state !== 'UNLOADED'
@@ -259,7 +259,7 @@ export class ScenarioMonitor extends localize(i18next)(LitElement) {
   async startScenario(scenario) {
     var response = await client.mutate({
       mutation: gql`
-        mutation($scenarioName: String!) {
+        mutation ($scenarioName: String!) {
           startScenario(scenarioName: $scenarioName) {
             state
           }
@@ -281,7 +281,7 @@ export class ScenarioMonitor extends localize(i18next)(LitElement) {
   async stopScenario(scenario) {
     var response = await client.mutate({
       mutation: gql`
-        mutation($instanceName: String!) {
+        mutation ($instanceName: String!) {
           stopScenario(instanceName: $instanceName) {
             state
           }

package/client/viewparts/scenarios-monitor.js

@@ -2,9 +2,9 @@ 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 { css, html, LitElement } from 'lit'
 
+import { i18next, localize } from '@things-factory/i18n-base'
 import { ScrollbarStyles } from '@things-factory/styles'
 
 function IS_SCENARIO_RUNNING(state) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-ui",
-  "version": "4.0.42",
+  "version": "4.1.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/data-grist": "^0.3.24",
-    "@operato/graphql": "^0.3.24",
-    "@operato/help": "^0.3.24",
-    "@operato/i18n": "^0.3.24",
-    "@operato/layout": "^0.3.24",
-    "@operato/property-editor": "^0.3.24",
-    "@operato/styles": "^0.3.24",
-    "@operato/utils": "^0.3.24",
-    "@things-factory/export-base": "^4.0.42",
-    "@things-factory/import-base": "^4.0.42",
-    "@things-factory/integration-base": "^4.0.42",
-    "@things-factory/modeller-ui": "^4.0.42",
+    "@operato/data-grist": "^0.3.28",
+    "@operato/graphql": "^0.3.28",
+    "@operato/help": "^0.3.28",
+    "@operato/i18n": "^0.3.28",
+    "@operato/layout": "^0.3.28",
+    "@operato/property-editor": "^0.3.28",
+    "@operato/styles": "^0.3.28",
+    "@operato/utils": "^0.3.28",
+    "@things-factory/export-base": "^4.1.1",
+    "@things-factory/import-base": "^4.1.1",
+    "@things-factory/integration-base": "^4.1.1",
+    "@things-factory/modeller-ui": "^4.1.1",
     "moment-timezone": "^0.5.27",
     "subscriptions-transport-ws": "^0.11.0"
   },
-  "gitHead": "794709ebadf4ae0f89a107a86a41a381ce26b465"
+  "gitHead": "09378a57e788038c086c6c40e6135cf14082b185"
 }