@things-factory/dataset 6.2.161 → 6.2.163

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.2.161",
+  "version": "6.2.163",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -40,20 +40,20 @@
     "@operato/shell": "^1.0.1",
     "@operato/styles": "^1.0.0",
     "@operato/utils": "^1.0.1",
-    "@things-factory/auth-base": "^6.2.158",
-    "@things-factory/aws-base": "^6.2.158",
-    "@things-factory/board-service": "^6.2.160",
+    "@things-factory/auth-base": "^6.2.162",
+    "@things-factory/aws-base": "^6.2.162",
+    "@things-factory/board-service": "^6.2.163",
     "@things-factory/env": "^6.2.139",
-    "@things-factory/integration-base": "^6.2.158",
-    "@things-factory/organization": "^6.2.160",
-    "@things-factory/scheduler-client": "^6.2.158",
-    "@things-factory/shell": "^6.2.158",
-    "@things-factory/work-shift": "^6.2.158",
-    "@things-factory/worklist": "^6.2.160",
+    "@things-factory/integration-base": "^6.2.163",
+    "@things-factory/organization": "^6.2.162",
+    "@things-factory/scheduler-client": "^6.2.162",
+    "@things-factory/shell": "^6.2.162",
+    "@things-factory/work-shift": "^6.2.162",
+    "@things-factory/worklist": "^6.2.163",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.40",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "914b1dc22c1f532dbae28088363e6ca90411eb13"
+  "gitHead": "9709a69dcd717d56fb6d84d0f2c6a92c22d09f0c"
 }

package/server/activities/activity-ooc-review.ts

@@ -1,3 +1,4 @@
+import { In } from 'typeorm'
 import { Activity, ActivityInstance, ActivityInstanceStatus, UpdateActivityInstanceStateAddendum } from '@things-factory/worklist'
 import { issue } from '@things-factory/worklist/dist-server/controllers/activity-instance/issue'
 
@@ -10,7 +11,7 @@ async function callback(activityInstance: ActivityInstance, addendum: UpdateActi
 
   if (state == ActivityInstanceStatus.Ended) {
     const activity = (await tx.getRepository(Activity).findOneBy({
-      domain: { id: domain.id },
+      domain: domain.parentId ? In([domain.id, domain.parentId]) : { id: domain.id },
       name: 'OOC Resolve'
     })) as Activity
 

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

@@ -228,26 +228,31 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
       })
 
       if (scenario) {
-        scenario.start(scenario.name + ':' + dataSet.name + ':' + dataSample.id, {
-          dataOocId: dataOoc.id,
-          dataSampleId: dataSample.id,
-          dataSet: dataSet.id,
-          data,
-          ooc,
-          oos,
-          judgment,
-          collectedAt,
-          workDate,
-          workShift,
-          domain: {
-            id: domain.id,
-            subdomain: domain.subdomain,
-            name: domain.name
-          },
-          updator: {
-            id: user.id,
-            email: user.email,
-            name: user.name
+        scenario.start({
+          instanceName: scenario.name + ':' + dataSet.name + ':' + dataSample.id,
+          domain,
+          user,
+          variables: {
+            dataOocId: dataOoc.id,
+            dataSampleId: dataSample.id,
+            dataSet: dataSet.id,
+            data,
+            ooc,
+            oos,
+            judgment,
+            collectedAt,
+            workDate,
+            workShift,
+            domain: {
+              id: domain.id,
+              subdomain: domain.subdomain,
+              name: domain.name
+            },
+            updator: {
+              id: user.id,
+              email: user.email,
+              name: user.name
+            }
           }
         })
       } else {
@@ -256,12 +261,14 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
     }
 
     const activity = (await tx.getRepository(Activity).findOneBy({
-      domain: { id: domain.id },
+      domain: domain.parentId ? { id: In([domain.id, domain.parentId]) } : { id: domain.id },
       name: 'OOC Review'
     })) as Activity
 
     if (activity) {
-      const assignee = dataSet.supervisoryRoleId && (await tx.getRepository(Role).findOneBy({ domain: { id: domain.id }, id: dataSet.supervisoryRoleId }))
+      const assignee =
+        dataSet.supervisoryRoleId &&
+        (await tx.getRepository(Role).findOneBy({ domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, id: dataSet.supervisoryRoleId }))
 
       const assignees = dataSet.supervisoryRoleId ? [{ type: 'Role', value: dataSet.supervisoryRoleId, assignee }] : []
 
@@ -285,7 +292,7 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
         console.error(`Assignees are not set. So Data OOC Review task for ${dataOoc.name}(${dataOoc.id}) could not be issued.`)
       }
     } else {
-      console.error('OOC Review Activity not installed.')
+      console.warn('OOC Review Activity not installed.')
     }
 
     try {
@@ -311,32 +318,37 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
     if (normalScenarioId) {
       const scenario = await tx.getRepository(Scenario).findOne({
         where: {
-          domain: domain.parentId ? { id: In([domain.id, domain.parentId]) } : { id: domain.id },
+          domain: { id: In([domain.id, domain.parentId].filter(Boolean)) },
           id: normalScenarioId
         },
         relations: ['domain', 'steps', 'updater']
       })
 
       if (scenario) {
-        scenario.start(scenario.name + ':' + dataSet.name + ':' + dataSample.id, {
-          dataSampleId: dataSample.id,
-          dataSet: dataSet.id,
-          data,
-          ooc,
-          oos,
-          judgment,
-          collectedAt,
-          workDate,
-          workShift,
-          domain: {
-            id: domain.id,
-            subdomain: domain.subdomain,
-            name: domain.name
-          },
-          updator: {
-            id: user.id,
-            email: user.email,
-            name: user.name
+        scenario.start({
+          instanceName: scenario.name + ':' + dataSet.name + ':' + dataSample.id,
+          domain,
+          user,
+          variables: {
+            dataSampleId: dataSample.id,
+            dataSet: dataSet.id,
+            data,
+            ooc,
+            oos,
+            judgment,
+            collectedAt,
+            workDate,
+            workShift,
+            domain: {
+              id: domain.id,
+              subdomain: domain.subdomain,
+              name: domain.name
+            },
+            updator: {
+              id: user.id,
+              email: user.email,
+              name: user.name
+            }
           }
         })
       } else {
@@ -346,12 +358,14 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
 
     if (dataSet.requiresReview) {
       const activity = (await tx.getRepository(Activity).findOneBy({
-        domain: { id: domain.id },
+        domain: { id: In([domain.id, domain.parentId].filter(Boolean)) },
         name: 'Data Review'
       })) as Activity
 
       if (activity) {
-        const assignee = dataSet.supervisoryRoleId && (await tx.getRepository(Role).findOneBy({ domain: { id: domain.id }, id: dataSet.supervisoryRoleId }))
+        const assignee =
+          dataSet.supervisoryRoleId &&
+          (await tx.getRepository(Role).findOneBy({ domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, id: dataSet.supervisoryRoleId }))
 
         const assignees = dataSet.supervisoryRoleId ? [{ type: 'Role', value: dataSet.supervisoryRoleId, assignee }] : []
 

package/server/controllers/issue-collect-data.ts

@@ -23,7 +23,7 @@ export async function issueCollectData(domainId: string, dataSetId: string, cont
     })
 
     const activity = (await tx.getRepository(Activity).findOneBy({
-      domain: { id: domain.id },
+      domain: { id: In([domain.id, domain.parentId].filter(Boolean)) },
       name: 'Collect Data'
     })) as Activity
 

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

@@ -66,7 +66,8 @@ export class DataSetQuery {
       where: { id: user.id },
       relations: ['roles']
     })
-    const roles = user.roles.filter(role => role.domainId === domain.id).map(role => role.id)
+
+    const roles = user.roles.filter(role => role.domainId === domain.id || (domain.parentId && role.domainId === domain.parentId)).map(role => role.id)
 
     if (!roles.length) {
       return { items: [], total: 0 }