@things-factory/dataset 6.0.25 → 6.0.28

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

@@ -85,6 +85,18 @@ export class DataOoc {
   @Field({ nullable: true })
   state?: DataOocStatus
 
+  @Column({
+    nullable: true,
+    type:
+      DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
+        ? 'longtext'
+        : DATABASE_TYPE == 'oracle'
+        ? 'clob'
+        : 'varchar'
+  })
+  @Field({ nullable: true })
+  correctiveInstruction?: string
+
   @Column({
     nullable: true,
     type:
@@ -178,6 +190,10 @@ export class DataOoc {
   @Field({ nullable: true })
   collectedAt?: Date
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  reviewedAt?: Date
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   correctedAt?: Date
@@ -190,6 +206,13 @@ export class DataOoc {
   @Field({ nullable: true })
   updatedAt?: Date
 
+  @ManyToOne(type => User, { nullable: true })
+  @Field({ nullable: true })
+  reviewer?: User
+
+  @RelationId((dataOoc: DataOoc) => dataOoc.reviewer)
+  reviewerId?: string
+
   @ManyToOne(type => User, { nullable: true })
   @Field({ nullable: true })
   corrector?: User

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

@@ -2,6 +2,7 @@ import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
 import { In } from 'typeorm'
 
 import { createAttachment, deleteAttachmentsByRef } from '@things-factory/attachment-base'
+import { registerSchedule, unregisterSchedule } from '@things-factory/scheduler-client'
 
 import { DataSet } from './data-set'
 import { DataSetPatch, NewDataSet } from './data-set-type'
@@ -129,6 +130,7 @@ export class DataSetMutation {
 
     await tx.getRepository(DataSet).delete({ domain: { id: domain.id }, id })
     await deleteAttachmentsByRef(null, { refBys: [`report-${id}`] }, context)
+
     return true
   }
 
@@ -148,6 +150,103 @@ export class DataSetMutation {
     return true
   }
 
+  @Directive('@transaction')
+  @Mutation(returns => DataSet, { description: 'To start data collection schedule for the given dataset' })
+  async startDataCollectionSchedule(
+    @Arg('dataSetId') dataSetId: string,
+    @Ctx() context: ResolverContext
+  ): Promise<DataSet> {
+    const { domain, tx } = context.state
+
+    var repository = tx.getRepository(DataSet)
+    var dataSet = await repository.findOne({
+      where: { domain: { id: domain.id }, id: dataSetId }
+    })
+
+    if (!dataSet) {
+      throw new Error(
+        context.t('error.data-set not found', {
+          dataSet: dataSetId
+        })
+      )
+    }
+
+    try {
+      var handle = await registerSchedule({
+        name: dataSet.name,
+        client: {
+          application: 'operato-dataset',
+          group: `${domain.id}`,
+          key: dataSet.id
+        },
+        type: 'cron',
+        schedule: dataSet.schedule,
+        task: {
+          type: 'rest',
+          connection: {
+            host: 'http://localhost:3000/callback-schedule-for-dataset',
+            headers: {
+              'Content-Type': 'application/json',
+              accept: '*/*'
+            }
+          },
+          data: {
+            application: 'dataset',
+            id: dataSet.id
+          },
+          history_check: true,
+          failed_policy: 'retry_dlq',
+          max_retry_count: 3
+        }
+      })
+
+      return await repository.save({
+        ...dataSet,
+        schedulerHandle: handle
+      })
+    } catch (err) {
+      console.error('stopDataCollectionSchedule', err)
+    }
+  }
+
+  @Directive('@transaction')
+  @Mutation(returns => DataSet, {
+    nullable: true,
+    description: 'To stop data collection schedule for the given dataset'
+  })
+  async stopDataCollectionSchedule(
+    @Arg('dataSetId') dataSetId: string,
+    @Ctx() context: ResolverContext
+  ): Promise<DataSet | undefined> {
+    const { domain, tx } = context.state
+
+    var repository = tx.getRepository(DataSet)
+    var dataSet = await repository.findOne({
+      where: { domain: { id: domain.id }, id: dataSetId }
+    })
+
+    if (!dataSet) {
+      throw new Error(
+        context.t('error.data-set not found', {
+          dataSet: dataSetId
+        })
+      )
+    }
+
+    try {
+      const handle = await unregisterSchedule({
+        resp_id: dataSet.schedulerHandle
+      })
+
+      return await repository.save({
+        ...dataSet,
+        schedulerHandle: null
+      })
+    } catch (err) {
+      console.error('stopDataCollectionSchedule', err)
+    }
+  }
+
   @Directive('@privilege(category: "data-set", privilege: "mutation", domainOwnerGranted: true)')
   @Directive('@transaction')
   @Mutation(returns => Boolean, { description: 'To import multiple data-sets' })

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

@@ -8,7 +8,7 @@ import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from
 import { DataKeySet } from '../data-key-set/data-key-set'
 import { DataSample } from '../data-sample/data-sample'
 import { DataItem } from './data-item-type'
-import { DataSet } from './data-set'
+import { DataSet, DataSetState } from './data-set'
 import { DataSetList } from './data-set-type'
 
 var parser = require('cron-parser')
@@ -43,6 +43,27 @@ export class DataSetQuery {
     return { items, total }
   }
 
+  // @Directive('@privilege(category: "data-set", privilege: "query", domainOwnerGranted: true)')
+  // @Query(returns => DataSetStateList, { description: 'To fetch multiple status of DataSets' })
+  // async dataSetsStatus(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<DataSetStateList> {
+  //   const { domain } = context.state
+
+  //   // scheduler server에 group내 schedule list를 조회한다.
+  //   const queryBuilder = getQueryBuilderFromListParams({
+  //     repository: getRepository(DataSet),
+  //     params,
+  //     domain,
+  //     alias: 'dataset',
+  //     searchables: ['name', 'description', 'supervisoryRole']
+  //   })
+
+  //   const [items, total] = await queryBuilder.getManyAndCount()
+
+  //   return { items: [{
+
+  //   }], total }
+  // }
+
   @Query(returns => DataSetList, { description: 'To fetch multiple DataSets for data entry manually' })
   async dataSetsForEntry(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<DataSetList> {
     var { domain, user } = context.state
@@ -101,6 +122,18 @@ export class DataSetQuery {
     return { items, total }
   }
 
+  @FieldResolver(type => DataSetState)
+  async status(@Root() dataSet: DataSet): Promise<DataSetState> {
+    // get information from scheduler service
+    return {
+      id: '',
+      schedulerHandle: '',
+      state: '',
+      startedAt: new Date(),
+      nextSchedule: new Date()
+    }
+  }
+
   @FieldResolver(type => [DataItem])
   async dataItems(@Root() dataSet: DataSet): Promise<DataItem[]> {
     if (dataSet.dataItems instanceof Array) {
@@ -150,9 +183,10 @@ export class DataSetQuery {
   async dataKeySet(@Root() dataSet: DataSet) {
     return (
       dataSet.dataKeySet ||
-      (await getRepository(DataKeySet).findOneBy({
-        id: dataSet.dataKeySetId
-      }))
+      (dataSet.dataKeySetId &&
+        (await getRepository(DataKeySet).findOneBy({
+          id: dataSet.dataKeySetId
+        })))
     )
   }
 
@@ -174,7 +208,7 @@ export class DataSetQuery {
   @FieldResolver(type => Date, { nullable: true })
   async latestCollectedAt(@Root() dataSet: DataSet): Promise<Date> {
     const sample = await getRepository(DataSample).findOne({
-      select: ['collectedAt'],
+      select: ['id', 'collectedAt'],
       where: { dataSet: { id: dataSet.id } },
       order: { collectedAt: 'DESC' }
     })

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

@@ -3,6 +3,8 @@ import GraphQLUpload from 'graphql-upload/GraphQLUpload.js'
 import { Field, ID, InputType, Int, ObjectType } from 'type-graphql'
 
 import { ObjectRef, ScalarObject } from '@things-factory/shell'
+import { ApprovalLineItem } from '@things-factory/organization'
+import { AssigneeItem } from '@things-factory/worklist'
 
 import { DataItemPatch } from './data-item-type'
 import { DataSet, DataSetEntryType, DataSetMonitorType, DataSetReportType } from './data-set'
@@ -24,6 +26,12 @@ export class NewDataSet {
   @Field(type => ObjectRef, { nullable: true })
   supervisoryRole?: ObjectRef
 
+  @Field(type => ScalarObject, { nullable: true })
+  assignees?: AssigneeItem[]
+
+  @Field(type => ScalarObject, { nullable: true })
+  approvalLine?: ApprovalLineItem[]
+
   @Field({ nullable: true })
   active?: boolean
 
@@ -87,6 +95,12 @@ export class DataSetPatch {
   @Field(type => ObjectRef, { nullable: true })
   entryRole?: ObjectRef
 
+  @Field(type => ScalarObject, { nullable: true })
+  assignees?: AssigneeItem[]
+
+  @Field(type => ScalarObject, { nullable: true })
+  approvalLine?: ApprovalLineItem[]
+
   @Field({ nullable: true })
   active?: boolean
 

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

@@ -13,6 +13,8 @@ import {
 
 import { Role, User } from '@things-factory/auth-base'
 import { Domain, ScalarObject } from '@things-factory/shell'
+import { ApprovalLineItem } from '@things-factory/organization'
+import { AssigneeItem } from '@things-factory/worklist'
 
 import { DataKeySet } from '../data-key-set/data-key-set'
 import { DataItem } from './data-item-type'
@@ -20,6 +22,7 @@ import { DataItem } from './data-item-type'
 export enum DataSetEntryType {
   Generated = 'generated',
   Board = 'board',
+  CustomElement = 'custom-element',
   Page = 'page',
   ExternalURL = 'external',
   Jasper = 'jasper',
@@ -34,6 +37,7 @@ registerEnumType(DataSetEntryType, {
 export enum DataSetMonitorType {
   Generated = 'generated',
   Board = 'board',
+  CustomElement = 'custom-element',
   Page = 'page',
   ExternalURL = 'external'
 }
@@ -46,6 +50,7 @@ registerEnumType(DataSetMonitorType, {
 export enum DataSetReportType {
   Generated = 'generated',
   Board = 'board',
+  CustomElement = 'custom-element',
   Page = 'page',
   ExternalURL = 'external'
 }
@@ -55,6 +60,24 @@ registerEnumType(DataSetReportType, {
   description: 'report type enumeration for data-set'
 })
 
+@ObjectType()
+export class DataSetState {
+  @Field()
+  id: string
+
+  @Field()
+  schedulerHandle: string
+
+  @Field()
+  state: string
+
+  @Field()
+  startedAt: Date
+
+  @Field()
+  nextSchedule: Date
+}
+
 @Entity()
 @Index('ix_data_set_0', (dataSet: DataSet) => [dataSet.domain, dataSet.name], { unique: true })
 @ObjectType({ description: 'Entity for DataSet' })
@@ -94,19 +117,33 @@ export class DataSet {
   dataKeySetId?: string
 
   @ManyToOne(type => Role, { nullable: true })
-  @Field(type => Role, { nullable: true })
+  @Field(type => Role, {
+    nullable: true,
+    description: 'The person responsible for manually entering the data for that dataset'
+  })
   entryRole?: Role
 
   @RelationId((dataSet: DataSet) => dataSet.entryRole)
   entryRoleId?: string
 
   @ManyToOne(type => Role, { nullable: true })
-  @Field(type => Role, { nullable: true })
+  @Field(type => Role, { nullable: true, description: 'The final authority on issues related to that dataset.' })
   supervisoryRole?: Role
 
   @RelationId((dataSet: DataSet) => dataSet.supervisoryRole)
   supervisoryRoleId?: string
 
+  @Column('simple-json', { nullable: true })
+  @Field(type => [AssigneeItem], { nullable: true, description: 'Who to contact for OOC issues' })
+  assignees?: AssigneeItem[]
+
+  @Column('simple-json', { nullable: true })
+  @Field(type => [ApprovalLineItem], {
+    nullable: true,
+    description: 'Approval line for handling OOC issues for that dataset'
+  })
+  approvalLine?: ApprovalLineItem[]
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   type?: 'manual' | 'automatic' | string
@@ -158,6 +195,10 @@ export class DataSet {
   @Field({ nullable: true })
   timezone?: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  schedulerHandle?: string
+
   @CreateDateColumn()
   @Field({ nullable: true })
   createdAt?: Date

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

@@ -83,9 +83,10 @@ export class DataSetHistoryQuery {
   async dataKeySet(@Root() dataSet: DataSet) {
     return (
       dataSet.dataKeySet ||
-      (await getRepository(DataKeySet).findOneBy({
-        id: dataSet.dataKeySetId
-      }))
+      (dataSet.dataKeySetId &&
+        (await getRepository(DataKeySet).findOneBy({
+          id: dataSet.dataKeySetId
+        })))
     )
   }
 

package/server/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig-base.json",
+  "compilerOptions": {
+    "strict": false,
+    "module": "commonjs",
+    "outDir": "../dist-server",
+    "baseUrl": "./"
+  },
+  "include": ["./**/*"]
+}

package/things-factory.config.js

@@ -1,5 +1,5 @@
-import bootstrap from './client/bootstrap'
-import route from './client/route'
+import bootstrap from './dist-client/bootstrap'
+import route from './dist-client/route'
 
 export default {
   route,
@@ -20,6 +20,10 @@ export default {
       tagname: 'data-sample-search-page',
       page: 'data-sample-search'
     },
+    {
+      tagname: 'data-ooc-view-page',
+      page: 'data-ooc'
+    },
     {
       tagname: 'data-ooc-list-page',
       page: 'data-ooc-list'

package/translations/en.json

@@ -1,8 +1,10 @@
 {
   "button.corrected": "corrected",
-  "button.request": "request",
+  "button.request-archive": "request archive",
   "button.reviewed": "reviewed",
   "field.appliance": "appliance",
+  "field.approval-line": "approval line",
+  "field.assignees": "assignees",
   "field.collected_at": "collected at",
   "field.corrective-action": "corrective action",
   "field.corrector": "corrector",

package/translations/ko.json

@@ -1,8 +1,10 @@
 {
   "button.corrected": "조치완료",
   "button.reviewed": "검토완료",
-  "button.request": "요청",
+  "button.request-archive": "자료보관 신규 요청",
   "field.appliance": "어플라이언스",
+  "field.approval-line": "결재라인",
+  "field.assignees": "할당자 목록",
   "field.collected_at": "수집일시",
   "field.corrected-at": "조치 시간",
   "field.corrective-action": "조치 활동",

package/translations/ms.json

@@ -1,7 +1,10 @@
 {
   "button.corrected": "corrected",
+  "button.request-archive": "request archive",
   "button.reviewed": "reviewed",
   "field.appliance": "appliance",
+  "field.approval-line": "approval line",
+  "field.assignees": "assignees",
   "field.collected_at": "collected at",
   "field.corrective-action": "corrective action",
   "field.corrector": "corrector",

package/translations/zh.json

@@ -1,7 +1,10 @@
 {
   "button.corrected": "corrected",
+  "button.request-archive": "request archive",
   "button.reviewed": "reviewed",
   "field.appliance": "appliance",
+  "field.approval-line": "approval line",
+  "field.assignees": "assignees",
   "field.collected_at": "collected at",
   "field.corrective-action": "corrective action",
   "field.corrector": "corrector",

package/client/pages/data-key-set/data-key-set-importer.js

@@ -1,105 +0,0 @@
-import '@operato/data-grist'
-
-import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit'
-
-import { client } from '@operato/graphql'
-import { i18next } from '@operato/i18n'
-import { isMobileDevice } from '@operato/utils'
-
-export class DataKeySetImporter extends LitElement {
-  static get properties() {
-    return {
-      columns: Object,
-      dataKeySets: Array
-    }
-  }
-
-  constructor() {
-    super()
-    this.columns = {
-      list: { fields: ['name', 'description'] },
-      pagination: { infinite: true },
-      columns: [
-        {
-          type: 'string',
-          name: 'name',
-          header: i18next.t('field.name'),
-          width: 150
-        },
-        {
-          type: 'string',
-          name: 'description',
-          header: i18next.t('field.description'),
-          width: 200
-        },
-        {
-          type: 'checkbox',
-          name: 'active',
-          header: i18next.t('field.active'),
-          width: 60
-        }
-      ]
-    }
-  }
-
-  static get styles() {
-    return [
-      css`
-        :host {
-          display: flex;
-          flex-direction: column;
-
-          background-color: #fff;
-        }
-
-        ox-grist {
-          flex: 1;
-        }
-
-        .button-container {
-          display: flex;
-          margin-left: auto;
-          padding: var(--padding-default);
-        }
-
-        mwc-button {
-          margin-left: var(--margin-default);
-        }
-      `
-    ]
-  }
-
-  render() {
-    return html`
-      <ox-grist
-        .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
-        .config=${this.columns}
-        .data=${{
-          records: this.dataKeySets
-        }}
-      ></ox-grist>
-
-      <div class="button-container">
-        <mwc-button raised @click="${this.save.bind(this)}">${i18next.t('button.save')}</mwc-button>
-      </div>
-    `
-  }
-
-  async save() {
-    const response = await client.mutate({
-      mutation: gql`
-        mutation importDataKeySets($dataKeySets: [DataKeySetPatch!]!) {
-          importDataKeySets(dataKeySets: $dataKeySets)
-        }
-      `,
-      variables: { dataKeySets: this.dataKeySets }
-    })
-
-    if (response.errors?.length) return
-
-    this.dispatchEvent(new CustomEvent('imported'))
-  }
-}
-
-window.customElements.define('data-key-set-importer', DataKeySetImporter)