@things-factory/dataset 5.0.0-alpha.26 → 5.0.0-alpha.29

package/dist-server/service/data-set/data-set.js

@@ -10,12 +10,23 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 var _a, _b, _c, _d, _e;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataSet = void 0;
+exports.DataSet = exports.DataSetViewType = void 0;
 const type_graphql_1 = require("type-graphql");
 const typeorm_1 = require("typeorm");
 const auth_base_1 = require("@things-factory/auth-base");
 const shell_1 = require("@things-factory/shell");
 const data_item_1 = require("../data-item/data-item");
+var DataSetViewType;
+(function (DataSetViewType) {
+    DataSetViewType["Generated"] = "generated";
+    DataSetViewType["Board"] = "board";
+    DataSetViewType["Page"] = "page";
+    DataSetViewType["ExternalURL"] = "external";
+})(DataSetViewType = exports.DataSetViewType || (exports.DataSetViewType = {}));
+(0, type_graphql_1.registerEnumType)(DataSetViewType, {
+    name: 'DataSetViewType',
+    description: 'view type enumeration for data-set'
+});
 let DataSet = class DataSet {
 };
 __decorate([
@@ -75,19 +86,40 @@ __decorate([
     }),
     (0, type_graphql_1.Field)({ nullable: true }),
     __metadata("design:type", String)
-], DataSet.prototype, "useCase", void 0);
+], DataSet.prototype, "entryType", void 0);
 __decorate([
-    (0, typeorm_1.Column)('simple-json', { nullable: true }),
-    (0, type_graphql_1.Field)(type => shell_1.ScalarObject, { nullable: true }),
-    __metadata("design:type", typeof (_c = typeof shell_1.ScalarObject !== "undefined" && shell_1.ScalarObject) === "function" ? _c : Object)
-], DataSet.prototype, "partitionKeys", void 0);
+    (0, typeorm_1.Column)({
+        nullable: true
+    }),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], DataSet.prototype, "entryView", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        nullable: true
+    }),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], DataSet.prototype, "monitorType", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        nullable: true
+    }),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], DataSet.prototype, "monitorView", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         nullable: true
     }),
     (0, type_graphql_1.Field)({ nullable: true }),
     __metadata("design:type", String)
-], DataSet.prototype, "slugger", void 0);
+], DataSet.prototype, "useCase", void 0);
+__decorate([
+    (0, typeorm_1.Column)('simple-json', { nullable: true }),
+    (0, type_graphql_1.Field)(type => shell_1.ScalarObject, { nullable: true }),
+    __metadata("design:type", typeof (_c = typeof shell_1.ScalarObject !== "undefined" && shell_1.ScalarObject) === "function" ? _c : Object)
+], DataSet.prototype, "partitionKeys", void 0);
 __decorate([
     (0, typeorm_1.OneToMany)(type => data_item_1.DataItem, dataItem => dataItem.dataSet),
     (0, type_graphql_1.Field)(type => [data_item_1.DataItem], { nullable: true }),

package/dist-server/service/data-set/data-set.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "5.0.0-alpha.26",
+  "version": "5.0.0-alpha.29",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,20 +24,22 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@operato/app": "1.0.0-alpha.48",
-    "@operato/data-grist": "1.0.0-alpha.48",
-    "@operato/dataset": "1.0.0-alpha.48",
-    "@operato/graphql": "1.0.0-alpha.48",
-    "@operato/i18n": "1.0.0-alpha.48",
-    "@operato/layout": "1.0.0-alpha.48",
-    "@operato/shell": "1.0.0-alpha.48",
-    "@operato/styles": "1.0.0-alpha.48",
-    "@operato/utils": "1.0.0-alpha.48",
-    "@things-factory/auth-base": "^5.0.0-alpha.26",
-    "@things-factory/env": "^5.0.0-alpha.26",
-    "@things-factory/shell": "^5.0.0-alpha.26",
-    "@things-factory/work-shift": "^5.0.0-alpha.26",
-    "moment": "^2.29.1"
+    "@operato/app": "1.0.0-alpha.53",
+    "@operato/data-grist": "1.0.0-alpha.53",
+    "@operato/dataset": "1.0.0-alpha.53",
+    "@operato/graphql": "1.0.0-alpha.53",
+    "@operato/i18n": "1.0.0-alpha.53",
+    "@operato/layout": "1.0.0-alpha.53",
+    "@operato/shell": "1.0.0-alpha.53",
+    "@operato/styles": "1.0.0-alpha.53",
+    "@operato/utils": "1.0.0-alpha.53",
+    "@things-factory/auth-base": "^5.0.0-alpha.29",
+    "@things-factory/board-service": "^5.0.0-alpha.29",
+    "@things-factory/env": "^5.0.0-alpha.29",
+    "@things-factory/shell": "^5.0.0-alpha.29",
+    "@things-factory/work-shift": "^5.0.0-alpha.29",
+    "cron-parser": "^4.3.0",
+    "moment-timezone": "^0.5.34"
   },
-  "gitHead": "841b6ef41df481ea7ae4a925328ff5c0a7e9a9cd"
+  "gitHead": "b173f0b3a55165db246df58668a99b456cc47996"
 }

package/server/controllers/create-data-sample.ts

@@ -1,15 +1,17 @@
-import { DataOoc, DataOocStatus } from '../service/data-ooc/data-ooc'
+import moment from 'moment-timezone'
+import { EntityManager } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
 import { Domain, getRedirectSubdomainPath, pubsub } from '@things-factory/shell'
 
 import { DataItem } from '../service/data-item/data-item'
+import { DataOoc, DataOocStatus } from '../service/data-ooc/data-ooc'
 import { DataSample } from '../service/data-sample/data-sample'
+import { NewDataSample } from '../service/data-sample/data-sample-type'
 import { DataSet } from '../service/data-set/data-set'
 import { DataUseCase } from './data-use-case'
-import { EntityManager } from 'typeorm'
-import { NewDataSample } from '../service/data-sample/data-sample-type'
-import { User } from '@things-factory/auth-base'
 import { getWorkDateAndShift } from '@things-factory/work-shift'
-import moment from 'moment'
+
 
 const debug = require('debug')('things-factory:dataset:controller/save-data-sample')
 
@@ -67,20 +69,29 @@ export async function createDataSample(
   const spec = dataItems.reduce((spec, dataItem) => {
     spec[dataItem.tag] = {
       ...dataItem.spec,
-      name: dataItem.name /* do we need ? */
+      name: dataItem.name, /* do we need ? */
+      hidden: dataItem.hidden
     }
 
     return spec
   }, {})
 
   const collectedAt = dataSample.collectedAt || new Date()
-  const momentUtc = moment(collectedAt).utc()
+  // workDate ex) 2022-04-04
+  const { workDate, workShift } = await getWorkDateAndShift(domain, collectedAt)
+
+  const dateFormat = 'YYYY-MM-DD'
+  // local time dataSet timezone or domain timezone or default 'UTC'
+  const timezone = dataSet['timezone'] || domain['timezone'] || 'UTC'
+  
+  // const collectedAt = dataSample.collectedAt || new Date()
+  const localDateTz = moment(collectedAt).tz(timezone)
   const defaultPartitionKeys = {
     domain: domain.subdomain,
-    datasetid: dataSample.dataSet.id /* It should not be 'data_set_id' as column name duplicated for Glue */,
-    year: momentUtc.format('Y'),
-    month: momentUtc.format('M'),
-    day: momentUtc.format('D')
+    datasetid: dataSample.dataSet.id, /* It should not be 'data_set_id' as column name duplicated for Glue */
+    date: localDateTz.format(dateFormat), /* local time date */
+    workdate: workDate, /* working date */
+    workshift: workShift
   }
 
   var partitionKeys = {
@@ -88,14 +99,12 @@ export async function createDataSample(
     ...dataSet.partitionKeys
   }
 
-  partitionKeys = formatDate(partitionKeys, momentUtc)
+  partitionKeys = formatDate(partitionKeys, localDateTz)
   partitionKeys = replaceVariables(partitionKeys, {
     ...dataSample.data
   })
 
   const { ooc, oos } = DataUseCase.evaluate(dataSet, dataItems, dataSample.data) || {}
-  const { workDate, workShift } = await getWorkDateAndShift(domain, collectedAt)
-
   const result = await tx.getRepository(DataSample).save({
     name: dataSet.name,
     description: dataSet.description,

package/server/service/data-item/data-item-type.ts

@@ -37,6 +37,9 @@ export class DataItemPatch {
   @Field({ nullable: true })
   active?: boolean
 
+  @Field({ nullable: true })
+  hidden?: boolean
+
   @Field(type => ScalarObject, { nullable: true })
   spec?: ScalarObject
 

package/server/service/data-item/data-item.ts

@@ -75,6 +75,12 @@ export class DataItem {
   @Field({ nullable: true })
   active?: boolean
 
+  @Column({
+    nullable: true
+  })
+  @Field({ nullable: true })
+  hidden?: boolean
+
   @Column({
     nullable: true
   })

package/server/service/data-set/data-set-query.ts

@@ -1,13 +1,17 @@
 import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { getRepository } from 'typeorm'
+import { Equal, getRepository } from 'typeorm'
 
 import { Role, User } from '@things-factory/auth-base'
+import { Board } from '@things-factory/board-service'
 import { convertListParams, Domain, ListParam } from '@things-factory/shell'
 
 import { DataItem } from '../data-item/data-item'
+import { DataSample } from '../data-sample/data-sample'
 import { DataSet } from './data-set'
 import { DataSetList } from './data-set-type'
 
+var parser = require('cron-parser')
+
 @Resolver(DataSet)
 export class DataSetQuery {
   @Directive('@privilege(category: "data-set", privilege: "query", domainOwnerGranted: true)')
@@ -31,6 +35,25 @@ export class DataSetQuery {
     return { items, total }
   }
 
+  @Query(returns => DataSetList, { description: 'To fetch multiple DataSets for data entry manually' })
+  async dataSetsForEntry(@Args() params: ListParam, @Ctx() context: any): Promise<DataSetList> {
+    const { domain } = context.state
+
+    /* TODO. 조회한 사용자가 supervisory 역할을 가진 data-set 리스트만 반환 */
+
+    const { where = {}, order, skip, take } = convertListParams(params, domain.id)
+    where.active = Equal(true)
+
+    const [items, total] = await getRepository(DataSet).findAndCount({
+      where,
+      order,
+      skip,
+      take
+    })
+
+    return { items, total }
+  }
+
   @FieldResolver(type => [DataItem])
   async dataItems(@Root() dataSet: DataSet): Promise<DataItem[]> {
     return await getRepository(DataItem).find({
@@ -45,6 +68,20 @@ export class DataSetQuery {
     })
   }
 
+  @FieldResolver(type => Board, { nullable: true })
+  async entryBoard(@Root() dataSet: DataSet) {
+    if (dataSet.entryType == 'board' && dataSet.entryView) {
+      return await getRepository(Board).findOne({ id: dataSet.entryView })
+    }
+  }
+
+  @FieldResolver(type => Board, { nullable: true })
+  async monitorBoard(@Root() dataSet: DataSet) {
+    if (dataSet.monitorType == 'board' && dataSet.monitorView) {
+      return await getRepository(Board).findOne({ id: dataSet.monitorView })
+    }
+  }
+
   @FieldResolver(type => Domain)
   async domain(@Root() dataSet: DataSet): Promise<Domain> {
     return await getRepository(Domain).findOne(dataSet.domainId)
@@ -59,4 +96,45 @@ export class DataSetQuery {
   async creator(@Root() dataSet: DataSet): Promise<User> {
     return await getRepository(User).findOne(dataSet.creatorId)
   }
+
+  @FieldResolver(type => Date, { nullable: true })
+  async latestCollectedAt(@Root() dataSet: DataSet): Promise<Date> {
+    const sample = await getRepository(DataSample).findOne({
+      select: ['collectedAt'],
+      where: { dataSet },
+      order: { collectedAt: 'DESC' }
+    })
+
+    return sample?.collectedAt
+  }
+
+  @FieldResolver(type => Date, { nullable: true })
+  async nextSchedule(@Root() dataSet: DataSet): Promise<Date> {
+    const { timezone, schedule } = dataSet
+
+    if (!schedule) {
+      return
+    }
+
+    var interval = parser.parseExpression(schedule, {
+      tz: timezone
+    })
+
+    return interval.next().toDate()
+  }
+
+  @FieldResolver(type => Date, { nullable: true })
+  async prevSchedule(@Root() dataSet: DataSet): Promise<Date> {
+    const { timezone, schedule } = dataSet
+
+    if (!schedule) {
+      return
+    }
+
+    var interval = parser.parseExpression(schedule, {
+      tz: timezone
+    })
+
+    return interval.prev().toDate()
+  }
 }

package/server/service/data-set/data-set-type.ts

@@ -1,7 +1,8 @@
 import { Field, ID, InputType, Int, ObjectType } from 'type-graphql'
+
 import { ObjectRef, ScalarObject } from '@things-factory/shell'
 
-import { DataSet } from './data-set'
+import { DataSet, DataSetViewType } from './data-set'
 
 @InputType()
 export class NewDataSet {
@@ -31,6 +32,18 @@ export class NewDataSet {
 
   @Field({ nullable: true })
   timezone?: string
+
+  @Field({ nullable: true })
+  entryType?: DataSetViewType
+
+  @Field({ nullable: true })
+  entryView?: string
+
+  @Field({ nullable: true })
+  monitorType?: DataSetViewType
+
+  @Field({ nullable: true })
+  monitorView?: string
 }
 
 @InputType()
@@ -50,9 +63,6 @@ export class DataSetPatch {
   @Field({ nullable: true })
   active?: boolean
 
-  @Field({ nullable: true })
-  type?: 'manual' | 'automatic' | string
-
   @Field({ nullable: true })
   useCase?: string
 
@@ -65,6 +75,18 @@ export class DataSetPatch {
   @Field({ nullable: true })
   timezone?: string
 
+  @Field({ nullable: true })
+  entryType?: DataSetViewType
+
+  @Field({ nullable: true })
+  entryView?: string
+
+  @Field({ nullable: true })
+  monitorType?: DataSetViewType
+
+  @Field({ nullable: true })
+  monitorView?: string
+
   @Field()
   cuFlag: string
 }

package/server/service/data-set/data-set.ts

@@ -1,4 +1,4 @@
-import { Field, ID, ObjectType } from 'type-graphql'
+import { Field, ID, ObjectType, registerEnumType } from 'type-graphql'
 import {
   Column,
   CreateDateColumn,
@@ -16,6 +16,18 @@ import { Domain, ScalarObject } from '@things-factory/shell'
 
 import { DataItem } from '../data-item/data-item'
 
+export enum DataSetViewType {
+  Generated = 'generated',
+  Board = 'board',
+  Page = 'page',
+  ExternalURL = 'external'
+}
+
+registerEnumType(DataSetViewType, {
+  name: 'DataSetViewType',
+  description: 'view type enumeration for data-set'
+})
+
 @Entity()
 @Index('ix_data_set_0', (dataSet: DataSet) => [dataSet.domain, dataSet.name], { unique: true })
 @ObjectType({ description: 'Entity for DataSet' })
@@ -66,17 +78,35 @@ export class DataSet {
     nullable: true
   })
   @Field({ nullable: true })
-  useCase?: string
+  entryType?: DataSetViewType
 
-  @Column('simple-json', { nullable: true })
-  @Field(type => ScalarObject, { nullable: true })
-  partitionKeys?: ScalarObject
+  @Column({
+    nullable: true
+  })
+  @Field({ nullable: true })
+  entryView?: string
+
+  @Column({
+    nullable: true
+  })
+  @Field({ nullable: true })
+  monitorType?: DataSetViewType
 
   @Column({
     nullable: true
   })
   @Field({ nullable: true })
-  slugger?: string
+  monitorView?: string
+
+  @Column({
+    nullable: true
+  })
+  @Field({ nullable: true })
+  useCase?: string
+
+  @Column('simple-json', { nullable: true })
+  @Field(type => ScalarObject, { nullable: true })
+  partitionKeys?: ScalarObject
 
   @OneToMany(type => DataItem, dataItem => dataItem.dataSet)
   @Field(type => [DataItem], { nullable: true })

package/things-factory.config.js

@@ -5,20 +5,24 @@ export default {
   route,
   routes: [
     {
-      tagname: 'data-set-page',
-      page: 'data-set'
+      tagname: 'data-set-list-page',
+      page: 'data-set-list'
     },
     {
-      tagname: 'data-sensor-page',
-      page: 'data-sensor'
+      tagname: 'data-sensor-list-page',
+      page: 'data-sensor-list'
     },
     {
-      tagname: 'data-sample-page',
-      page: 'data-sample'
+      tagname: 'data-sample-list-page',
+      page: 'data-sample-list'
     },
     {
-      tagname: 'data-ooc-page',
-      page: 'data-ooc'
+      tagname: 'data-ooc-list-page',
+      page: 'data-ooc-list'
+    },
+    {
+      tagname: 'data-entry-list-page',
+      page: 'data-entry-list'
     }
   ],
   bootstrap

package/translations/en.json

@@ -10,11 +10,19 @@
   "field.data-sample": "data sample",
   "field.data-set": "data set",
   "field.device-id": "device id",
+  "field.entry-type": "entry type",
+  "field.entry-view": "entry view",
+  "field.hidden": "hidden",
+  "field.latest-collected-at": "latest collected at",
+  "field.monitor-type": "monitor type",
+  "field.monitor-view": "monitor view",
   "field.netmask": "network mask",
+  "field.next-schedule": "next schedule",
   "field.oos": "out of critical limit",
   "field.ooc": "out of control limit",
   "field.options": "options",
   "field.partition-keys": "partition keys",
+  "field.prev-schedule": "previous schedule",
   "field.quota": "sampling #",
   "field.raw-data": "raw data",
   "field.ref-by": "ref. by",
@@ -30,6 +38,7 @@
   "text.data sample created successfully": "a data sample created successfully",
   "text.data ooc updated successfully": "a data ooc updated successfully",
   "title.data-entry-form": "data entry form",
+  "title.data-entry list": "data entry list",
   "title.data-item list": "data item list",
   "title.data-ooc list": "data OOC list",
   "title.data-ooc view": "data OOC view",

package/translations/ko.json

@@ -10,11 +10,19 @@
   "field.data-sample": "데이타 샘플",
   "field.data-set": "데이타셋",
   "field.device-id": "디바이스 아이디",
+  "field.entry-type": "입력용 화면종류",
+  "field.entry-view": "입력용 화면",
+  "field.hidden": "숨기기",
+  "field.latest-collected-at": "최근 수집 시간",
+  "field.monitor-type": "모니터용 화면종류",
+  "field.monitor-view": "모니터용 화면",
   "field.netmask": "네트워크마스크",
+  "field.next-schedule": "다음 수집계획",
   "field.oos": "허용한계 이탈여부",
   "field.ooc": "관리한계 이탈여부",
   "field.options": "선택옵션",
   "field.partition-keys": "파티션 키",
+  "field.prev-schedule": "이전 수집계획",
   "field.quota": "샘플수",
   "field.raw-data": "데이타 원본",
   "field.ref-by": "참조아이템",

package/translations/ms.json

@@ -10,11 +10,19 @@
   "field.data-sample": "data sample",
   "field.data-set": "data set",
   "field.device-id": "device id",
+  "field.entry-type": "entry type",
+  "field.entry-view": "entry view",
+  "field.latest-collected-at": "latest collected at",
+  "field.monitor-type": "monitor type",
+  "field.monitor-view": "monitor view",
   "field.netmask": "network mask",
+  "field.next-schedule": "next schedule",
   "field.oos": "out of critical limit",
   "field.ooc": "out of control limit",
   "field.options": "options",
+  "field.hidden": "hidden",
   "field.partition-keys": "partition keys",
+  "field.prev-schedule": "previous schedule",
   "field.quota": "sampling #",
   "field.raw-data": "raw data",
   "field.ref-by": "ref. by",

package/translations/zh.json

@@ -10,11 +10,19 @@
   "field.data-sample": "data sample",
   "field.data-set": "data set",
   "field.device-id": "device id",
+  "field.entry-type": "entry type",
+  "field.entry-view": "entry view",
+  "field.hidden": "hidden",
+  "field.latest-collected-at": "latest collected at",
+  "field.monitor-type": "monitor type",
+  "field.monitor-view": "monitor view",
   "field.netmask": "network mask",
+  "field.next-schedule": "next schedule",
   "field.oos": "out of critical limit",
   "field.ooc": "out of control limit",
   "field.options": "options",
   "field.partition-keys": "partition keys",
+  "field.prev-schedule": "previous schedule",
   "field.quota": "sampling #",
   "field.raw-data": "raw data",
   "field.ref-by": "ref. by",