@things-factory/reference-app 4.0.8 → 4.0.12

package/client/components/camera-capturer.js

@@ -1,4 +1,4 @@
-import { LitElement, css, html } from 'lit-element'
+import { css, html, LitElement } from 'lit-element'
 
 import { FileDropHelper } from '@things-factory/utils'
 
@@ -90,7 +90,7 @@ export class CameraCapturer extends LitElement {
         accept=${this.accept}
         ?multiple=${this.multiple}
         hidden
-        capture="camera"
+        capture="environment"
         @change=${e => {
           const fileInput = e.currentTarget
 

package/client/components/ocr-viewpart.js

@@ -72,10 +72,14 @@ class OCRViewPart extends LitElement {
 
     if (!response.errors) {
       const helper = this.shadowRoot.querySelector('ox-ocr-helper')
-      RESULT = helper.result = response.data.ocrRequest.map(result => {
+      const result = response.data.ocrRequest
+      const ocrs = result.ocr.result
+      const barcodes = result.barcode.result
+
+      RESULT = helper.result = ocrs.map((result, idx) => {
         return {
-          ...result,
-          boundaries: JSON.parse(result.boundaries)
+          texts: [...ocrs[idx].texts, ...barcodes[idx].texts],
+          boundaries: [...JSON.parse(ocrs[idx].boundaries), ...JSON.parse(barcodes[idx].boundaries)]
         }
       })
     } else {

package/client/pages/context-menu-page.js

@@ -1,12 +1,11 @@
 import '@material/mwc-icon'
 import '@operato/popup'
 
-import { css, html } from 'lit-element'
-import { connect } from 'pwa-helpers/connect-mixin.js'
-
-import { PopupMenu } from '@operato/popup'
 import { PageView, store } from '@things-factory/shell'
+import { css, html } from 'lit-element'
 
+import { OxPopupMenu } from '@operato/popup'
+import { connect } from 'pwa-helpers/connect-mixin.js'
 import { referencePageStyles } from './reference-page-styles'
 
 class ContextMenuPage extends connect(store)(PageView) {
@@ -36,7 +35,7 @@ class ContextMenuPage extends connect(store)(PageView) {
     return html`
       <p>여기서는 Context Menu 등의 용도로 사용될 수 있는 팝업 메뉴 기능을 설명합니다.</p>
       <p>
-        PopupMenu는 미리 hidden element로 위치하고 있을 수도 있으며, 동적으로 생성될 수도 있습니다. 여기서는 미리
+        OxPopupMenu는 미리 hidden element로 위치하고 있을 수도 있으며, 동적으로 생성될 수도 있습니다. 여기서는 미리
         페이지내에 엘리먼트를 위치시키고 open method로 활성화 시키는 방법을 예시합니다. 데스크톱 브라우저 페이지 내 어느
         위치에서든 마우스 우측버튼을 클릭하고, 모바일 디바이스에서는 탭을 오래누르면(longpress) 팝업메뉴가 동작합니다.
       </p>
@@ -47,7 +46,7 @@ class ContextMenuPage extends connect(store)(PageView) {
     this.addEventListener('contextmenu', e => {
       e.preventDefault()
 
-      PopupMenu.open({
+      OxPopupMenu.open({
         template: html`
             <ox-popup-menuitem
               label="article - click me"

package/client/pages/grist-mode-page.js

@@ -2,8 +2,8 @@ import '@operato/popup'
 import '@operato/data-grist'
 
 import { css, html } from 'lit-element'
-
 import { i18next, localize } from '@things-factory/i18n-base'
+
 import { PageView } from '@things-factory/shell'
 
 class GristModePage extends localize(i18next)(PageView) {

package/client/pages/label-scan-page.js

@@ -1,4 +1,5 @@
 import '@things-factory/barcode-ui'
+import '@operato/input/dist/src/ox-input-barcode'
 
 import { css, html } from 'lit-element'
 import { connect } from 'pwa-helpers/connect-mixin.js'
@@ -51,10 +52,8 @@ class LabelScanPage extends connect(store)(PageView) {
     return html`
       <section>
         <h2>Barcode Scanable Input</h2>
-        <p>
-          barcode-scanable-input 컴포넌트는 카메라 입력을 통해서 바코드를 스캔하고, 스캔한 결과를 입력 필드에 적용한다.
-        </p>
-        <barcode-scanable-input
+        <p>ox-input-barcode 컴포넌트는 카메라 입력을 통해서 바코드를 스캔하고, 스캔한 결과를 입력 필드에 적용한다.</p>
+        <ox-input-barcode
           name="barcode-input"
           custom-input
           @keypress=${e => {
@@ -64,7 +63,7 @@ class LabelScanPage extends connect(store)(PageView) {
               console.log('input completed.', e.target.value)
             }
           }}
-        ></barcode-scanable-input>
+        ></ox-input-barcode>
       </section>
 
       <section>

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/dist-server/service/reference/lambda-call.js

@@ -11,16 +11,23 @@ const appSyncConfig = env_1.config.get('awsAppSync');
 async function interpretImages(images) {
     const query = utils_1.gqlBuilder.jsonToGraphQLQuery({
         mutation: {
-            upload: {
+            extractInfos: {
                 __args: {
                     images
                 },
-                success_count: true,
-                failure_count: true,
-                result: {
-                    key_values: true,
-                    boundaries: true,
-                    texts: true
+                ocr: {
+                    success_count: true,
+                    result: {
+                        boundaries: true,
+                        texts: true
+                    }
+                },
+                barcode: {
+                    success_count: true,
+                    result: {
+                        boundaries: true,
+                        texts: true
+                    }
                 }
             }
         }

package/dist-server/service/reference/lambda-call.js.map

@@ -1 +1 @@
-{"version":3,"file":"lambda-call.js","sourceRoot":"","sources":["../../../server/service/reference/lambda-call.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA8B;AAE9B,6CAA4C;AAC5C,iDAAkD;AAElD,MAAM,aAAa,GAAG,YAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;AAEvC,KAAK,UAAU,eAAe,CAAC,MAAM;IAC1C,MAAM,KAAK,GAAG,kBAAU,CAAC,kBAAkB,CAAC;QAC1C,QAAQ,EAAE;YACR,MAAM,EAAE;gBACN,MAAM,EAAE;oBACN,MAAM;iBACP;gBACD,aAAa,EAAE,IAAI;gBACnB,aAAa,EAAE,IAAI;gBACnB,MAAM,EAAE;oBACN,UAAU,EAAE,IAAI;oBAChB,UAAU,EAAE,IAAI;oBAChB,KAAK,EAAE,IAAI;iBACZ;aACF;SACF;KACF,CAAC,CAAA;IAEF,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;IACtC,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;QACpD,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,cAAc,EAAE,qBAAqB;YACrC,WAAW,EAAE,aAAa,CAAC,QAAQ,CAAC;SACrC;QACD,IAAI;KACL,CAAC,CAAA;IAEF,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;IACrC,OAAO,OAAO,CAAA;AAChB,CAAC;AA9BD,0CA8BC;AAED,cAAc;AACd,SAAS,cAAc,CAAC,MAAM;IAC5B,kDAAkD;IAClD,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QACjC,MAAM,IAAI,GAAG,EAAE,CAAA;QACf,KAAK,IAAI,GAAG,IAAI,GAAG,EAAE;YACnB,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;SACrC;QACD,OAAO,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAA;IACnC,CAAC,CAAC,CAAA;IAEF,4CAA4C;IAC5C,yBAAyB;IAEzB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;QAC1B,KAAK,EAAE;uBACY,SAAS;;;;;;;;;MAS1B;KACH,CAAC,CAAA;IAEF,OAAO,IAAI,CAAA;AACb,CAAC"}
+{"version":3,"file":"lambda-call.js","sourceRoot":"","sources":["../../../server/service/reference/lambda-call.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA8B;AAE9B,6CAA4C;AAC5C,iDAAkD;AAElD,MAAM,aAAa,GAAG,YAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;AAEvC,KAAK,UAAU,eAAe,CAAC,MAAM;IAC1C,MAAM,KAAK,GAAG,kBAAU,CAAC,kBAAkB,CAAC;QAC1C,QAAQ,EAAE;YACR,YAAY,EAAE;gBACZ,MAAM,EAAE;oBACN,MAAM;iBACP;gBACD,GAAG,EAAE;oBACH,aAAa,EAAE,IAAI;oBACnB,MAAM,EAAE;wBACN,UAAU,EAAE,IAAI;wBAChB,KAAK,EAAE,IAAI;qBACZ;iBACF;gBACD,OAAO,EAAE;oBACP,aAAa,EAAE,IAAI;oBACnB,MAAM,EAAE;wBACN,UAAU,EAAE,IAAI;wBAChB,KAAK,EAAE,IAAI;qBACZ;iBACF;aACF;SACF;KACF,CAAC,CAAA;IAEF,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;IACtC,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;QACpD,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,cAAc,EAAE,qBAAqB;YACrC,WAAW,EAAE,aAAa,CAAC,QAAQ,CAAC;SACrC;QACD,IAAI;KACL,CAAC,CAAA;IAEF,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;IACrC,OAAO,OAAO,CAAA;AAChB,CAAC;AArCD,0CAqCC;AAED,cAAc;AACd,SAAS,cAAc,CAAC,MAAM;IAC5B,kDAAkD;IAClD,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QACjC,MAAM,IAAI,GAAG,EAAE,CAAA;QACf,KAAK,IAAI,GAAG,IAAI,GAAG,EAAE;YACnB,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;SACrC;QACD,OAAO,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAA;IACnC,CAAC,CAAC,CAAA;IAEF,4CAA4C;IAC5C,yBAAyB;IAEzB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;QAC1B,KAAK,EAAE;uBACY,SAAS;;;;;;;;;MAS1B;KACH,CAAC,CAAA;IAEF,OAAO,IAAI,CAAA;AACb,CAAC"}

package/logs/.08636eb59927f12972f6774f5947c8507b3564c2-audit.json

@@ -6,19 +6,19 @@
     "auditLog": "logs/.08636eb59927f12972f6774f5947c8507b3564c2-audit.json",
     "files": [
         {
-            "date": 1638185235675,
-            "name": "logs/application-2021-11-29-20.log",
-            "hash": "00ffc0988bd00c20e9781e1e1199ba2c"
+            "date": 1638784227578,
+            "name": "logs/application-2021-12-06-18.log",
+            "hash": "54fabcf9798be8b227267b7e42863eea"
         },
         {
-            "date": 1638189718559,
-            "name": "logs/application-2021-11-29-21.log",
-            "hash": "bf01266958549d973091d711910f7fb2"
+            "date": 1638785300521,
+            "name": "logs/application-2021-12-06-19.log",
+            "hash": "b4b397e740c5c28a3ab8c801fd6658ff"
         },
         {
-            "date": 1638194619311,
-            "name": "logs/application-2021-11-29-23.log",
-            "hash": "703efe9c95fa66ee00e24c249fd863f5"
+            "date": 1638870081374,
+            "name": "logs/application-2021-12-07-18.log",
+            "hash": "4cc64d074f8373ed8f05e6cabb419761"
         }
     ]
 }

package/logs/.5e5d741d8b7784a2fbad65eedc0fd46946aaf6f2-audit.json

@@ -6,19 +6,39 @@
     "auditLog": "logs/.5e5d741d8b7784a2fbad65eedc0fd46946aaf6f2-audit.json",
     "files": [
         {
-            "date": 1638185239795,
-            "name": "logs/connections-2021-11-29-20.log",
-            "hash": "e28d199b30bde6b88967362fb318a103"
+            "date": 1637662677621,
+            "name": "logs/connections-2021-11-23-19.log",
+            "hash": "14ae42756cf908019578a5abf71f16e9"
         },
         {
-            "date": 1638189721660,
-            "name": "logs/connections-2021-11-29-21.log",
-            "hash": "679163fc1c530a8fd14dcbfc617300a4"
+            "date": 1637718648504,
+            "name": "logs/connections-2021-11-24-10.log",
+            "hash": "66b33a27ee085f2cffc70d3aae95d503"
         },
         {
-            "date": 1638194624575,
-            "name": "logs/connections-2021-11-29-23.log",
-            "hash": "92bf1c2c4738bc05921cefe0e860c4fa"
+            "date": 1637744215431,
+            "name": "logs/connections-2021-11-24-17.log",
+            "hash": "97d71fe2626ad99010a7fffa667966b2"
+        },
+        {
+            "date": 1637746683906,
+            "name": "logs/connections-2021-11-24-18.log",
+            "hash": "d15e7616daaabd2dc4b8fbd3dc37fa3d"
+        },
+        {
+            "date": 1638784229405,
+            "name": "logs/connections-2021-12-06-18.log",
+            "hash": "db425b25003b87e6bec1d94a748909d0"
+        },
+        {
+            "date": 1638785303642,
+            "name": "logs/connections-2021-12-06-19.log",
+            "hash": "ee793684ecc87d1b8e9f97b01c0bc30b"
+        },
+        {
+            "date": 1638870082934,
+            "name": "logs/connections-2021-12-07-18.log",
+            "hash": "577f2d2bc9e2ededbef8e499e292dcc1"
         }
     ]
 }

package/logs/application-2021-12-06-18.log

@@ -0,0 +1,9 @@
+2021-12-06T09:50:28.854Z info: File Storage is Ready.
+2021-12-06T09:50:31.136Z info: Database connection established
+2021-12-06T09:50:32.020Z info: 🚀 Server ready at http://0.0.0.0:3000/graphql
+2021-12-06T09:50:32.021Z info: 🚀 Subscriptions ready at ws://0.0.0.0:3000/subscriptions
+2021-12-06T09:51:59.909Z error: Cannot return null for non-nullable field Query.ocrRequest.
+2021-12-06T09:53:38.961Z info: File Storage is Ready.
+2021-12-06T09:53:42.474Z info: Database connection established
+2021-12-06T09:53:43.432Z info: 🚀 Server ready at http://0.0.0.0:3000/graphql
+2021-12-06T09:53:43.432Z info: 🚀 Subscriptions ready at ws://0.0.0.0:3000/subscriptions

package/logs/application-2021-12-06-19.log

@@ -0,0 +1,12 @@
+2021-12-06T10:08:22.719Z info: File Storage is Ready.
+2021-12-06T10:08:26.386Z info: Database connection established
+2021-12-06T10:08:27.523Z info: 🚀 Server ready at http://0.0.0.0:3000/graphql
+2021-12-06T10:08:27.525Z info: 🚀 Subscriptions ready at ws://0.0.0.0:3000/subscriptions
+2021-12-06T10:08:55.224Z error: Cannot return null for non-nullable field Query.ocrRequest.
+2021-12-06T10:09:44.525Z error: Cannot return null for non-nullable field Query.ocrRequest.
+2021-12-06T10:10:45.038Z error: Cannot return null for non-nullable field Query.ocrRequest.
+2021-12-06T10:12:39.788Z info: File Storage is Ready.
+2021-12-06T10:12:43.278Z info: Database connection established
+2021-12-06T10:12:44.229Z info: 🚀 Server ready at http://0.0.0.0:3000/graphql
+2021-12-06T10:12:44.232Z info: 🚀 Subscriptions ready at ws://0.0.0.0:3000/subscriptions
+2021-12-06T10:16:03.993Z error: Cannot return null for non-nullable field Query.ocrRequest.

package/logs/application-2021-12-07-18.log

@@ -0,0 +1,5 @@
+2021-12-07T09:41:22.237Z info: File Storage is Ready.
+2021-12-07T09:41:24.285Z info: Database connection established
+2021-12-07T09:41:24.877Z info: 🚀 Server ready at http://0.0.0.0:3000/graphql
+2021-12-07T09:41:24.878Z info: 🚀 Subscriptions ready at ws://0.0.0.0:3000/subscriptions
+2021-12-07T09:54:16.589Z error: Cannot return null for non-nullable field Query.ocrRequest.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/reference-app",
-  "version": "4.0.8",
+  "version": "4.0.12",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -37,50 +37,51 @@
     "docker:run": "docker run -it -p 4000:3000 hatiolab/reference-app:latest"
   },
   "dependencies": {
-    "@hatiolab/things-scene": "^2.7.12",
+    "@hatiolab/things-scene": "^2.7.24",
     "@material/mwc-checkbox": "^0.25.3",
-    "@operato/data-grist": "^0.2.28",
-    "@operato/ghost-print": "0.2.26",
-    "@operato/ocr": "^0.2.26",
-    "@operato/popup": "^0.2.26",
-    "@operato/pull-to-refresh": "^0.2.26",
-    "@operato/scene-switch": "^0.0.3",
-    "@things-factory/api": "^4.0.7",
-    "@things-factory/apptool-ui": "^4.0.7",
-    "@things-factory/auth-ui": "^4.0.7",
-    "@things-factory/board-service": "^4.0.7",
-    "@things-factory/board-ui": "^4.0.7",
-    "@things-factory/context-ui": "^4.0.7",
-    "@things-factory/dashboard": "^4.0.7",
-    "@things-factory/export-ui": "^4.0.7",
-    "@things-factory/export-ui-excel": "^4.0.7",
-    "@things-factory/grist-ui": "^4.0.7",
-    "@things-factory/help": "^4.0.7",
-    "@things-factory/i18n-ui": "^4.0.7",
-    "@things-factory/integration-ui": "^4.0.7",
-    "@things-factory/lite-menu": "^4.0.7",
-    "@things-factory/more-ui": "^4.0.7",
-    "@things-factory/notification": "^4.0.7",
-    "@things-factory/oauth2-client": "^4.0.7",
-    "@things-factory/print-ui": "^4.0.7",
-    "@things-factory/resource-ui": "^4.0.7",
-    "@things-factory/scene-chartjs": "^4.0.8",
-    "@things-factory/scene-clock": "^4.0.7",
-    "@things-factory/scene-form": "^4.0.7",
-    "@things-factory/scene-gauge": "^4.0.7",
-    "@things-factory/scene-half-roundrect": "^4.0.7",
-    "@things-factory/scene-indoor-map": "^4.0.7",
-    "@things-factory/scene-news-ticker": "^4.0.7",
-    "@things-factory/scene-progressbar": "^4.0.7",
-    "@things-factory/scene-random": "^4.0.7",
-    "@things-factory/scene-tab": "^4.0.7",
-    "@things-factory/setting-base": "^4.0.7",
-    "@things-factory/setting-ui": "^4.0.7",
-    "@things-factory/shell": "^4.0.7",
-    "@things-factory/system-ui": "^4.0.7"
+    "@operato/data-grist": "^0.2.43",
+    "@operato/ghost-print": "^0.2.43",
+    "@operato/input": "^0.2.43",
+    "@operato/ocr": "^0.2.43",
+    "@operato/popup": "^0.2.43",
+    "@operato/pull-to-refresh": "^0.2.43",
+    "@operato/scene-chartjs": "^0.0.15",
+    "@operato/scene-clock": "^0.0.15",
+    "@operato/scene-progressbar": "^0.0.15",
+    "@operato/scene-random": "^0.0.15",
+    "@operato/scene-switch": "^0.0.15",
+    "@things-factory/api": "^4.0.12",
+    "@things-factory/apptool-ui": "^4.0.12",
+    "@things-factory/auth-ui": "^4.0.12",
+    "@things-factory/board-service": "^4.0.12",
+    "@things-factory/board-ui": "^4.0.12",
+    "@things-factory/context-ui": "^4.0.12",
+    "@things-factory/dashboard": "^4.0.12",
+    "@things-factory/export-ui": "^4.0.12",
+    "@things-factory/export-ui-excel": "^4.0.12",
+    "@things-factory/grist-ui": "^4.0.12",
+    "@things-factory/help": "^4.0.12",
+    "@things-factory/i18n-ui": "^4.0.12",
+    "@things-factory/integration-ui": "^4.0.12",
+    "@things-factory/lite-menu": "^4.0.12",
+    "@things-factory/more-ui": "^4.0.12",
+    "@things-factory/notification": "^4.0.12",
+    "@things-factory/oauth2-client": "^4.0.12",
+    "@things-factory/print-ui": "^4.0.12",
+    "@things-factory/resource-ui": "^4.0.12",
+    "@things-factory/scene-form": "^4.0.12",
+    "@things-factory/scene-gauge": "^4.0.12",
+    "@things-factory/scene-half-roundrect": "^4.0.9",
+    "@things-factory/scene-indoor-map": "^4.0.12",
+    "@things-factory/scene-news-ticker": "^4.0.12",
+    "@things-factory/scene-tab": "^4.0.12",
+    "@things-factory/setting-base": "^4.0.12",
+    "@things-factory/setting-ui": "^4.0.12",
+    "@things-factory/shell": "^4.0.12",
+    "@things-factory/system-ui": "^4.0.12"
   },
   "devDependencies": {
-    "@things-factory/builder": "^4.0.7"
+    "@things-factory/builder": "^4.0.12"
   },
-  "gitHead": "e867686a46f323e8c2373230336556bfd096e932"
+  "gitHead": "29d59ff95fcb473cb43c6f798cd04f3ec3a779a0"
 }

package/server/service/reference/lambda-call.ts

@@ -8,16 +8,23 @@ const appSyncConfig = config.get('awsAppSync')
 export async function interpretImages(images) {
   const query = gqlBuilder.jsonToGraphQLQuery({
     mutation: {
-      upload: {
+      extractInfos: {
         __args: {
           images
         },
-        success_count: true,
-        failure_count: true,
-        result: {
-          key_values: true,
-          boundaries: true,
-          texts: true
+        ocr: {
+          success_count: true,
+          result: {
+            boundaries: true,
+            texts: true
+          }
+        },
+        barcode: {
+          success_count: true,
+          result: {
+            boundaries: true,
+            texts: true
+          }
         }
       }
     }