@things-factory/dataset 5.0.0-alpha.10 → 5.0.0-alpha.13

package/client/bootstrap.js

@@ -1,12 +1,16 @@
 import {
-  Json5Renderer,
+  OxGristRendererJson5,
   registerEditor as registerGristEditor,
   registerRenderer as registerGristRenderer
 } from '@operato/data-grist'
 
-import { OxDataItemSpecEditor } from '@operato/dataset/grist-editor'
+import { OxGristEditorDataItemSpec } from '@operato/dataset/grist-editor'
+import { OxGristEditorPartitionKeys } from '@operato/app/grist-editor/ox-grist-editor-partition-keys.js'
 
 export default function bootstrap() {
-  registerGristEditor('data-item-spec', OxDataItemSpecEditor)
-  registerGristRenderer('data-item-spec', Json5Renderer)
+  registerGristEditor('data-item-spec', OxGristEditorDataItemSpec)
+  registerGristRenderer('data-item-spec', OxGristRendererJson5)
+
+  registerGristEditor('partition-keys', OxGristEditorPartitionKeys)
+  registerGristRenderer('partition-keys', OxGristRendererJson5)
 }

package/client/pages/data-entry-form.js

@@ -1,9 +1,10 @@
-import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit'
+import '@operato/dataset/ox-data-entry-form.js'
 
-import { client } from '@operato/graphql'
+import { LitElement, css, html } from 'lit'
 import { i18next, localize } from '@operato/i18n'
-import '@operato/dataset/ox-data-entry-form.js'
+
+import { client } from '@operato/graphql'
+import gql from 'graphql-tag'
 
 class DataEntryForm extends localize(i18next)(LitElement) {
   static get properties() {
@@ -69,6 +70,12 @@ class DataEntryForm extends localize(i18next)(LitElement) {
         dataSample
       }
     })
+
+    if (!response.errors) {
+      document.dispatchEvent(
+        new CustomEvent('notify', { detail: { message: i18next.t('text.data sample created successfully') } })
+      )
+    }
   }
 }
 

package/client/pages/data-sample.js

@@ -1,15 +1,15 @@
 import '@operato/data-grist'
 
-import gql from 'graphql-tag'
+import { CommonButtonStyles, ScrollbarStyles } from '@operato/styles'
+import { PageView, store } from '@operato/shell'
 import { css, html } from 'lit'
-import { connect } from 'pwa-helpers/connect-mixin'
+import { i18next, localize } from '@operato/i18n'
 
 import { client } from '@operato/graphql'
-import { i18next, localize } from '@operato/i18n'
-import { notify } from '@operato/layout'
-import { PageView, store } from '@operato/shell'
-import { CommonButtonStyles, ScrollbarStyles } from '@operato/styles'
+import { connect } from 'pwa-helpers/connect-mixin'
+import gql from 'graphql-tag'
 import { isMobileDevice } from '@operato/utils'
+import { notify } from '@operato/layout'
 
 export class DataSample extends connect(store)(localize(i18next)(PageView)) {
   static get properties() {
@@ -60,7 +60,11 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
           action: this._deleteDataSample.bind(this),
           ...CommonButtonStyles.delete
         }
-      ]
+      ],
+      exportable: {
+        name: i18next.t('title.data-sample list'),
+        data: this._exportableData.bind(this)
+      }
     }
   }
 
@@ -121,7 +125,8 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
           },
           filter: 'search',
           sortable: true,
-          width: 120
+          width: 120,
+          imex: true
         },
         {
           type: 'string',
@@ -132,7 +137,8 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
             editable: true
           },
           filter: 'search',
-          width: 150
+          width: 150,
+          imex: true
         },
         {
           type: 'resource-object',
@@ -142,16 +148,18 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
             editable: false
           },
           sortable: true,
-          width: 120
+          width: 120,
+          imex: true
         },
         {
           type: 'json5',
           name: 'partitionKeys',
-          header: i18next.t('field.partitionKeys'),
+          header: i18next.t('field.partition-keys'),
           record: {
             editable: false
           },
-          width: 200
+          width: 200,
+          imex: true
         },
         {
           type: 'json5',
@@ -160,7 +168,8 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
           record: {
             editable: false
           },
-          width: 200
+          width: 200,
+          imex: true
         },
         {
           type: 'json5',
@@ -178,28 +187,32 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
           record: {
             editable: false
           },
-          width: 200
+          width: 200,
+          imex: true
         },
         {
           type: 'resource-object',
           name: 'updater',
           header: i18next.t('field.updater'),
           sortable: true,
-          width: 120
+          width: 120,
+          imex: true
         },
         {
           type: 'datetime',
           name: 'updatedAt',
           header: i18next.t('field.updated_at'),
           sortable: true,
-          width: 180
+          width: 180,
+          imex: true
         },
         {
           type: 'datetime',
           name: 'collectedAt',
           header: i18next.t('field.collected_at'),
           sortable: true,
-          width: 180
+          width: 180,
+          imex: true
         }
       ],
       rows: {
@@ -296,11 +309,43 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  async stateChanged(state) {
-    if (this.active && this._currentPopupName && !state.layout.viewparts[this._currentPopupName]) {
-      this.grist.fetch()
-      this._currentPopupName = null
+  _exportableData() {
+    let records = []
+    if (this.grist.selected && this.grist.selected.length > 0) {
+      records = this.grist.selected
+    } else {
+      records = this.grist.data.records
     }
+
+    var headerSetting = this.grist.compiledConfig.columns
+      .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
+      .map(column => {
+        return column.imex === true
+          ? {
+              header: column.header.renderer(),
+              key: column.name,
+              width: column.width,
+              type: column.type
+            }
+          : column.imex
+      })
+
+    var data = records.map(item => {
+      return {
+        id: item.id,
+        ...this.gristConfig.columns
+          .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
+          .reduce((record, column) => {
+            const key = column.imex === true ? column.name : column.imex.key
+            record[key] = key
+              .split('.')
+              .reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
+            return record
+          }, {})
+      }
+    })
+
+    return { header: headerSetting, data: data }
   }
 }
 

package/client/pages/data-sensor.js

@@ -1,15 +1,15 @@
 import '@operato/data-grist'
 
-import gql from 'graphql-tag'
+import { CommonButtonStyles, ScrollbarStyles } from '@operato/styles'
+import { PageView, store } from '@operato/shell'
 import { css, html } from 'lit'
-import { connect } from 'pwa-helpers/connect-mixin'
+import { i18next, localize } from '@operato/i18n'
 
 import { client } from '@operato/graphql'
-import { i18next, localize } from '@operato/i18n'
-import { notify } from '@operato/layout'
-import { PageView, store } from '@operato/shell'
-import { CommonButtonStyles, ScrollbarStyles } from '@operato/styles'
+import { connect } from 'pwa-helpers/connect-mixin'
+import gql from 'graphql-tag'
 import { isMobileDevice } from '@operato/utils'
+import { notify } from '@operato/layout'
 
 export class DataSensor extends connect(store)(localize(i18next)(PageView)) {
   static get properties() {
@@ -382,13 +382,6 @@ export class DataSensor extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  async stateChanged(state) {
-    if (this.active && this._currentPopupName && !state.layout.viewparts[this._currentPopupName]) {
-      this.grist.fetch()
-      this._currentPopupName = null
-    }
-  }
-
   async _copyDataSensor() {
     var selected = this.grist.selected
     if (selected.length == 0) return

package/client/pages/data-set.js

@@ -3,17 +3,17 @@ import './data-item-list'
 import './data-set-importer'
 import './data-entry-form'
 
-import gql from 'graphql-tag'
+import { CommonButtonStyles, ScrollbarStyles } from '@operato/styles'
+import { PageView, store } from '@operato/shell'
 import { css, html } from 'lit'
-import moment from 'moment-timezone'
-import { connect } from 'pwa-helpers/connect-mixin'
-
-import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { notify, openPopup } from '@operato/layout'
-import { PageView, store } from '@operato/shell'
-import { CommonButtonStyles, ScrollbarStyles } from '@operato/styles'
+
+import { client } from '@operato/graphql'
+import { connect } from 'pwa-helpers/connect-mixin'
+import gql from 'graphql-tag'
 import { isMobileDevice } from '@operato/utils'
+import moment from 'moment-timezone'
 
 export class DataSet extends connect(store)(localize(i18next)(PageView)) {
   static get properties() {
@@ -139,12 +139,15 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
           handlers: {
             click: (columns, data, column, record, rowIndex) => {
               if (!record.id) return
-              openPopup(html` <data-item-list .dataSet=${record}></data-item-list> `, {
+              const popup = openPopup(html` <data-item-list .dataSet=${record}></data-item-list> `, {
                 backdrop: true,
                 help: 'data-set/ui/data-item-list',
                 size: 'large',
                 title: i18next.t('title.data-item list')
               })
+              popup.onclosed = () => {
+                this.grist.fetch()
+              }
             }
           }
         },
@@ -200,11 +203,14 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
           width: 60
         },
         {
-          type: 'json',
+          type: 'partition-keys',
           name: 'partitionKeys',
-          header: i18next.t('field.partitionKeys'),
+          header: i18next.t('field.partition-keys'),
           record: {
-            editable: true
+            editable: true,
+            options: {
+              objectified: true /* transfered as a object type */
+            }
           },
           width: 200
         },
@@ -214,7 +220,10 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
           label: true,
           header: i18next.t('field.schedule'),
           record: {
-            editable: true
+            editable: true,
+            options: {
+              objectified: true
+            }
           },
           width: 80,
           label: true
@@ -303,6 +312,7 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
                 active
                 tag
                 type
+                unit
                 options
                 quota
                 spec
@@ -350,13 +360,6 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  async stateChanged(state) {
-    if (this.active && this._currentPopupName && !state.layout.viewparts[this._currentPopupName]) {
-      this.grist.fetch()
-      this._currentPopupName = null
-    }
-  }
-
   async _copyDataSet() {
     var selected = this.grist.selected
     if (selected.length == 0) return
@@ -375,7 +378,9 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
       }
     })
 
-    if (!response.errors) this.grist.fetch()
+    if (!response.errors) {
+      this.grist.fetch()
+    }
   }
 
   async _updateDataSet() {
@@ -406,7 +411,9 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
         }
       })
 
-      if (!response.errors) this.grist.fetch()
+      if (!response.errors) {
+        this.grist.fetch()
+      }
     }
   }
 

package/dist-server/service/data-sample/data-sample-mutation.js

@@ -35,7 +35,7 @@ const replaceVariables = (keys, dic) => {
     }
     return keys;
 };
-// It is required UTC date for Partitioning File System like AWS S3.
+// It is required UTC date for Partitioning File System like AWS S3 from Athena.
 // ex) %YYYY, %MM, %DD
 const formatDate = (keys, _moment) => {
     for (const k in keys) {
@@ -64,10 +64,12 @@ let DataSampleMutation = class DataSampleMutation {
             spec[dataItem.tag] = Object.assign(Object.assign({}, dataItem.spec), { name: dataItem.name /* do we need ? */ });
             return spec;
         }, {});
+        // appending spec to data for reporting and optimizing AWS Athena search
+        dataSample.data = Object.assign(Object.assign({}, dataSample.data), { _spec: JSON.stringify(spec) });
         var partitionKeys = Object.assign({}, dataSet.partitionKeys);
         const collectedAt = dataSample.collectedAt || new Date();
         partitionKeys = formatDate(partitionKeys, (0, moment_1.default)(collectedAt).utc());
-        partitionKeys = replaceVariables(partitionKeys, Object.assign({ domainId: domain.id, dataSetId: dataSample.dataSetId }, dataSample.data));
+        partitionKeys = replaceVariables(partitionKeys, Object.assign({ domain: domain.subdomain, dataSetId: dataSample.dataSetId }, dataSample.data));
         return await tx.getRepository(data_sample_1.DataSample).save(Object.assign(Object.assign({ name: dataSet.name, description: dataSet.description }, dataSample), { domain,
             partitionKeys,
             spec,

package/dist-server/service/data-sample/data-sample-mutation.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-sample-mutation.js","sourceRoot":"","sources":["../../../server/service/data-sample/data-sample-mutation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"data-sample-mutation.js","sourceRoot":"","sources":["../../../server/service/data-sample/data-sample-mutation.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "5.0.0-alpha.10",
+  "version": "5.0.0-alpha.13",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,17 +24,19 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@operato/data-grist": "1.0.0-alpha.23",
-    "@operato/dataset": "1.0.0-alpha.23",
-    "@operato/graphql": "1.0.0-alpha.23",
-    "@operato/i18n": "1.0.0-alpha.23",
-    "@operato/layout": "1.0.0-alpha.23",
-    "@operato/shell": "1.0.0-alpha.23",
-    "@operato/styles": "1.0.0-alpha.23",
-    "@operato/utils": "1.0.0-alpha.23",
-    "@things-factory/auth-base": "^5.0.0-alpha.10",
-    "@things-factory/env": "^5.0.0-alpha.10",
-    "@things-factory/shell": "^5.0.0-alpha.10"
+    "@operato/app": "1.0.0-alpha.33",
+    "@operato/data-grist": "1.0.0-alpha.33",
+    "@operato/dataset": "1.0.0-alpha.33",
+    "@operato/graphql": "1.0.0-alpha.33",
+    "@operato/i18n": "1.0.0-alpha.33",
+    "@operato/layout": "1.0.0-alpha.33",
+    "@operato/shell": "1.0.0-alpha.33",
+    "@operato/styles": "1.0.0-alpha.33",
+    "@operato/utils": "1.0.0-alpha.33",
+    "@things-factory/auth-base": "^5.0.0-alpha.13",
+    "@things-factory/env": "^5.0.0-alpha.13",
+    "@things-factory/shell": "^5.0.0-alpha.13",
+    "moment": "^2.29.1"
   },
-  "gitHead": "24e85b0265d10cb664b8279bb927ea2a86227775"
+  "gitHead": "49704052461599b174959ff494abb9ef1facd887"
 }

package/server/service/data-sample/data-sample-mutation.ts

@@ -22,7 +22,7 @@ const replaceVariables = (keys, dic) => {
   return keys
 }
 
-// It is required UTC date for Partitioning File System like AWS S3.
+// It is required UTC date for Partitioning File System like AWS S3 from Athena.
 // ex) %YYYY, %MM, %DD
 const formatDate = (keys, _moment) => {
   for (const k in keys) {
@@ -63,6 +63,9 @@ export class DataSampleMutation {
       return spec
     }, {})
 
+    // appending spec to data for reporting and optimizing AWS Athena search
+    dataSample.data = { ...dataSample.data, _spec: JSON.stringify(spec) }
+
     var partitionKeys = {
       ...dataSet.partitionKeys
     }
@@ -70,7 +73,7 @@ export class DataSampleMutation {
     const collectedAt = dataSample.collectedAt || new Date()
     partitionKeys = formatDate(partitionKeys, moment(collectedAt).utc())
     partitionKeys = replaceVariables(partitionKeys, {
-      domainId: domain.id,
+      domain: domain.subdomain,
       dataSetId: dataSample.dataSetId,
       ...dataSample.data
     })

package/translations/en.json

@@ -6,7 +6,7 @@
   "field.device-id": "device id",
   "field.netmask": "network mask",
   "field.options": "options",
-  "field.partitionKeys": "partition keys",
+  "field.partition-keys": "partition keys",
   "field.quota": "sampling #",
   "field.raw-data": "raw data",
   "field.ref-by": "ref. by",
@@ -14,6 +14,7 @@
   "field.spec": "spec",
   "field.tag": "tag name",
   "field.unit": "unit",
+  "text.data sample created successfully": "a data sample created successfully",
   "title.data-entry-form": "data entry form",
   "title.data-item list": "data item list",
   "title.data-sample list": "data sample list",

package/translations/ko.json

@@ -6,7 +6,7 @@
   "field.device-id": "디바이스 아이디",
   "field.netmask": "네트워크마스크",
   "field.options": "선택옵션",
-  "field.partitionKeys": "파티션 키",
+  "field.partition-keys": "파티션 키",
   "field.quota": "샘플수",
   "field.raw-data": "데이타 원본",
   "field.ref-by": "참조아이템",
@@ -14,6 +14,7 @@
   "field.spec": "명세",
   "field.tag": "태그이름",
   "field.unit": "단위",
+  "text.data sample created successfully": "데이타 샘플이 성공적으로 생성되었습니다",
   "title.data-entry-form": "데이타 입력",
   "title.data-item list": "데이타 아이템 조회",
   "title.data-sample list": "데이타 샘플 조회",

package/translations/ms.json

@@ -6,7 +6,7 @@
   "field.device-id": "device id",
   "field.netmask": "network mask",
   "field.options": "options",
-  "field.partitionKeys": "partition keys",
+  "field.partition-keys": "partition keys",
   "field.quota": "sampling #",
   "field.raw-data": "raw data",
   "field.ref-by": "ref. by",
@@ -14,6 +14,7 @@
   "field.spec": "spec",
   "field.tag": "tag name",
   "field.unit": "unit",
+  "text.data sample created successfully": "a data sample created successfully",
   "title.data-entry-form": "data entry form",
   "title.data-item list": "data item list",
   "title.data-sample list": "data sample list",

package/translations/zh.json

@@ -6,7 +6,7 @@
   "field.device-id": "device id",
   "field.netmask": "network mask",
   "field.options": "options",
-  "field.partitionKeys": "partition keys",
+  "field.partition-keys": "partition keys",
   "field.quota": "sampling #",
   "field.raw-data": "raw data",
   "field.ref-by": "ref. by",
@@ -14,6 +14,7 @@
   "field.spec": "spec",
   "field.tag": "tag name",
   "field.unit": "unit",
+  "text.data sample created successfully": "a data sample created successfully",
   "title.data-entry-form": "data entry form",
   "title.data-item list": "data item list",
   "title.data-sample list": "data sample list",