@things-factory/integration-ui 9.2.5 → 10.0.0-beta.10

package/client/pages/state-register.ts

@@ -2,10 +2,9 @@ import '@operato/data-grist'
 
 import { css, html } from 'lit'
 import { customElement, property, query } from 'lit/decorators.js'
-import { connect } from 'pwa-helpers/connect-mixin.js'
 import gql from 'graphql-tag'
 
-import { PageView, store } from '@operato/shell'
+import { PageView } from '@operato/shell'
 import { CommonHeaderStyles, CommonGristStyles, CommonButtonStyles, ScrollbarStyles } from '@operato/styles'
 import { ColumnConfig, DataGrist, FetchOption, SortersControl } from '@operato/data-grist'
 import { client } from '@operato/graphql'
@@ -16,25 +15,22 @@ import { isMobileDevice } from '@operato/utils'
 import { p13n } from '@operato/p13n'
 
 @customElement('state-register-page')
-export class StateRegisterListPage extends connect(store)(p13n(localize(i18next)(PageView))) {
-  static styles = [
+export class StateRegisterListPage extends p13n(localize(i18next)(PageView)) {   static styles = [
     ScrollbarStyles,
     CommonGristStyles,
     CommonHeaderStyles,
     css`
-      :host {
-        display: flex;
+      :host {         display: flex;
 
         width: 100%;
 
         --grid-record-emphasized-background-color: #8b0000;
         --grid-record-emphasized-color: #ff6b6b;
-      }
+ }
 
-      ox-grist {
-        overflow-y: auto;
+      ox-grist {         overflow-y: auto;
         flex: 1;
-      }
+ }
     `
   ]
 
@@ -43,33 +39,26 @@ export class StateRegisterListPage extends connect(store)(p13n(localize(i18next)
 
   @query('ox-grist') private grist!: DataGrist
 
-  get context() {
-    return {
-      title: i18next.t('title.state-register'),
-      search: {
-        handler: (search: string) => {
-          this.grist.searchText = search
-        },
+  get context() {     return {       title: i18next.t('title.state-register'),
+      search: {         handler: (search: string) => {           this.grist.searchText = search
+ },
         value: this.grist.searchText
-      },
+ },
       help: 'integration/ui/state-register',
       actions: [
-        {
-          title: i18next.t('button.save'),
+        {           title: i18next.t('button.save'),
           action: this._updateStateRegister.bind(this),
           ...CommonButtonStyles.save
-        },
-        {
-          title: i18next.t('button.delete'),
+ },
+        {           title: i18next.t('button.delete'),
           action: this._deleteStateRegister.bind(this),
           ...CommonButtonStyles.delete
-        }
+ }
       ]
-    }
-  }
+ }
+ }
 
-  render() {
-    const mode = this.mode || (isMobileDevice() ? 'CARD' : 'GRID')
+  render() {     const mode = this.mode || (isMobileDevice() ? 'CARD' : 'GRID')
 
     return html`
       <ox-grist
@@ -81,140 +70,108 @@ export class StateRegisterListPage extends connect(store)(p13n(localize(i18next)
         <ox-grist-personalizer slot="setting"></ox-grist-personalizer>
       </ox-grist>
     `
-  }
+ }
 
-  async pageInitialized(lifecycle: any) {
-    this.gristConfig = {
-      list: {
-        fields: ['name', 'description'],
+  async pageInitialized(lifecycle: any) {     this.gristConfig = {       list: {         fields: ['name', 'description'],
         details: ['type', 'state', 'wroteAt']
-      },
+ },
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
         { type: 'gutter', gutterName: 'row-selector', multiple: true },
-        {
-          type: 'string',
+        {           type: 'string',
           name: 'name',
           header: i18next.t('field.name'),
-          record: {
-            editable: true
-          },
+          record: {             editable: true
+ },
           filter: 'search',
           sortable: true,
           width: 150,
           description: i18next.t('field.name-publish-tag-desc') // name이 publish tag 역할을 한다는 설명
-        },
-        {
-          type: 'string',
+ },
+        {           type: 'string',
           name: 'description',
           header: i18next.t('field.description'),
-          record: {
-            editable: true
-          },
+          record: {             editable: true
+ },
           filter: 'search',
           width: 200
-        },
-        {
-          type: 'string',
+ },
+        {           type: 'string',
           name: 'group',
           header: i18next.t('field.group'),
-          record: {
-            editable: true
-          },
+          record: {             editable: true
+ },
           filter: 'search',
           sortable: true,
           width: 150
-        },
-        {
-          type: 'boolean',
+ },
+        {           type: 'boolean',
           name: 'autoPublish',
           header: i18next.t('field.auto-publish'),
-          record: {
-            editable: true
-          },
+          record: {             editable: true
+ },
           width: 120
-        },
-        {
-          type: 'select',
+ },
+        {           type: 'select',
           name: 'type',
           header: i18next.t('field.type'),
-          record: {
-            editable: true,
+          record: {             editable: true,
             options: [
               {},
-              {
-                display: 'text',
+              {                 display: 'text',
                 value: 'text'
-              },
-              {
-                display: 'number',
+ },
+              {                 display: 'number',
                 value: 'number'
-              },
-              {
-                display: 'object',
+ },
+              {                 display: 'object',
                 value: 'object'
-              }
+ }
             ]
-          },
+ },
           filter: 'search',
           sortable: true,
           width: 150
-        },
-        {
-          type: 'number',
+ },
+        {           type: 'number',
           name: 'ttl',
           header: i18next.t('field.ttl-seconds'),
-          record: {
-            editable: true
-          },
+          record: {             editable: true
+ },
           width: 100
-        },
-        {
-          type: 'data',
+ },
+        {           type: 'data',
           name: 'state',
           header: i18next.t('field.state-value'),
-          record: {
-            editable: true // 사용자가 state를 편집할 수 있도록 변경
-          },
+          record: {             editable: true // 사용자가 state를 편집할 수 있도록 변경
+ },
           width: 200
-        },
-        {
-          type: 'datetime',
+ },
+        {           type: 'datetime',
           name: 'wroteAt',
           header: i18next.t('field.wrote-at'),
-          record: {
-            editable: false
-          },
+          record: {             editable: false
+ },
           sortable: true,
           width: 180
-        }
+ }
       ],
-      rows: {
-        selectable: {
-          multiple: true
-        }
-      },
+      rows: {         selectable: {           multiple: true
+ }
+ },
       sorters: [
-        {
-          name: 'name'
-        }
+        {           name: 'name'
+ }
       ]
-    }
-  }
+ }
+ }
 
-  async pageUpdated(changes: any, lifecycle: any) {
-    if (this.active) {
-      // do something here when this page just became as active
-    }
-  }
+  async pageUpdated(changes: any, lifecycle: any) {     if (this.active) {       // do something here when this page just became as active
+ }
+ }
 
-  async fetchHandler({ page = 1, limit = 100, sortings = [], filters = [] }: FetchOption) {
-    const response = await client.query({
-      query: gql`
-        query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
-          responses: stateRegisters(filters: $filters, pagination: $pagination, sortings: $sortings) {
-            items {
-              id
+  async fetchHandler({ page = 1, limit = 100, sortings = [], filters = [] }: FetchOption) {     const response = await client.query({       query: gql`
+        query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {           responses: stateRegisters(filters: $filters, pagination: $pagination, sortings: $sortings) {             items {               id
               name
               description
               group
@@ -224,91 +181,70 @@ export class StateRegisterListPage extends connect(store)(p13n(localize(i18next)
               ttl
               state
               autoPublish
-              writer {
-                id
+              writer {                 id
                 name
-              }
+ }
               wroteAt
-            }
+ }
             total
-          }
-        }
+ }
+ }
       `,
-      variables: {
-        filters,
+      variables: {         filters,
         pagination: { page, limit },
         sortings
-      }
-    })
+ }
+ })
 
-    return {
-      total: response.data.responses.total || 0,
+    return {       total: response.data.responses.total || 0,
       records: response.data.responses.items || []
-    }
-  }
+ }
+ }
 
-  async _deleteStateRegister() {
-    if (
-      await OxPrompt.open({
-        title: i18next.t('text.are_you_sure'),
+  async _deleteStateRegister() {     if (
+      await OxPrompt.open({         title: i18next.t('text.are_you_sure'),
         text: i18next.t('text.sure_to_x', { x: i18next.t('text.delete') }),
         confirmButton: { text: i18next.t('button.confirm') },
         cancelButton: { text: i18next.t('button.cancel') }
-      })
-    ) {
-      const ids = this.grist.selected.map(record => record.id)
-      if (ids && ids.length > 0) {
-        const response = await client.mutate({
-          mutation: gql`
-            mutation ($ids: [String!]!) {
-              deleteStateRegisters(ids: $ids)
-            }
+ })
+    ) {       const ids = this.grist.selected.map(record => record.id)
+      if (ids && ids.length > 0) {         const response = await client.mutate({           mutation: gql`
+            mutation ($ids: [String!]!) {               deleteStateRegisters(ids: $ids)
+ }
           `,
-          variables: {
-            ids
-          }
-        })
-
-        if (!response.errors) {
-          this.grist.fetch()
-          notify({
-            message: i18next.t('text.info_x_successfully', { x: i18next.t('text.delete') })
-          })
-        }
-      }
-    }
-  }
-
-  async _updateStateRegister() {
-    let patches = this.grist.dirtyRecords
-    if (patches && patches.length) {
-      patches = patches.map(patch => {
-        let patchField: any = patch.id ? { id: patch.id } : {}
+          variables: {             ids
+ }
+ })
+
+        if (!response.errors) {           this.grist.fetch()
+          notify({             message: i18next.t('text.info_x_successfully', { x: i18next.t('text.delete') })
+ })
+ }
+ }
+ }
+ }
+
+  async _updateStateRegister() {     let patches = this.grist.dirtyRecords
+    if (patches && patches.length) {       patches = patches.map(patch => {         let patchField: any = patch.id ? { id: patch.id } : {}
         const dirtyFields = patch.__dirtyfields__
-        for (let key in dirtyFields) {
-          patchField[key] = dirtyFields[key].after
-        }
+        for (let key in dirtyFields) {           patchField[key] = dirtyFields[key].after
+ }
         patchField.cuFlag = patch.__dirty__
 
         return patchField
-      })
+ })
 
-      const response = await client.mutate({
-        mutation: gql`
-          mutation ($patches: [StateRegisterPatch!]!) {
-            updateMultipleStateRegister(patches: $patches) {
-              name
-            }
-          }
+      const response = await client.mutate({         mutation: gql`
+          mutation ($patches: [StateRegisterPatch!]!) {             updateMultipleStateRegister(patches: $patches) {               name
+ }
+ }
         `,
-        variables: {
-          patches
-        }
-      })
-
-      if (!response.errors) {
-        this.grist.fetch()
-      }
-    }
-  }
+        variables: {           patches
+ }
+ })
+
+      if (!response.errors) {         this.grist.fetch()
+ }
+ }
+ }
 }

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

@@ -5,14 +5,11 @@ import gql from 'graphql-tag'
 
 import { css, html, LitElement, nothing } from 'lit'
 import { customElement, property, query } from 'lit/decorators.js'
-import { connect } from 'pwa-helpers/connect-mixin.js'
-
 import { subscribe } from '@operato/graphql'
-import { store } from '@operato/shell'
 import { ScrollbarStyles } from '@operato/styles'
 
 @customElement('scenario-instance-log-view')
-export class ScenarioInstanceLogView extends connect(store)(LitElement) {
+export class ScenarioInstanceLogView extends LitElement {
   static styles = [
     ScrollbarStyles,
     css`

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

@@ -3,14 +3,13 @@ import './scenario-instance-log-view.js'
 import gql from 'graphql-tag'
 import { css, html, LitElement } from 'lit'
 import { customElement, property, query } from 'lit/decorators.js'
-import { connect } from 'pwa-helpers/connect-mixin.js'
 
 import { subscribe } from '@operato/graphql'
-import { store } from '@operato/shell'
+import { AppController } from '@operato/shell'
 import { ScrollbarStyles } from '@operato/styles'
 
 @customElement('scenario-instance-view')
-export class ScenarioInstanceView extends connect(store)(LitElement) {
+export class ScenarioInstanceView extends LitElement {
   static styles = [
     ScrollbarStyles,
     css`
@@ -124,7 +123,8 @@ export class ScenarioInstanceView extends connect(store)(LitElement) {
   @property({ type: String }) tab?: string
   @property({ type: String }) step?: string
   @property({ type: String }) key?: string
-  @property({ type: String }) contextPath?: string
+
+  private _appCtrl = new AppController(this)
 
   subscription: any
 
@@ -132,7 +132,7 @@ export class ScenarioInstanceView extends connect(store)(LitElement) {
     const tab = this.tab || 'info'
     const { scenarioName, instanceName, description, state, progress, variables, data, message } = this.instance || {}
     const { rate = 0, steps = 0, step = 0, rounds = 0 } = progress || {}
-    const diagram = `${this.contextPath || ''}/scenario-view/${this.scenarioName}`
+    const diagram = `${this._appCtrl.contextPath || ''}/scenario-view/${this.scenarioName}`
 
     return html`
       <div content>
@@ -178,10 +178,6 @@ export class ScenarioInstanceView extends connect(store)(LitElement) {
     this.stopSubscribe()
   }
 
-  stateChanged(state) {
-    this.contextPath = state.app.contextPath
-  }
-
   renderDataObject(data) {
     const keys = Object.keys(data || {})
 

package/dist-client/pages/connection.d.ts

@@ -4,12 +4,6 @@ import { DataGrist } from '@operato/data-grist/ox-grist.js';
 import { PageView } from '@operato/shell';
 import { FetchOption } from '@operato/data-grist';
 declare const Connection_base: (new (...args: any[]) => {
-    _storeUnsubscribe: import("redux").Unsubscribe;
-    connectedCallback(): void;
-    disconnectedCallback(): void;
-    stateChanged(_state: unknown): void;
-    readonly isConnected: boolean;
-}) & (new (...args: any[]) => {
     __preferenceProviders: {
         [element: string]: import("@operato/p13n").PagePreferenceProvider;
     };