@things-factory/dataset 5.0.0-alpha.1 → 5.0.0-alpha.4

package/client/pages/data-sensor.js

@@ -0,0 +1,446 @@
+import '@operato/data-grist'
+
+import gql from 'graphql-tag'
+import { css, html } from 'lit'
+import { connect } from 'pwa-helpers/connect-mixin'
+
+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 { isMobileDevice } from '@operato/utils'
+
+export class DataSensor extends connect(store)(localize(i18next)(PageView)) {
+  static get properties() {
+    return {
+      active: String,
+      gristConfig: Object
+    }
+  }
+
+  static get styles() {
+    return [
+      ScrollbarStyles,
+      css`
+        :host {
+          display: flex;
+          flex-direction: column;
+
+          overflow: hidden;
+        }
+
+        ox-grist {
+          overflow-y: auto;
+          flex: 1;
+        }
+
+        #filters {
+          display: flex;
+          flex-direction: row;
+          justify-content: space-between;
+
+          background-color: white;
+        }
+
+        #filters > * {
+          padding: var(--padding-default) var(--padding-wide);
+        }
+      `
+    ]
+  }
+
+  get context() {
+    return {
+      title: i18next.t('title.data-sensor list'),
+      help: 'integration/ui/data-sensor',
+      actions: [
+        {
+          title: i18next.t('button.copy'),
+          action: this._copyDataSensor.bind(this),
+          ...CommonButtonStyles.copy
+        },
+        {
+          title: i18next.t('button.save'),
+          action: this._updateDataSensor.bind(this),
+          ...CommonButtonStyles.save
+        },
+        {
+          title: i18next.t('button.delete'),
+          action: this._deleteDataSensor.bind(this),
+          ...CommonButtonStyles.delete
+        }
+      ]
+    }
+  }
+
+  render() {
+    return html`
+      <ox-grist
+        .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
+        .config=${this.gristConfig}
+        .fetchHandler=${this.fetchHandler.bind(this)}
+      >
+        <div slot="headroom" id="filters">
+          <ox-filters-form></ox-filters-form>
+        </div>
+      </ox-grist>
+    `
+  }
+
+  get grist() {
+    return this.renderRoot.querySelector('ox-grist')
+  }
+
+  // update with url params value
+  _updateSearchConfig(lifecycle) {
+    // this.searchConfig = this.searchConfig.map(conf => {
+    // if (conf.name in lifecycle.params) {
+    //   conf.value = lifecycle.params[conf.name]
+    // } else {
+    //   delete conf.value
+    // }
+    // return conf
+    // })
+  }
+
+  // set default field value to record with searchConfig
+  _setDefaultFieldsValue(fields) {
+    // this.searchConfig.forEach(conf => {
+    //   if (!fields[conf.name] && conf.value) {
+    //     fields[conf.name] = conf.value
+    //   }
+    // })
+  }
+
+  async pageInitialized(lifecycle) {
+    this._updateSearchConfig(lifecycle)
+
+    this.gristConfig = {
+      list: { fields: ['name', 'description', 'active'] },
+      columns: [
+        { type: 'gutter', gutterName: 'sequence' },
+        { type: 'gutter', gutterName: 'row-selector', multiple: true },
+        {
+          type: 'string',
+          name: 'name',
+          label: true,
+          header: i18next.t('field.name'),
+          record: {
+            editable: true
+          },
+          filter: 'search',
+          sortable: true,
+          width: 150
+        },
+        {
+          type: 'string',
+          name: 'description',
+          label: true,
+          header: i18next.t('field.description'),
+          record: {
+            editable: true
+          },
+          filter: 'search',
+          width: 200
+        },
+        {
+          type: 'checkbox',
+          name: 'active',
+          label: true,
+          header: i18next.t('field.active'),
+          record: {
+            editable: true
+          },
+          sortable: true,
+          width: 60
+        },
+        {
+          type: 'string',
+          name: 'deviceId',
+          label: true,
+          header: i18next.t('field.device-id'),
+          record: {
+            editable: true
+          },
+          filter: 'search',
+          sortable: true,
+          width: 150
+        },
+        {
+          type: 'string',
+          name: 'tag',
+          label: true,
+          header: i18next.t('field.tag'),
+          record: {
+            editable: true
+          },
+          sortable: true,
+          width: 150
+        },
+        {
+          type: 'object',
+          name: 'appliance',
+          header: i18next.t('field.appliance'),
+          record: {
+            editable: true,
+            options: {
+              queryName: 'appliances'
+            }
+          },
+          sortable: true,
+          width: 120
+        },
+        {
+          type: 'object',
+          name: 'dataSet',
+          header: i18next.t('field.dataSet'),
+          record: {
+            editable: true,
+            options: {
+              queryName: 'dataSets'
+            }
+          },
+          sortable: true,
+          width: 120
+        },
+        {
+          type: 'string',
+          name: 'refBy',
+          label: true,
+          header: i18next.t('field.ref-by'),
+          record: {
+            editable: true
+          },
+          sortable: true,
+          width: 150
+        },
+        {
+          type: 'string',
+          name: 'model',
+          label: true,
+          header: i18next.t('field.model'),
+          record: {
+            editable: true
+          },
+          sortable: true,
+          width: 150
+        },
+        {
+          type: 'string',
+          name: 'brand',
+          label: true,
+          header: i18next.t('field.brand'),
+          record: {
+            editable: true
+          },
+          sortable: true,
+          width: 150
+        },
+        {
+          type: 'string',
+          name: 'serialNo',
+          label: true,
+          header: i18next.t('field.serial-no'),
+          record: {
+            editable: true
+          },
+          sortable: true,
+          width: 150
+        },
+        {
+          type: 'string',
+          name: 'netmask',
+          label: true,
+          header: i18next.t('field.netmask'),
+          record: {
+            editable: true
+          },
+          sortable: true,
+          width: 150
+        },
+        {
+          type: 'object',
+          name: 'updater',
+          header: i18next.t('field.updater'),
+          record: {
+            editable: false
+          },
+          sortable: true,
+          width: 120
+        },
+        {
+          type: 'datetime',
+          name: 'collectedAt',
+          header: i18next.t('field.collected_at'),
+          record: {
+            editable: false
+          },
+          sortable: true,
+          width: 180
+        }
+      ],
+      rows: {
+        selectable: {
+          multiple: true
+        }
+      },
+      sorters: [
+        {
+          name: 'name'
+        }
+      ]
+    }
+
+    await this.updateComplete
+
+    this.grist.fetch()
+  }
+
+  async pageUpdated(changes, lifecycle) {
+    if (this.active) {
+      // update with url params value
+      this._updateSearchConfig(lifecycle)
+      await this.updateComplete
+
+      this.grist.fetch()
+    }
+  }
+
+  async fetchHandler({ page, limit, sortings = [], filters = [] }) {
+    const response = await client.query({
+      query: gql`
+        query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+          responses: dataSensors(filters: $filters, pagination: $pagination, sortings: $sortings) {
+            items {
+              id
+              name
+              description
+              active
+              deviceId
+              tag
+              appliance {
+                id
+                name
+                description
+              }
+              dataSet {
+                id
+                name
+                description
+              }
+              refBy
+              brand
+              model
+              serialNo
+              netmask
+              updater {
+                id
+                name
+              }
+              updatedAt
+            }
+            total
+          }
+        }
+      `,
+      variables: {
+        filters,
+        pagination: { page, limit },
+        sortings
+      }
+    })
+
+    return {
+      total: response.data.responses.total || 0,
+      records: response.data.responses.items || []
+    }
+  }
+
+  async _deleteDataSensor() {
+    if (confirm(i18next.t('text.sure_to_x', { x: i18next.t('text.delete') }))) {
+      const ids = this.grist.selected.map(record => record.id)
+      if (ids && ids.length > 0) {
+        const response = await client.mutate({
+          mutation: gql`
+            mutation ($ids: [String!]!) {
+              deleteDataSensors(ids: $ids)
+            }
+          `,
+          variables: {
+            ids
+          }
+        })
+
+        if (!response.errors) {
+          this.grist.fetch()
+          notify({
+            message: i18next.t('text.info_x_successfully', { x: i18next.t('text.delete') })
+          })
+        }
+      }
+    }
+  }
+
+  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
+
+    if (!confirm(i18next.t('text.sure_to_x', { x: i18next.t('text.copy') }))) return
+    var response = await client.mutate({
+      mutation: gql`
+        mutation ($ids: [String!]!) {
+          copyDataSensors(ids: $ids) {
+            id
+          }
+        }
+      `,
+      variables: {
+        ids: selected.map(r => r.id)
+      }
+    })
+
+    if (!response.errors) this.grist.fetch()
+  }
+
+  async _updateDataSensor() {
+    let patches = this.grist.dirtyRecords
+    if (patches && patches.length) {
+      patches = patches.map(patch => {
+        let patchField = patch.id ? { id: patch.id } : {}
+        const dirtyFields = patch.__dirtyfields__
+        for (let key in dirtyFields) {
+          patchField[key] = dirtyFields[key].after
+        }
+        this._setDefaultFieldsValue(patchField)
+        patchField.cuFlag = patch.__dirty__
+
+        return patchField
+      })
+
+      const response = await client.mutate({
+        mutation: gql`
+          mutation ($patches: [DataSensorPatch!]!) {
+            updateMultipleDataSensor(patches: $patches) {
+              name
+            }
+          }
+        `,
+        variables: {
+          patches
+        }
+      })
+
+      if (!response.errors) this.grist.fetch()
+    }
+  }
+}
+
+window.customElements.define('data-sensor-page', DataSensor)

package/client/pages/data-set.js

@@ -1,6 +1,7 @@
 import '@operato/data-grist'
 import './data-item-list'
 import './data-set-importer'
+import './data-entry-form'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit'
@@ -147,6 +148,23 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
             }
           }
         },
+        {
+          type: 'gutter',
+          gutterName: 'button',
+          icon: 'fact_check',
+          handlers: {
+            click: (columns, data, column, record, rowIndex) => {
+              openPopup(
+                html` <data-entry-form .dataSet=${record} style="background-color: white;"></data-entry-form> `,
+                {
+                  backdrop: true,
+                  size: 'large',
+                  title: i18next.t('title.data-entry-form')
+                }
+              )
+            }
+          }
+        },
         {
           type: 'string',
           name: 'name',
@@ -181,6 +199,15 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
           sortable: true,
           width: 60
         },
+        {
+          type: 'json',
+          name: 'partitionKeys',
+          header: i18next.t('field.partitionKeys'),
+          record: {
+            editable: true
+          },
+          width: 200
+        },
         {
           type: 'crontab',
           name: 'schedule',
@@ -259,6 +286,8 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
               id
               name
               description
+              partitionKeys
+              slugger
               active
               schedule
               timezone
@@ -272,7 +301,9 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
                 description
                 sequence
                 active
+                tag
                 type
+                options
                 quota
                 spec
               }
@@ -354,9 +385,7 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
         let patchField = patch.id ? { id: patch.id } : {}
         const dirtyFields = patch.__dirtyfields__
         for (let key in dirtyFields) {
-          if (['message', 'step', 'steps', 'progress', 'rounds'].indexOf(key) == -1) {
-            patchField[key] = dirtyFields[key].after
-          }
+          patchField[key] = dirtyFields[key].after
         }
         this._setDefaultFieldsValue(patchField)
         patchField.cuFlag = patch.__dirty__
@@ -383,7 +412,17 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
 
   async exportHandler() {
     const exportTargets = this.grist.selected.length ? this.grist.selected : this.grist.dirtyData.records
-    const targetFieldSet = new Set(['id', 'name', 'type', 'description', 'schedule', 'timezone', 'active', 'dataItems'])
+    const targetFieldSet = new Set([
+      'id',
+      'name',
+      'type',
+      'description',
+      'tag',
+      'schedule',
+      'timezone',
+      'active',
+      'dataItems'
+    ])
 
     return exportTargets.map(dataSet => {
       let tempObj = {}
@@ -399,11 +438,11 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
     openPopup(
       html`
         <data-set-importer
-          .dataSets="${records}"
-          @imported="${() => {
+          .dataSets=${records}
+          @imported=${() => {
             history.back()
             this.grist.fetch()
-          }}"
+          }}
         ></data-set-importer>
       `,
       {

package/client/route.js

@@ -4,6 +4,10 @@ export default function route(page) {
       import('./pages/data-set')
       return page
 
+    case 'data-sensor':
+      import('./pages/data-sensor')
+      return page
+
     case 'data-sample':
       import('./pages/data-sample')
       return page

package/dist-server/index.js

@@ -18,4 +18,5 @@ require("./routes");
 __exportStar(require("./migrations"), exports);
 __exportStar(require("./middlewares"), exports);
 __exportStar(require("./service"), exports);
+__exportStar(require("./service/data-spec/data-spec-manager"), exports);
 //# sourceMappingURL=index.js.map

package/dist-server/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oBAAiB;AAEjB,+CAA4B;AAC5B,gDAA6B;AAC7B,4CAAyB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oBAAiB;AAEjB,+CAA4B;AAC5B,gDAA6B;AAC7B,4CAAyB;AAEzB,wEAAqD"}

package/dist-server/routes.js

@@ -1,3 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const typeorm_1 = require("typeorm");
+const service_1 = require("./service");
+const data_item_1 = require("./service/data-item/data-item");
+const data_sensor_1 = require("./service/data-sensor/data-sensor");
 const debug = require('debug')('things-factory:dataset:routes');
 process.on('bootstrap-module-global-public-route', (app, globalPublicRouter) => {
     /*
@@ -6,6 +12,64 @@ process.on('bootstrap-module-global-public-route', (app, globalPublicRouter) =>
      * ex) routes.get('/path', async(context, next) => {})
      * ex) routes.post('/path', async(context, next) => {})
      */
+    globalPublicRouter.post('/sensor-data', async (context, next) => {
+        // 데이타 검증
+        const { deviceId, data, rawData, timestamp = Date.now() } = context.request.body;
+        if (!deviceId || !data) {
+            throw new Error(`deviceId(${deviceId}) and data(${JSON.stringify(data)}) properties are mandatory`);
+        }
+        // make new data-sample
+        await (0, typeorm_1.getConnection)().transaction(async (tx) => {
+            // find sensor through deviceId
+            const sensor = await tx.getRepository(data_sensor_1.DataSensor).findOne({
+                where: { deviceId },
+                relations: ['domain', 'appliance', 'dataSet']
+            });
+            if (!sensor) {
+                throw new Error(`Sensor having given deviceId(${deviceId}) not found`);
+            }
+            if (!sensor.active) {
+                throw new Error(`State of the sensor given deviceId(${deviceId}) is not active`);
+            }
+            if (!sensor.appliance) {
+                throw new Error(`Appliance of the sensor given deviceId(${deviceId}) is not set up`);
+            }
+            if (!sensor.dataSet) {
+                throw new Error(`DataSet of the sensor given deviceId(${deviceId}) is not set up`);
+            }
+            const domain = sensor.domain;
+            const dataSet = sensor.dataSet;
+            const user = sensor.appliance;
+            const dataItems = await tx.getRepository(data_item_1.DataItem).find({
+                where: {
+                    domain,
+                    dataSet
+                },
+                order: {
+                    sequence: 'DESC'
+                }
+            });
+            var spec = {};
+            dataItems.forEach(dataItem => {
+                spec[dataItem.name] = dataItem.spec;
+            });
+            await tx.getRepository(service_1.DataSample).save({
+                domain,
+                name: dataSet.name,
+                description: dataSet.description,
+                partitionKeys: dataSet.partitionKeys,
+                dataSet,
+                data,
+                rawData,
+                spec,
+                source: deviceId,
+                collectedAt: new Date(timestamp),
+                creator: user,
+                updater: user
+            });
+        });
+        return 'OK';
+    });
 });
 process.on('bootstrap-module-global-private-route', (app, globalPrivateRouter) => {
     /*

package/dist-server/routes.js.map

@@ -1 +1 @@
-{"version":3,"file":"routes.js","sourceRoot":"","sources":["../server/routes.ts"],"names":[],"mappings":"AAAA,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,+BAA+B,CAAC,CAAA;AAE/D,OAAO,CAAC,EAAE,CAAC,sCAA6C,EAAE,CAAC,GAAG,EAAE,kBAAkB,EAAE,EAAE;IACpF;;;;;OAKG;AACL,CAAC,CAAC,CAAA;AAEF,OAAO,CAAC,EAAE,CAAC,uCAA8C,EAAE,CAAC,GAAG,EAAE,mBAAmB,EAAE,EAAE;IACtF;;OAEG;AACL,CAAC,CAAC,CAAA;AAEF,OAAO,CAAC,EAAE,CAAC,sCAA6C,EAAE,CAAC,GAAG,EAAE,kBAAkB,EAAE,EAAE;IACpF;;OAEG;AACL,CAAC,CAAC,CAAA;AAEF,OAAO,CAAC,EAAE,CAAC,uCAA8C,EAAE,CAAC,GAAG,EAAE,mBAAmB,EAAE,EAAE;IACtF;;OAEG;AACL,CAAC,CAAC,CAAA"}
+{"version":3,"file":"routes.js","sourceRoot":"","sources":["../server/routes.ts"],"names":[],"mappings":"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"}

package/dist-server/service/data-item/data-item-type.js

@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataItemList = exports.DataItemPatch = void 0;
 const type_graphql_1 = require("type-graphql");
@@ -35,25 +36,29 @@ __decorate([
     (0, type_graphql_1.Field)(type => type_graphql_1.Int, { nullable: true }),
     __metadata("design:type", Number)
 ], DataItemPatch.prototype, "sequence", void 0);
+__decorate([
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], DataItemPatch.prototype, "tag", void 0);
 __decorate([
     (0, type_graphql_1.Field)(type => data_item_1.DataItemType, { nullable: true }),
     __metadata("design:type", String)
 ], DataItemPatch.prototype, "type", void 0);
+__decorate([
+    (0, type_graphql_1.Field)(type => shell_1.ScalarObject, { nullable: true }),
+    __metadata("design:type", typeof (_a = typeof shell_1.ScalarObject !== "undefined" && shell_1.ScalarObject) === "function" ? _a : Object)
+], DataItemPatch.prototype, "options", void 0);
 __decorate([
     (0, type_graphql_1.Field)(type => type_graphql_1.Int, { nullable: true }),
     __metadata("design:type", Number)
 ], DataItemPatch.prototype, "quota", void 0);
-__decorate([
-    (0, type_graphql_1.Field)({ nullable: true }),
-    __metadata("design:type", String)
-], DataItemPatch.prototype, "options", void 0);
 __decorate([
     (0, type_graphql_1.Field)({ nullable: true }),
     __metadata("design:type", Boolean)
 ], DataItemPatch.prototype, "active", void 0);
 __decorate([
     (0, type_graphql_1.Field)(type => shell_1.ScalarObject, { nullable: true }),
-    __metadata("design:type", Object)
+    __metadata("design:type", typeof (_b = typeof shell_1.ScalarObject !== "undefined" && shell_1.ScalarObject) === "function" ? _b : Object)
 ], DataItemPatch.prototype, "spec", void 0);
 __decorate([
     (0, type_graphql_1.Field)({ nullable: true }),