@things-factory/reference-app 4.0.38 → 4.0.42

package/client/editors/id-selector.js

@@ -1,6 +1,6 @@
 import '@operato/data-grist'
 
-import { LitElement, css, html } from 'lit-element'
+import { css, html, LitElement } from 'lit-element'
 
 import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import { i18next } from '@things-factory/i18n-base'
@@ -37,18 +37,19 @@ export class IdSelector extends LitElement {
           flex: 1;
         }
 
-        .button-container {
+        #filters {
           display: flex;
-          margin-left: auto;
+          flex-direction: row;
+          justify-content: space-between;
         }
 
-        form {
-          position: relative;
+        #filters > * {
+          padding: var(--padding-default) var(--padding-wide);
         }
 
-        [search] {
-          position: absolute;
-          right: 0;
+        .button-container {
+          display: flex;
+          margin-left: auto;
         }
       `
     ]
@@ -62,38 +63,16 @@ export class IdSelector extends LitElement {
 
   render() {
     return html`
-      <form
-        class="multi-column-form"
-        id="search-form"
-        @keypress=${async e => {
-          if (e.keyCode === 13) {
-            this.data = await this.getData()
-          }
-        }}
-      >
-        <fieldset>
-          <label>${i18next.t('field.name')}</label>
-          <input name="name" />
-
-          <label>${i18next.t('field.description')}</label>
-          <input name="description" />
-        </fieldset>
-
-        <mwc-icon
-          search
-          @click="${async () => {
-            this.data = await this.getData()
-          }}}"
-          >search</mwc-icon
-        >
-      </form>
-
       <ox-grist
         .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
         .config=${this.config}
         .fetchHandler=${this.fetchHandler.bind(this)}
         .selectedRecords=${this.selectedRecords}
-      ></ox-grist>
+      >
+        <div id="filters" slot="headless">
+          <ox-filters-form @change=${e => this.grist.fetch()}></ox-filters-form>
+        </div>
+      </ox-grist>
 
       <div class="button-container">
         <mwc-button @click=${this.oncancel.bind(this)}>${i18next.t('button.cancel')}</mwc-button>
@@ -136,6 +115,7 @@ export class IdSelector extends LitElement {
           record: {
             align: 'left'
           },
+          filter: 'search',
           sortable: true,
           width: 160
         },
@@ -146,6 +126,7 @@ export class IdSelector extends LitElement {
           record: {
             align: 'left'
           },
+          filter: 'search',
           sortable: true,
           width: 300
         }
@@ -168,22 +149,30 @@ export class IdSelector extends LitElement {
     /* TODO config가 설정될 때, fetch() 가 동작하므로, fetch 완료 이벤트를 받아서, selected를 설정해주는 것이 좋겠다. 
        현재는 fetch() 가 두번 일어난다.
        */
-    var grist = this.shadowRoot.querySelector('ox-grist')
-    await grist.fetch()
+    await this.grist.fetch()
 
-    var selected = grist.data.records.find(item => this.value == item.id)
+    var selected = this.grist.data.records.find(item => this.value == item.id)
     if (selected) {
       this.selectedRecords = [selected]
     }
     /* TODO config가 설정될 때, fetch() 가 동작하므로, fetch 완료 이벤트를 받아서, selected를 설정해주는 것이 좋겠다. */
 
     await this.updateComplete
-    grist.focus()
+    this.grist.focus()
+  }
+
+  get grist() {
+    return this.renderRoot.querySelector('ox-grist')
+  }
+
+  get filtersForm() {
+    return this.renderRoot.querySelector('ox-filters-form')
   }
 
   async fetchHandler({ page, limit, sorters = [] }) {
     var total = 3401
     var start = (page - 1) * limit
+    // const filter = await this.filtersForm.getQueryFilters()
 
     return {
       total,
@@ -210,7 +199,7 @@ export class IdSelector extends LitElement {
   }
 
   serializeFormData() {
-    const searchInputs = Array.from(this.shadowRoot.querySelectorAll('#search-form > input'))
+    const searchInputs = Array.from(this.renderRoot.querySelectorAll('#search-form > input'))
     return searchInputs
       .filter(input => input.value)
       .map(input => {
@@ -219,7 +208,7 @@ export class IdSelector extends LitElement {
   }
 
   get selected() {
-    var grist = this.shadowRoot.querySelector('ox-grist')
+    var grist = this.renderRoot.querySelector('ox-grist')
 
     var selected = grist.selected
 

package/client/pages/grist-colorizing.js

@@ -1,9 +1,10 @@
 import { css, html } from 'lit-element'
+
 import { getEditor, getRenderer } from '@operato/data-grist'
 import { i18next, localize } from '@things-factory/i18n-base'
-
 import { PageView } from '@things-factory/shell'
 import { isMobileDevice } from '@things-factory/utils'
+
 import { referencePageStyles } from './reference-page-styles'
 
 class GristColorizing extends localize(i18next)(PageView) {
@@ -48,7 +49,7 @@ class GristColorizing extends localize(i18next)(PageView) {
   }
 
   get grist() {
-    return this.shadowRoot.querySelector('ox-grist')
+    return this.renderRoot.querySelector('ox-grist')
   }
 
   render() {

package/client/pages/grist-page.js

@@ -1,7 +1,7 @@
 import { css, html } from 'lit-element'
+
 import { getEditor, getRenderer } from '@operato/data-grist'
 import { i18next, localize } from '@things-factory/i18n-base'
-
 import { PageView } from '@things-factory/shell'
 import { isMobileDevice } from '@things-factory/utils'
 
@@ -39,7 +39,7 @@ class GristPage extends localize(i18next)(PageView) {
   }
 
   get grist() {
-    return this.shadowRoot.querySelector('ox-grist')
+    return this.renderRoot.querySelector('ox-grist')
   }
 
   render() {

package/client/pages/menu-page.js

@@ -1,13 +1,14 @@
 import '@things-factory/auth-ui' /* for domain-switch */
 import '@material/mwc-checkbox'
 import '@material/mwc-formfield'
+import '@operato/help/ox-help-icon.js'
 
 import { css, html } from 'lit-element'
 import { connect } from 'pwa-helpers/connect-mixin.js'
 
-import { VIEWPART_POSITION } from '@things-factory/layout-base'
+import { VIEWPART_POSITION } from '@operato/layout'
+import { PageView, store } from '@operato/shell'
 import { setupMenuPart } from '@things-factory/lite-menu'
-import { PageView, store } from '@things-factory/shell'
 
 import { referencePageStyles } from './reference-page-styles'
 
@@ -35,9 +36,9 @@ class MenuPage extends connect(store)(PageView) {
   render() {
     return html`
       <p>
-        Things Factory 프레임워크에서는 간편하게 메뉴를 구성할 수 있도록 Lite Menu<help-icon
+        Things Factory 프레임워크에서는 간편하게 메뉴를 구성할 수 있도록 Lite Menu<ox-help-icon
           topic="module/lite-menu"
-        ></help-icon>
+        ></ox-help-icon>
         모듈을 제공한다.
       </p>
       <section @change=${e => this.setupMenu(e)}>

package/client/pages/notification-page.js

@@ -1,11 +1,13 @@
 import '@things-factory/notification'
+import '@operato/help/ox-help-icon.js'
 
-import { APPEND_APP_TOOL, REMOVE_APP_TOOL } from '@things-factory/apptool-base'
-import { PageView, store } from '@things-factory/shell'
-import { TOOL_POSITION, toggleOverlay } from '@things-factory/layout-base'
 import { css, html } from 'lit-element'
-
 import { connect } from 'pwa-helpers/connect-mixin.js'
+
+import { toggleOverlay, TOOL_POSITION } from '@operato/layout'
+import { PageView, store } from '@operato/shell'
+import { APPEND_APP_TOOL, REMOVE_APP_TOOL } from '@things-factory/apptool-base'
+
 import { referencePageStyles } from './reference-page-styles'
 
 class NotificationPage extends connect(store)(PageView) {
@@ -45,9 +47,9 @@ class NotificationPage extends connect(store)(PageView) {
   render() {
     return html`
       <p>
-        Things Factory 프레임워크에서는 간편하게 메뉴를 구성할 수 있도록 Notification<help-icon
+        Things Factory 프레임워크에서는 간편하게 메뉴를 구성할 수 있도록 Notification<ox-help-icon
           topic="module/notification"
-        ></help-icon>
+        ></ox-help-icon>
         모듈을 제공한다.
       </p>
 

package/client/pages/pending-job-page.js

@@ -1,11 +1,12 @@
 import '@material/mwc-linear-progress'
-import '@things-factory/help'
+import '@operato/help/ox-help-icon.js'
 
 import { gql } from 'graphql-tag'
 import { css, html } from 'lit-element'
 import { connect } from 'pwa-helpers/connect-mixin.js'
 
-import { client, PageView, store } from '@things-factory/shell'
+import { client } from '@operato/graphql'
+import { PageView, store } from '@operato/shell'
 
 import { referencePageStyles } from './reference-page-styles'
 
@@ -48,7 +49,8 @@ class PendingJobPage extends connect(store)(PageView) {
     return html`
       <p>
         오래걸리는 서버작업을 수행할 때는 진행과정을 표현해주는 것이 사용자 경험에 도움을 준다. 이를 위해 Things Factory
-        프레임워크에서는 oops-progress<help-icon topic="components/oops-progress"></help-icon> 라는 컴포넌트를 제공한다.
+        프레임워크에서는 oops-progress<ox-help-icon topic="components/oops-progress"></ox-help-icon> 라는 컴포넌트를
+        제공한다.
       </p>
       <p>
         아래 'Start' 버튼을 클릭하면, 서버에 작업을 요청하고 그 진행율이 화면에 표현된다. 진행중에는 버튼은 'Stop'

package/config.development.js

@@ -0,0 +1,7 @@
+module.exports = {
+  subdomain: 'system',
+  awsAppSync: {
+    apiUrl: 'https://leqzefuvzfhvzloqchxtt37opu.appsync-api.ap-northeast-2.amazonaws.com/graphql',
+    apiKey: 'da2-lau46scnubb5pk3675e4shyky4'
+  }
+}

package/logs/.08636eb59927f12972f6774f5947c8507b3564c2-audit.json

@@ -6,9 +6,15 @@
     "auditLog": "logs/.08636eb59927f12972f6774f5947c8507b3564c2-audit.json",
     "files": [
         {
-            "date": 1640966865693,
-            "name": "logs/application-2022-01-01-00.log",
-            "hash": "396a92fa43d0229609373390de513cdd"
+            "date": 1643432714784,
+            "name": "logs/application-2022-01-29-14.log",
+            "hash": "b4b941155b95e9a9c3dd0ef700d0d8fe"
+        },
+        {
+            "date": 1643562406803,
+            "name": "logs/application-2022-01-31-02.log",
+            "hash": "2892825e3ac228e9e3cc8761ee20aabc"
         }
-    ]
+    ],
+    "hashType": "md5"
 }

package/logs/.33a2b6820ab05dbb0f8bea4849090e12685d0b36-audit.json

@@ -6,9 +6,14 @@
     "auditLog": "logs/.33a2b6820ab05dbb0f8bea4849090e12685d0b36-audit.json",
     "files": [
         {
-            "date": 1640966868409,
-            "name": "logs/connections-2022-01-01-00.log",
-            "hash": "30cd7f1157b4efdd264957756d0da1da"
+            "date": 1642401813135,
+            "name": "logs/connections-2022-01-17-14.log",
+            "hash": "54983a7bd04c80ef30efdcf1deaeebdf"
+        },
+        {
+            "date": 1642404086390,
+            "name": "logs/connections-2022-01-17-15.log",
+            "hash": "bf7d0da37a4cb017ff4a2dc12ff94639"
         }
     ]
 }

package/logs/.5e5d741d8b7784a2fbad65eedc0fd46946aaf6f2-audit.json

@@ -6,24 +6,15 @@
     "auditLog": "logs/.5e5d741d8b7784a2fbad65eedc0fd46946aaf6f2-audit.json",
     "files": [
         {
-            "date": 1635819464472,
-            "name": "logs/connections-2021-11-02-11.log",
-            "hash": "8bc1da3313a69261b4674f629d032e03"
+            "date": 1643432716894,
+            "name": "logs/connections-2022-01-29-14.log",
+            "hash": "ae807fd62a39d9b25673c588afa621c8"
         },
         {
-            "date": 1635906208371,
-            "name": "logs/connections-2021-11-03-11.log",
-            "hash": "a1311491c36196b33b2dd55f164b95f7"
-        },
-        {
-            "date": 1636005260004,
-            "name": "logs/connections-2021-11-04-14.log",
-            "hash": "6d9ee9a4066c730e14f77f0396879d64"
-        },
-        {
-            "date": 1636103949582,
-            "name": "logs/connections-2021-11-05-18.log",
-            "hash": "f7593c79bc2d00a3832d894f74b529f8"
+            "date": 1643562408398,
+            "name": "logs/connections-2022-01-31-02.log",
+            "hash": "051259316dbdbb2c6927efc6cd3862f9"
         }
-    ]
+    ],
+    "hashType": "md5"
 }

package/logs/application-2022-01-29-14.log

@@ -0,0 +1,5 @@
+2022-01-29T05:05:16.270Z info: File Storage is Ready.
+2022-01-29T05:05:19.935Z info: Database connection established
+2022-01-29T05:05:20.556Z info: 🚀 Server ready at http://0.0.0.0:3000/graphql
+2022-01-29T05:05:20.556Z info: 🚀 Subscriptions ready at ws://0.0.0.0:3000/subscriptions
+2022-01-29T05:17:30.280Z error: Cannot return null for non-nullable field Query.ocrRequest.

package/logs/application-2022-01-31-02.log

@@ -0,0 +1,4 @@
+2022-01-30T17:06:47.788Z info: File Storage is Ready.
+2022-01-30T17:06:50.263Z info: Database connection established
+2022-01-30T17:06:51.142Z info: 🚀 Server ready at http://0.0.0.0:3000/graphql
+2022-01-30T17:06:51.143Z info: 🚀 Subscriptions ready at ws://0.0.0.0:3000/subscriptions

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/reference-app",
-  "version": "4.0.38",
+  "version": "4.0.42",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -37,51 +37,56 @@
     "docker:run": "docker run -it -p 4000:3000 hatiolab/reference-app:latest"
   },
   "dependencies": {
-    "@hatiolab/things-scene": "^2.7.31",
+    "@hatiolab/things-scene": "^2.7.34",
     "@material/mwc-checkbox": "^0.25.3",
-    "@operato/data-grist": "^0.3.18",
-    "@operato/ghost-print": "^0.3.18",
-    "@operato/input": "^0.3.18",
-    "@operato/ocr": "^0.3.18",
-    "@operato/popup": "^0.3.18",
-    "@operato/pull-to-refresh": "^0.3.18",
-    "@operato/scene-chartjs": "^0.1.2",
-    "@operato/scene-clock": "^0.1.2",
-    "@operato/scene-gauge": "^0.1.2",
-    "@operato/scene-indoor-map": "^0.1.2",
-    "@operato/scene-progressbar": "^0.1.2",
-    "@operato/scene-random": "^0.1.2",
-    "@operato/scene-switch": "^0.1.2",
-    "@operato/scene-tab": "^0.1.2",
-    "@things-factory/api": "^4.0.38",
-    "@things-factory/apptool-ui": "^4.0.38",
-    "@things-factory/auth-ui": "^4.0.38",
-    "@things-factory/board-service": "^4.0.38",
-    "@things-factory/board-ui": "^4.0.38",
-    "@things-factory/context-ui": "^4.0.38",
-    "@things-factory/dashboard": "^4.0.38",
-    "@things-factory/export-ui": "^4.0.38",
-    "@things-factory/export-ui-excel": "^4.0.38",
-    "@things-factory/grist-ui": "^4.0.38",
-    "@things-factory/help": "^4.0.38",
-    "@things-factory/i18n-ui": "^4.0.38",
-    "@things-factory/integration-ui": "^4.0.38",
-    "@things-factory/lite-menu": "^4.0.38",
-    "@things-factory/more-ui": "^4.0.38",
-    "@things-factory/notification": "^4.0.38",
-    "@things-factory/oauth2-client": "^4.0.38",
-    "@things-factory/print-ui": "^4.0.38",
-    "@things-factory/resource-ui": "^4.0.38",
-    "@things-factory/scene-form": "^4.0.38",
+    "@operato/data-grist": "^0.3.24",
+    "@operato/ghost-print": "^0.3.24",
+    "@operato/graphql": "^0.3.24",
+    "@operato/help": "^0.3.24",
+    "@operato/i18n": "^0.3.24",
+    "@operato/input": "^0.3.24",
+    "@operato/layout": "^0.3.24",
+    "@operato/ocr": "^0.3.24",
+    "@operato/popup": "^0.3.24",
+    "@operato/pull-to-refresh": "^0.3.24",
+    "@operato/scene-chartjs": "^0.1.4",
+    "@operato/scene-clock": "^0.1.4",
+    "@operato/scene-gauge": "^0.1.4",
+    "@operato/scene-indoor-map": "^0.1.4",
+    "@operato/scene-progressbar": "^0.1.4",
+    "@operato/scene-random": "^0.1.4",
+    "@operato/scene-switch": "^0.1.4",
+    "@operato/scene-tab": "^0.1.4",
+    "@operato/shell": "^0.3.24",
+    "@operato/utils": "^0.3.24",
+    "@things-factory/api": "^4.0.42",
+    "@things-factory/apptool-ui": "^4.0.42",
+    "@things-factory/auth-ui": "^4.0.42",
+    "@things-factory/board-service": "^4.0.42",
+    "@things-factory/board-ui": "^4.0.42",
+    "@things-factory/context-ui": "^4.0.42",
+    "@things-factory/dashboard": "^4.0.42",
+    "@things-factory/export-ui": "^4.0.42",
+    "@things-factory/export-ui-excel": "^4.0.42",
+    "@things-factory/grist-ui": "^4.0.42",
+    "@things-factory/help": "^4.0.42",
+    "@things-factory/integration-ui": "^4.0.42",
+    "@things-factory/lite-menu": "^4.0.42",
+    "@things-factory/more-ui": "^4.0.42",
+    "@things-factory/notification": "^4.0.42",
+    "@things-factory/oauth2-client": "^4.0.42",
+    "@things-factory/print-ui": "^4.0.42",
+    "@things-factory/resource-ui": "^4.0.42",
+    "@things-factory/scene-form": "^4.0.42",
     "@things-factory/scene-half-roundrect": "^4.0.9",
-    "@things-factory/scene-news-ticker": "^4.0.38",
-    "@things-factory/setting-base": "^4.0.38",
-    "@things-factory/setting-ui": "^4.0.38",
-    "@things-factory/shell": "^4.0.38",
-    "@things-factory/system-ui": "^4.0.38"
+    "@things-factory/scene-news-ticker": "^4.0.42",
+    "@things-factory/setting-base": "^4.0.42",
+    "@things-factory/setting-ui": "^4.0.42",
+    "@things-factory/shell": "^4.0.42",
+    "@things-factory/system-ui": "^4.0.42"
   },
   "devDependencies": {
-    "@things-factory/builder": "^4.0.38"
+    "@things-factory/builder": "^4.0.42"
   },
-  "gitHead": "c2b2638e6efec319d4024cedc8da513d560c126e"
+  "gitHead": "794709ebadf4ae0f89a107a86a41a381ce26b465"
 }

package/logs/application-2022-01-01-00.log

@@ -1,6 +0,0 @@
-2021-12-31T16:07:47.529Z info: File Storage is Ready.
-2021-12-31T16:07:51.360Z info: Database connection established
-2021-12-31T16:07:52.386Z info: 🚀 Server ready at http://0.0.0.0:3000/graphql
-2021-12-31T16:07:52.386Z info: 🚀 Subscriptions ready at ws://0.0.0.0:3000/subscriptions
-2021-12-31T16:10:37.594Z error: Only absolute URLs are supported
-2021-12-31T16:11:32.986Z error: Only absolute URLs are supported