@things-factory/dataset 6.2.72 → 6.2.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.2.72",
+  "version": "6.2.74",
   "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.74",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.40",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "c7a65f34520199ca43fdc75749924799d7952747"
+  "gitHead": "01e9406e03162997a53ab93747c1a3b66544b4cf"
 }

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,18 +302,13 @@ 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,
               type: 'info',
               title: `[Data Review] ${dataSet.name}`,
               body: `Data Review occurred on '${dataSet.name}'`,
-              url: getRedirectSubdomainPath(context, domain.subdomain, `/data-set/${dataSet.id}`),
+              url: getRedirectSubdomainPath(context, domain.subdomain, `/data-sample/${result.id}`),
               timestamp: collectedAt
             }
           })

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/things-factory.config.js

@@ -12,6 +12,10 @@ export default {
       tagname: 'data-sensor-list-page',
       page: 'data-sensor-list'
     },
+    {
+      tagname: 'data-sample-view-page',
+      page: 'data-sample'
+    },
     {
       tagname: 'data-sample-list-page',
       page: 'data-sample-list'