@things-factory/dataset 6.2.71 → 6.2.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.2.71",
+  "version": "6.2.73",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -39,17 +39,17 @@
     "@operato/utils": "^1.0.1",
     "@things-factory/auth-base": "^6.2.70",
     "@things-factory/aws-base": "^6.2.70",
-    "@things-factory/board-service": "^6.2.70",
+    "@things-factory/board-service": "^6.2.73",
     "@things-factory/env": "^6.2.33",
-    "@things-factory/organization": "^6.2.71",
+    "@things-factory/organization": "^6.2.73",
     "@things-factory/scheduler-client": "^6.2.70",
     "@things-factory/shell": "^6.2.70",
     "@things-factory/work-shift": "^6.2.70",
-    "@things-factory/worklist": "^6.2.71",
+    "@things-factory/worklist": "^6.2.73",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.40",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "f520e62d112d7a9144a3be19ebb1a07beead4f70"
+  "gitHead": "eb578bc7a3f5a2301af8ae599d00e929ef3bb6ca"
 }

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

@@ -62,7 +62,7 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
     relations: ['dataKeySet']
   })
 
-  const dataItems = dataSet.dataItems
+  const { dataItems, tag: publishTag } = dataSet
   const collectedAt = dataSample.collectedAt || new Date()
 
   const timezone = dataSet.timezone || domain.timezone || 'UTC'
@@ -184,6 +184,16 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
     updater: user
   })
 
+  if (publishTag) {
+    pubsub.publish('data', {
+      data: {
+        domain,
+        tag: publishTag,
+        data
+      }
+    })
+  }
+
   /* post-process for for file attachment. */
   if (attachments.length > 0) {
     attachments.forEach(attachment => (attachment.refId = result.id))
@@ -274,7 +284,7 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
 
       const assignees = dataSet.supervisoryRoleId ? [{ type: 'Role', value: dataSet.supervisoryRoleId, assignee }] : []
 
-      /* 해당 dataset의 supervisor로 하여금, data를 리뷰하고 instruction을 작성해서, approvalLine을 이용 해서 승인을 한다. */
+      /* 해당 dataset의 supervisor로 하여금, data를 리뷰하고 instruction을 작성해서, approvalLine을 이용해서 승인을 한다. */
       if (assignees && assignees instanceof Array && assignees.length > 0) {
         result.dataItems = dataItems
         const activityInstance = {
@@ -292,11 +302,6 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
         await issue(activityInstance, context)
 
         try {
-          pubsub.publish('data-set', {
-            dataSet,
-            supervisoryRoleId: dataSet.supervisoryRoleId
-          })
-    
           pubsub.publish('notification', {
             notification: {
               domain,

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

@@ -48,7 +48,7 @@ export class DataSetQuery {
       params,
       domain,
       alias: 'dataset',
-      searchables: ['name', 'description', 'supervisoryRole']
+      searchables: ['name', 'description', 'tag', 'supervisoryRole']
     })
 
     const [items, total] = await queryBuilder.getManyAndCount()

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

@@ -17,6 +17,9 @@ export class NewDataSet {
   @Field({ nullable: true })
   description?: string
 
+  @Field({ nullable: true, description: 'A tag name of data to be published when a data sample created' })
+  tag?: string
+
   @Field(type => ObjectRef, { nullable: true })
   dataKeySet?: ObjectRef
 
@@ -95,6 +98,9 @@ export class DataSetPatch {
   @Field({ nullable: true })
   description?: string
 
+  @Field({ nullable: true, description: 'A tag name of data to be published when a data sample created' })
+  tag?: string
+
   @Field(type => ObjectRef, { nullable: true })
   dataKeySet?: ObjectRef
 

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

@@ -113,6 +113,10 @@ export class DataSet {
   @Field({ nullable: true, description: 'A description of the dataset' })
   description?: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true, description: 'A tag name of data to be published when a data sample created' })
+  tag?: string
+
   @VersionColumn({ nullable: true, default: 1 })
   @Field({ nullable: true, description: 'The version of the dataset' })
   version?: number = 1

package/translations/en.json

@@ -31,6 +31,7 @@
   "field.entry-view": "entry view",
   "field.hidden": "hidden",
   "field.item": "item",
+  "field.key": "key",
   "field.key-01": "key 1",
   "field.key-02": "key 2",
   "field.key-03": "key 3",
@@ -58,6 +59,7 @@
   "field.request-params": "request parameters",
   "field.requires-review": "requires review",
   "field.review-approval-line": "review approval line",
+  "field.role": "role",
   "field.serial-no": "serial #",
   "field.spec": "spec",
   "field.stat-function": "stat func.",
@@ -71,6 +73,7 @@
   "field.time-period": "time period",
   "field.unit": "unit",
   "field.use-case": "use case",
+  "field.view": "view",
   "field.work-date": "work date",
   "field.work-shift": "work shift",
   "label.acceptables": "acceptables",

package/translations/ja.json

@@ -31,6 +31,7 @@
   "field.entry-view": "入力用画面",
   "field.hidden": "隠し",
   "field.item": "項目",
+  "field.key": "キ",
   "field.key-01": "キー1",
   "field.key-02": "キー2",
   "field.key-03": "キー3",
@@ -58,6 +59,7 @@
   "field.request-params": "リクエスト パラメータ",
   "field.requires-review": "見直しが必要",
   "field.review-approval-line": "決済ライン",
+  "field.role": "ロール",
   "field.serial-no": "シリアル番号",
   "field.spec": "明細",
   "field.stat-function": "統計関数",
@@ -71,6 +73,7 @@
   "field.time-period": "時間単位",
   "field.unit": "単位",
   "field.use-case": "使用事例",
+  "field.view": "画面",
   "field.work-date": "作業基準日",
   "field.work-shift": "交代勤務組",
   "label.acceptables": "許容値",

package/translations/ko.json

@@ -31,6 +31,7 @@
   "field.entry-view": "입력용 화면",
   "field.hidden": "숨기기",
   "field.item": "항목",
+  "field.key": "키",
   "field.key-01": "키 1",
   "field.key-02": "키 2",
   "field.key-03": "키 3",
@@ -58,6 +59,7 @@
   "field.request-params": "요청 매개변수",
   "field.requires-review": "검토 요청",
   "field.review-approval-line": "결재라인",
+  "field.role": "역할",
   "field.serial-no": "시리얼번호",
   "field.spec": "명세",
   "field.stat-function": "통계함수",
@@ -90,6 +92,7 @@
   "label.period-today": "오늘",
   "label.start-date": "시작일",
   "label.state-corrected": "조치완료",
+  "field.view": "화면",
   "label.state-issued": "발생",
   "label.state-reviewed": "검토완료",
   "label.target-limits": "관리 목표범위",

package/translations/ms.json

@@ -31,6 +31,7 @@
   "field.entry-view": "paparan masukan",
   "field.hidden": "tersembunyi",
   "field.item": "item",
+  "field.key": "kunci",
   "field.key-01": "kunci 1",
   "field.key-02": "kunci 2",
   "field.key-03": "kunci 3",
@@ -58,6 +59,7 @@
   "field.request-params": "parameter permintaan",
   "field.requires-review": "memerlukan semakan",
   "field.review-approval-line": "baris kelulusan",
+  "field.role": "peranan",
   "field.serial-no": "no. siri",
   "field.spec": "spesifikasi",
   "field.stat-function": "fungsi stat.",
@@ -71,6 +73,7 @@
   "field.time-period": "tempoh masa",
   "field.unit": "unit",
   "field.use-case": "kes penggunaan",
+  "field.view": "skrin",
   "field.work-date": "tarikh kerja",
   "field.work-shift": "shift kerja",
   "label.acceptables": "boleh diterima",

package/translations/zh.json

@@ -31,6 +31,7 @@
   "field.entry-view": "输入界面",
   "field.hidden": "隐藏",
   "field.item": "项目",
+  "field.key": "键",
   "field.key-01": "键 1",
   "field.key-02": "键 2",
   "field.key-03": "键 3",
@@ -58,6 +59,7 @@
   "field.request-params": "请求参数",
   "field.requires-review": "需要审查",
   "field.review-approval-line": "审批线",
+  "field.role": "角色",
   "field.serial-no": "序列号",
   "field.spec": "规格",
   "field.stat-function": "统计函数",
@@ -71,6 +73,7 @@
   "field.time-period": "时间单位",
   "field.unit": "单位",
   "field.use-case": "使用案例",
+  "field.view": "屏幕",
   "field.work-date": "工作基准日",
   "field.work-shift": "轮班",
   "label.acceptables": "允许值",