@things-factory/dataset 6.2.73 → 6.2.75

package/helps/dataset/data-set.ja.md

@@ -19,6 +19,16 @@
 
 - **タイムゾーン (timezone)**: スケジュールが適用される基準タイムゾーンを設定します。時間帯変換と関連する作業に使用されます。
 
+- **通常データシナリオ (normalScenario)**：通常データが生成された時に開始されるシナリオを設定します。データの後続処理が必要な場合に使用されます。
+
+- **異常値シナリオ (outlierScenario)**：通常範囲を超えるデータが生成された時に開始されるシナリオを設定します。データの後続処理が必要な場合に使用されます。
+
+- **レビュー必要性 (requiresReview)**：データのレビューが必要かどうかを設定します。設定されると、管理者のレビューとレビュー承認プロセスが自動的に開始されます。
+
+- **レビュー承認ライン (reviewApprovalLine)**：通常データが生成された時、データレビュープロセスの承認ラインを設定します。レビュー作業が必要な場合のみ適用されます。
+
+- **異常値承認ライン (outlierApprovalLine)**：通常範囲を超えるデータが生成された時、データ対応プロセスの承認ラインを設定します。
+
 - **管理者役割 (supervisoryRole)**: データセットの管理者役割を設定します。管理者はデータセットに対する権限と責任を持ちます。
 
 - **入力担当役割 (entryRole)**: 入力権限を持つ役割を設定します。データ入力作業を行う役割を表します。

package/helps/dataset/data-set.ko.md

@@ -19,6 +19,16 @@
 
 - **타임존 (timezone)**: 스케줄이 적용될 기준 타임존을 설정합니다. 시간대 변환과 관련된 작업에 사용됩니다.
 
+- **정상데이타 시나리오 (normalScenario)**: 정상데이타가 생성되었을 때, 시작되는 시나리오를 설정합니다. 데이타 후속 처리가 필요한 경우에 사용됩니다.
+
+- **이상치 시나리오 (outlierScenario)**: 정상범위를 벗어난 데이타가 생성되었을 때, 시작되는 시나리오를 설정합니다. 데이타 후속 처리가 필요한 경우에 사용됩니다.
+
+- **검토 필요 여부 (requiresReview)**: 데이타 검토가 필요한 지 여부를 설정합니다. 설정되면 관리자의 검토와 검토 결재 프로세스가 자동 시작됩니다.
+
+- **검토 결재선 (reviewApprovalLine)**: 정상데이타가 생성되었을 때, 데이타 검토과정의 결재선을 설정합니다. 검토 작업이 필요한 경우에만 적용됩니다.
+
+- **이상치 결재선 (outlierApprovalLine)**: 정상범위를 벗어난 데이타가 생성되었을 때, 데이타 조치 과정의 결재선을 설정합니다.
+
 - **관리자 역할 (supervisoryRole)**: 데이터셋의 관리자 역할을 설정합니다. 관리자는 데이터셋에 대한 권한과 책임을 가집니다.
 
 - **입력 담당 역할 (entryRole)**: 입력 권한을 가진 역할을 설정합니다. 데이터 입력 작업을 수행하는 역할을 나타냅니다.

package/helps/dataset/data-set.md

@@ -19,6 +19,16 @@ DataSets are defined through various settings and information. Below is a detail
 
 - **Timezone (timezone)**: Set the reference timezone for the schedule. Used for time zone conversion related tasks.
 
+- **Normal Data Scenario (normalScenario)**: Sets the scenario that starts when normal data is generated. Used when subsequent data processing is needed.
+
+- **Outlier Scenario (outlierScenario)**: Sets the scenario that starts when data exceeding the normal range is generated. Used when subsequent data processing is needed.
+
+- **Review Requirement (requiresReview)**: Sets whether data review is necessary. If set, the administrator's review and review approval process automatically begins.
+
+- **Review Approval Line (reviewApprovalLine)**: Sets the approval line for the data review process when normal data is generated. Only applies if review work is needed.
+
+- **Outlier Approval Line (outlierApprovalLine)**: Sets the approval line for the data action process when data exceeding the normal range is generated.
+
 - **Supervisory Role (supervisoryRole)**: Set the supervisory role for the DataSet. The supervisor has authority and responsibility for the DataSet.
 
 - **Entry Role (entryRole)**: Set the role with input authority. Represents the role that performs data input tasks.

package/helps/dataset/data-set.ms.md

@@ -19,6 +19,16 @@ Dataset didefinisikan melalui pelbagai tetapan dan maklumat. Berikut adalah pene
 
 - **Zon Waktu (timezone)**: Menetapkan zon waktu rujukan untuk jadual. Digunakan untuk tugas yang berkaitan dengan penukaran zon waktu.
 
+- **Senario Data Normal (normalScenario)**: Apabila data normal dihasilkan, tetapkan senario yang bermula. Digunakan apabila perlukan pemprosesan susulan data.
+
+- **Senario Data Luar Biasa (outlierScenario)**: Apabila data yang melebihi julat normal dihasilkan, tetapkan senario yang bermula. Digunakan apabila perlukan pemprosesan susulan data.
+
+- **Kebutuhan Ulasan (requiresReview)**: Tetapkan sama ada ulasan data diperlukan. Jika ditetapkan, proses ulasan dan kelulusan pengurus akan dimulakan secara automatik.
+
+- **Garis Kelulusan Ulasan (reviewApprovalLine)**: Apabila data normal dihasilkan, tetapkan garis kelulusan proses ulasan data. Hanya digunakan jika kerja ulasan diperlukan.
+
+- **Garis Kelulusan Data Luar Biasa (outlierApprovalLine)**: Apabila data yang melebihi julat normal dihasilkan, tetapkan garis kelulusan proses tindakan data.
+
 - **Peranan Penyelia (supervisoryRole)**: Menetapkan peranan penyelia dataset. Penyelia mempunyai kuasa dan tanggungjawab ke atas dataset.
 
 - **Peranan Penginputan (entryRole)**: Menetapkan peranan yang mempunyai kebenaran penginputan. Mewakili peranan yang menjalankan tugas penginputan data.

package/helps/dataset/data-set.zh.md

@@ -19,6 +19,16 @@
 
 - **时区 (timezone)**：设置计划应用的基准时区。用于相关时间转换工作。
 
+- **正常数据场景 (normalScenario)**：当生成正常数据时，设置启动的场景。在需要数据后续处理的情况下使用。
+
+- **异常数据场景 (outlierScenario)**：当生成超出正常范围的数据时，设置启动的场景。在需要数据后续处理的情况下使用。
+
+- **审查需求 (requiresReview)**：设置是否需要数据审查。设定后，将自动启动管理员的审查和审查批准流程。
+
+- **审查批准线 (reviewApprovalLine)**：当生成正常数据时，设置数据审查过程中的批准线。仅在需要审查工作时适用。
+
+- **异常数据批准线 (outlierApprovalLine)**：当生成超出正常范围的数据时，设置数据处理过程中的批准线。
+
 - **管理员角色 (supervisoryRole)**：设置数据集的管理员角色。管理员拥有数据集的权限和责任。
 
 - **输入负责角色 (entryRole)**：设置拥有输入权限的角色。表示执行数据输入工作的角色。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.2.73",
+  "version": "6.2.75",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -39,17 +39,18 @@
     "@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.73",
+    "@things-factory/board-service": "^6.2.75",
     "@things-factory/env": "^6.2.33",
+    "@things-factory/integration-base": "^6.2.75",
     "@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.73",
+    "@things-factory/worklist": "^6.2.75",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.40",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "eb578bc7a3f5a2301af8ae599d00e929ef3bb6ca"
+  "gitHead": "55d7ca9bf5591461d28cca4640941a3f6df93bc0"
 }

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

@@ -6,6 +6,7 @@ import { Role } from '@things-factory/auth-base'
 import { logger } from '@things-factory/env'
 import { getRedirectSubdomainPath, pubsub } from '@things-factory/shell'
 import { getWorkDateAndShift } from '@things-factory/work-shift'
+import { Scenario } from '@things-factory/integration-base'
 import { Activity } from '@things-factory/worklist'
 import { issue } from '@things-factory/worklist/dist-server/controllers/activity-instance/issue'
 
@@ -62,7 +63,7 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
     relations: ['dataKeySet']
   })
 
-  const { dataItems, tag: publishTag } = dataSet
+  const { dataItems, tag: publishTag, normalScenarioId, outlierScenarioId } = dataSet
   const collectedAt = dataSample.collectedAt || new Date()
 
   const timezone = dataSet.timezone || domain.timezone || 'UTC'
@@ -216,6 +217,43 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
       state: DataOocStatus.ISSUED
     })
 
+    if (outlierScenarioId) {
+      const scenario = await tx.getRepository(Scenario).findOne({
+        where: {
+          domain: { id: domain.id },
+          id: outlierScenarioId
+        },
+        relations: ['domain', 'steps', 'updater']
+      })
+
+      if (scenario) {
+        scenario.start(scenario.name + ':' + dataSet.name + ':' + result.id, {
+          dataOocId: dataOoc.id,
+          dataSampleId: result.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 {
+        console.error(`Cannot find the set outlier-scenario for the dataset(${dataSet.name}).`)
+      }
+    }
+
     const activity = (await tx.getRepository(Activity).findOneBy({
       domain: { id: domain.id },
       name: 'OOC Review'
@@ -253,10 +291,10 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
     }
 
     try {
-      pubsub.publish('data-ooc', {
-        dataOoc,
-        supervisoryRoleId: dataSet.supervisoryRoleId
-      })
+      // pubsub.publish('data-ooc', {
+      //   dataOoc,
+      //   supervisoryRoleId: dataSet.supervisoryRoleId
+      // })
 
       pubsub.publish('notification', {
         notification: {
@@ -271,57 +309,97 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
     } catch (err) {
       logger.error('Notification', err)
     }
-  } else if (dataSet.requiresReview) {
-    const activity = (await tx.getRepository(Activity).findOneBy({
-      domain: { id: domain.id },
-      name: 'Data Review'
-    })) as Activity
-
-    if (activity) {
-      const assignee =
-        dataSet.supervisoryRoleId &&
-        (await tx.getRepository(Role).findOneBy({ domain: { id: domain.id }, id: dataSet.supervisoryRoleId }))
-
-      const assignees = dataSet.supervisoryRoleId ? [{ type: 'Role', value: dataSet.supervisoryRoleId, assignee }] : []
+  } else {
+    if (normalScenarioId) {
+      const scenario = await tx.getRepository(Scenario).findOne({
+        where: {
+          domain: { id: domain.id },
+          id: normalScenarioId
+        },
+        relations: ['domain', 'steps', 'updater']
+      })
 
-      /* 해당 dataset의 supervisor로 하여금, data를 리뷰하고 instruction을 작성해서, approvalLine을 이용해서 승인을 한다. */
-      if (assignees && assignees instanceof Array && assignees.length > 0) {
-        result.dataItems = dataItems
-        const activityInstance = {
-          name: `[Data 검토] ${dataSet.name}`,
-          description: dataSet.description,
-          activityId: activity.id,
-          dueAt: new Date(collectedAt.getTime() + 24 * 60 * 60 * 1000),
-          input: {
-            dataSample: result
+      if (scenario) {
+        scenario.start(scenario.name + ':' + dataSet.name + ':' + result.id, {
+          dataSampleId: result.id,
+          dataSet: dataSet.id,
+          data,
+          ooc,
+          oos,
+          judgment,
+          collectedAt,
+          workDate,
+          workShift,
+          domain: {
+            id: domain.id,
+            subdomain: domain.subdomain,
+            name: domain.name
           },
-          assignees,
-          approvalLine: dataSet.reviewApprovalLine
-        }
+          updator: {
+            id: user.id,
+            email: user.email,
+            name: user.name
+          }
+        })
+      } else {
+        console.error(`Cannot find the set normal-scenario for the dataset(${dataSet.name}).`)
+      }
+    }
 
-        await issue(activityInstance, context)
+    if (dataSet.requiresReview) {
+      const activity = (await tx.getRepository(Activity).findOneBy({
+        domain: { id: domain.id },
+        name: 'Data Review'
+      })) as Activity
+
+      if (activity) {
+        const assignee =
+          dataSet.supervisoryRoleId &&
+          (await tx.getRepository(Role).findOneBy({ domain: { id: domain.id }, id: dataSet.supervisoryRoleId }))
+
+        const assignees = dataSet.supervisoryRoleId
+          ? [{ type: 'Role', value: dataSet.supervisoryRoleId, assignee }]
+          : []
+
+        /* 해당 dataset의 supervisor로 하여금, data를 리뷰하고 instruction을 작성해서, approvalLine을 이용해서 승인을 한다. */
+        if (assignees && assignees instanceof Array && assignees.length > 0) {
+          result.dataItems = dataItems
+          const activityInstance = {
+            name: `[Data 검토] ${dataSet.name}`,
+            description: dataSet.description,
+            activityId: activity.id,
+            dueAt: new Date(collectedAt.getTime() + 24 * 60 * 60 * 1000),
+            input: {
+              dataSample: result
+            },
+            assignees,
+            approvalLine: dataSet.reviewApprovalLine
+          }
 
-        try {
-          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}`),
-              timestamp: collectedAt
-            }
-          })
-        } catch (err) {
-          logger.error('Notification', err)
+          await issue(activityInstance, context)
+
+          try {
+            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-sample/${result.id}`),
+                timestamp: collectedAt
+              }
+            })
+          } catch (err) {
+            logger.error('Notification', err)
+          }
+        } else {
+          console.error(
+            `Assignees are not set. So Data Review task for ${dataSet.name}(${dataSet.id}) could not be issued.`
+          )
         }
       } else {
-        console.error(
-          `Assignees are not set. So Data Review task for ${dataSet.name}(${dataSet.id}) could not be issued.`
-        )
+        console.error('Data Review Activity not installed.')
       }
-    } else {
-      console.error('Data Review Activity not installed.')
     }
   }
 

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

@@ -78,7 +78,6 @@ function getOutlierApprovalLineValue(patch: NewDataSet | DataSetPatch): Approval
     })
 }
 
-
 function getAssigneesValue(patch: NewDataSet | DataSetPatch): AssigneeItem[] {
   const { assignees } = patch
 

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

@@ -7,6 +7,7 @@ import { Board } from '@things-factory/board-service'
 import { ApprovalLineItem } from '@things-factory/organization'
 import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
 import { AssigneeItem } from '@things-factory/worklist'
+import { Scenario } from '@things-factory/integration-base'
 
 import { DataKeySet } from '../data-key-set/data-key-set'
 import { DataSample } from '../data-sample/data-sample'
@@ -266,6 +267,28 @@ export class DataSetQuery {
     )
   }
 
+  @FieldResolver(type => Role)
+  async normalScenario(@Root() dataSet: DataSet): Promise<Role> {
+    return (
+      dataSet.normalScenario ||
+      (dataSet.normalScenarioId &&
+        (await getRepository(Scenario).findOneBy({
+          id: dataSet.normalScenarioId
+        })))
+    )
+  }
+
+  @FieldResolver(type => Role)
+  async outlierScenario(@Root() dataSet: DataSet): Promise<Role> {
+    return (
+      dataSet.outlierScenario ||
+      (dataSet.outlierScenarioId &&
+        (await getRepository(Scenario).findOneBy({
+          id: dataSet.outlierScenarioId
+        })))
+    )
+  }
+
   @FieldResolver(type => Domain)
   async domain(@Root() dataSet: DataSet): Promise<Domain> {
     return dataSet.domainId && (await getRepository(Domain).findOneBy({ id: dataSet.domainId }))

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

@@ -38,6 +38,12 @@ export class NewDataSet {
   @Field(type => ScalarObject, { nullable: true })
   outlierApprovalLine?: ApprovalLineItem[]
 
+  @Field(type => ObjectRef, { nullable: true })
+  normalScenario?: ObjectRef
+
+  @Field(type => ObjectRef, { nullable: true })
+  outlierScenario?: ObjectRef
+
   @Field({ nullable: true })
   active?: boolean
 
@@ -119,6 +125,12 @@ export class DataSetPatch {
   @Field(type => ScalarObject, { nullable: true })
   outlierApprovalLine?: ApprovalLineItem[]
 
+  @Field(type => ObjectRef, { nullable: true })
+  normalScenario?: ObjectRef
+
+  @Field(type => ObjectRef, { nullable: true })
+  outlierScenario?: ObjectRef
+
   @Field({ nullable: true })
   active?: boolean
 

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

@@ -15,6 +15,7 @@ import { Role, User } from '@things-factory/auth-base'
 import { ApprovalLineItem } from '@things-factory/organization'
 import { Domain, ScalarObject } from '@things-factory/shell'
 import { AssigneeItem } from '@things-factory/worklist'
+import { Scenario } from '@things-factory/integration-base'
 
 import { DataKeySet } from '../data-key-set/data-key-set'
 import { DataItem } from './data-item-type'
@@ -167,6 +168,26 @@ export class DataSet {
   })
   outlierApprovalLine?: ApprovalLineItem[]
 
+  @ManyToOne(type => Scenario, { nullable: true })
+  @Field(type => Scenario, {
+    nullable: true,
+    description: 'Scenario for handling normal data-sample occurance for that dataset'
+  })
+  normalScenario?: Scenario
+
+  @RelationId((dataSet: DataSet) => dataSet.normalScenario)
+  normalScenarioId?: string
+
+  @ManyToOne(type => Scenario, { nullable: true })
+  @Field(type => Scenario, {
+    nullable: true,
+    description: 'Scenario for handling abnormal data-sample occurance issues for that dataset'
+  })
+  outlierScenario?: Scenario
+
+  @RelationId((dataSet: DataSet) => dataSet.outlierScenario)
+  outlierScenarioId?: string
+
   @Column({ nullable: true })
   @Field({ nullable: true, description: 'The type of the dataset' })
   type?: 'manual' | 'automatic' | string
@@ -240,6 +261,10 @@ export class DataSet {
   @Field({ nullable: true, description: 'The schedule of the dataset' })
   schedule?: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true, description: 'The schedule ID of the dataset' })
+  scheduleId?: string
+
   @Column({ nullable: true })
   @Field({ nullable: true, description: 'The timezone of the dataset' })
   timezone?: string
@@ -248,10 +273,6 @@ export class DataSet {
   @Field({ nullable: true, description: 'Indicates if the dataset requires review' })
   requiresReview?: boolean
 
-  @Column({ nullable: true })
-  @Field({ nullable: true, description: 'The schedule ID of the dataset' })
-  scheduleId?: string
-
   @Column({ nullable: true })
   @Field({ nullable: true, description: 'The summary period of the dataset' })
   summaryPeriod?: DataSetSummaryPeriodType

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

@@ -46,22 +46,20 @@ export class DataSetHistoryQuery {
   @FieldResolver(type => Role)
   async entryRole(@Root() dataSetHistory: DataSetHistory): Promise<Role> {
     return (
-      dataSetHistory.entryRole ||
-      (dataSetHistory.entryRoleId &&
-        (await getRepository(Role).findOneBy({
-          id: dataSetHistory.entryRoleId
-        })))
+      dataSetHistory.entryRoleId &&
+      (await getRepository(Role).findOneBy({
+        id: dataSetHistory.entryRoleId
+      }))
     )
   }
 
   @FieldResolver(type => Role)
   async supervisoryRole(@Root() dataSetHistory: DataSetHistory): Promise<Role> {
     return (
-      dataSetHistory.supervisoryRole ||
-      (dataSetHistory.supervisoryRoleId &&
-        (await getRepository(Role).findOneBy({
-          id: dataSetHistory.supervisoryRoleId
-        })))
+      dataSetHistory.supervisoryRoleId &&
+      (await getRepository(Role).findOneBy({
+        id: dataSetHistory.supervisoryRoleId
+      }))
     )
   }
 

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

@@ -7,13 +7,20 @@ import {
   HistoryEntityInterface,
   HistoryOriginalIdColumn
 } from '@operato/typeorm-history'
-import { Role, User } from '@things-factory/auth-base'
-import { config } from '@things-factory/env'
+import { User } from '@things-factory/auth-base'
+import { ApprovalLineItem } from '@things-factory/organization'
 import { Domain, ScalarObject } from '@things-factory/shell'
+import { AssigneeItem } from '@things-factory/worklist'
+import { config } from '@things-factory/env'
 
-import { DataKeySet } from '../data-key-set/data-key-set'
 import { DataItem } from '../data-set/data-item-type'
-import { DataSet, DataSetEntryType, DataSetMonitorType, DataSetReportType } from '../data-set/data-set'
+import {
+  DataSet,
+  DataSetEntryType,
+  DataSetMonitorType,
+  DataSetReportType,
+  DataSetSummaryPeriodType
+} from '../data-set/data-set'
 
 const ORMCONFIG = config.get('ormconfig', {})
 const DATABASE_TYPE = ORMCONFIG.type
@@ -56,29 +63,44 @@ export class DataSetHistory implements HistoryEntityInterface<DataSet> {
 
   @Column({ nullable: true })
   @Field({ nullable: true })
-  active?: boolean
+  tag?: string
 
-  @ManyToOne(type => DataKeySet, { nullable: true })
-  @Field(type => DataKeySet, { nullable: true })
-  dataKeySet?: DataKeySet
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  active?: boolean
 
-  @RelationId((dataSet: DataSet) => dataSet.dataKeySet)
+  @Column({ nullable: true })
+  @Field({ nullable: true })
   dataKeySetId?: string
 
-  @ManyToOne(type => Role, { nullable: true })
-  @Field(type => Role, { nullable: true })
-  entryRole?: Role
-
-  @RelationId((dataSetHistory: DataSetHistory) => dataSetHistory.entryRole)
+  @Column({ nullable: true })
+  @Field({ nullable: true })
   entryRoleId?: string
 
-  @ManyToOne(type => Role, { nullable: true })
-  @Field(type => Role, { nullable: true })
-  supervisoryRole?: Role
-
-  @RelationId((dataSetHistory: DataSetHistory) => dataSetHistory.supervisoryRole)
+  @Column({ nullable: true })
+  @Field({ nullable: true })
   supervisoryRoleId?: string
 
+  @Column('simple-json', { nullable: true })
+  @Field(type => [AssigneeItem], { nullable: true })
+  assignees?: AssigneeItem[]
+
+  @Column('simple-json', { nullable: true })
+  @Field(type => [ApprovalLineItem], { nullable: true })
+  reviewApprovalLine?: ApprovalLineItem[]
+
+  @Column('simple-json', { nullable: true })
+  @Field(type => [ApprovalLineItem], { nullable: true })
+  outlierApprovalLine?: ApprovalLineItem[]
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  normalScenarioId?: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  outlierScenarioId?: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   type?: 'manual' | 'automatic' | string
@@ -126,10 +148,30 @@ export class DataSetHistory implements HistoryEntityInterface<DataSet> {
   @Field({ nullable: true })
   schedule?: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  scheduleId?: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   timezone?: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  requiresReview?: boolean
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  summaryPeriod?: DataSetSummaryPeriodType
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  summarySchedule?: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  summaryScheduleId?: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   createdAt?: Date

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'

package/translations/en.json

@@ -44,10 +44,12 @@
   "field.netmask": "network mask",
   "field.next-schedule": "next schedule",
   "field.next-summary-schedule": "next summary schedule",
+  "field.normal-scenario": "normal scenario",
   "field.ooc": "out of control limit",
   "field.oos": "out of critical limit",
   "field.options": "options",
   "field.outlier-approval-line": "outlier approval line",
+  "field.outlier-scenario": "outlier scenario",
   "field.partition-keys": "partition keys",
   "field.prev-schedule": "previous schedule",
   "field.quota": "sampling #",

package/translations/ja.json

@@ -44,10 +44,12 @@
   "field.netmask": "ネットワーク マスク",
   "field.next-schedule": "次の収集計画",
   "field.next-summary-schedule": "次のサマリー スケジュール",
+  "field.normal-scenario": "正常データシナリオ",
   "field.ooc": "管理限界離脱有無",
   "field.oos": "許容限界離脱有無",
   "field.options": "選択オプション",
   "field.outlier-approval-line": "異常承認ライン",
+  "field.outlier-scenario": "異常データシナリオ",
   "field.partition-keys": "パーティション キー",
   "field.prev-schedule": "以前の収集計画",
   "field.quota": "サンプル数",