@things-factory/worklist 6.0.32 → 6.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worklist",
-  "version": "6.0.32",
+  "version": "6.0.34",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -27,13 +27,14 @@
   "dependencies": {
     "@operato/graphql": "^1.0.0",
     "@operato/grist-editor": "^1.0.0",
-    "@things-factory/attachment-base": "^6.0.32",
-    "@things-factory/auth-base": "^6.0.32",
-    "@things-factory/board-service": "^6.0.32",
-    "@things-factory/context-ui": "^6.0.32",
-    "@things-factory/organization": "^6.0.32",
-    "@things-factory/shell": "^6.0.32",
+    "@things-factory/attachment-base": "^6.0.34",
+    "@things-factory/auth-base": "^6.0.34",
+    "@things-factory/board-service": "^6.0.34",
+    "@things-factory/context-ui": "^6.0.34",
+    "@things-factory/organization": "^6.0.34",
+    "@things-factory/scheduler-client": "^6.0.34",
+    "@things-factory/shell": "^6.0.34",
     "moment-timezone": "^0.5.40"
   },
-  "gitHead": "1b7b1eb2d2e1c0823ec69ee8160790c5da62072c"
+  "gitHead": "a460e5183f6e97e061be886d1efe9a114bd1316b"
 }

package/server/controllers/activity-instance/draft.ts

@@ -64,10 +64,10 @@ export async function draft(
 
   return await tx.getRepository(ActivityInstance).save({
     activityType: activity.activityType,
-    // uiType: activity.uiType,
-    // uiSource: activity.uiSource,
-    // viewType: activity.viewType,
-    // viewSource: activity.viewSource,
+    uiType: activity.uiType,
+    uiSource: activity.uiSource,
+    viewType: activity.viewType,
+    viewSource: activity.viewSource,
     assigneeRole: activity.assigneeRole,
     supervisoryRole: activity.supervisoryRole,
     ...activityInstance,

package/server/controllers/activity-instance/post.ts

@@ -51,20 +51,24 @@ export async function post(
       }
     }
 
+    activityInstance.name = activity.name
+    activityInstance.description = activity.description
     activityInstance.activityType = activity.activityType
-    // activityInstance.uiType = activity.uiType
-    // activityInstance.uiSource = activity.uiSource
+    activityInstance.uiType = activity.uiType
+    activityInstance.uiSource = activity.uiSource
+    activityInstance.viewType = activity.viewType
+    activityInstance.viewSource = activity.viewSource
     activityInstance.assigneeRole = activity.assigneeRole
     activityInstance.supervisoryRole = activity.supervisoryRole
 
     if (!assignees || !approvalLine) {
       activityInstance.adhocType = 'standard'
       activityInstance.refBy = activityId
-      if (!activityInstance.assignees) {
-        activityInstance.assignees = activity.assignees
+      if (!assignees) {
+        assignees = activityInstance.assignees = activity.assignees
       }
-      if (!activityInstance.approvalLine) {
-        activityInstance.approvalLine = activity.approvalLine
+      if (!approvalLine) {
+        approvalLine = activityInstance.approvalLine = activity.approvalLine
       }
 
       if (!dueAt && activity.standardTime) {
@@ -89,7 +93,9 @@ export async function post(
     issuedAt
   })
 
-  const assignedUsers = await Promise.all(assignees.map(assignee => getSystemUserFromOrgMemberItem(assignee, context)))
+  const assignedUsers = await Promise.all(
+    (assignees || []).map(assignee => getSystemUserFromOrgMemberItem(assignee, context))
+  )
 
   if (assignedUsers.length == 0 && posted.threadsMin === 0 && posted.assigneeRoleId) {
     await createActivityThreadsForAllRoleUsers('post', posted, context)

package/server/controllers/common.ts

@@ -242,6 +242,10 @@ export async function getSystemUserFromOrgMemberItem(
 }
 
 export function fillActivitySearchKeys(searchKeys: ActivitySearchKeyItem[], input: { [key: string]: any }) {
+  if (!input || typeof input !== 'object') {
+    return
+  }
+
   return searchKeys?.reduce((sum, key, index) => {
     const value = input[key.inputKey]
     if (value != null) {

package/server/routes.ts

@@ -1,3 +1,8 @@
+import { logger } from '@things-factory/env'
+import { Domain, getDataSource } from '@things-factory/shell'
+import { ScheduleRegisterRequest } from '@things-factory/scheduler-client'
+import { post } from './controllers/activity-instance/post'
+
 process.on('bootstrap-module-global-public-route' as any, (app, globalPublicRouter) => {
   /*
    * can add global public routes to application (auth not required, tenancy not required)
@@ -5,6 +10,48 @@ process.on('bootstrap-module-global-public-route' as any, (app, globalPublicRout
    * ex) routes.get('/path', async(context, next) => {})
    * ex) routes.post('/path', async(context, next) => {})
    */
+
+  /* When a callback occurs from the scheduler when a scheduled dataset is on schedule, data collection task for the dataset should be issued. */
+  globalPublicRouter.post('/callback-schedule-for-activity', async (context, next) => {
+    const { client } = context.request.body as ScheduleRegisterRequest
+
+    if (!client || typeof client !== 'object') {
+      throw new Error('client property should be a part of callback body.')
+    }
+
+    const { group: domainId, key: activityId } = client
+
+    if (!domainId || !activityId) {
+      throw new Error(`group(${domainId}) and key(${activityId}) properties should not be empty`)
+    }
+
+    if (!domainId || !activityId) {
+      throw new Error(`domainId(${domainId}) and activityId(${activityId}) properties should not be empty`)
+    }
+
+    await getDataSource().transaction(async tx => {
+      const domain = await tx.getRepository(Domain).findOneBy({ id: domainId })
+
+      if (!domain) {
+        throw new Error(`domain(${domainId}) not found`)
+      }
+
+      context.state = {
+        ...context.state,
+        domain,
+        tx
+      }
+
+      await post(
+        {
+          activityId
+        },
+        context
+      )
+    })
+
+    context.status = 200
+  })
 })
 
 process.on('bootstrap-module-global-private-route' as any, (app, globalPrivateRouter) => {

package/server/service/activity/activity-history.ts

@@ -85,6 +85,10 @@ export class ActivityHistory implements HistoryEntityInterface<Activity> {
   @Field({ nullable: true })
   timezone?: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  scheduleId?: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   standardTime?: number

package/server/service/activity/activity-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 { Activity } from './activity'
 import { ActivityPatch, NewActivity } from './activity-type'
@@ -201,4 +202,105 @@ export class ActivityMutation {
 
     return true
   }
+
+  @Directive('@transaction')
+  @Mutation(returns => Activity, {
+    description: 'To start posting activity based on the schedule of the given activity'
+  })
+  async startActivitySchedule(
+    @Arg('activityId') activityId: string,
+    @Ctx() context: ResolverContext
+  ): Promise<Activity> {
+    const { domain, tx } = context.state
+
+    var repository = tx.getRepository(Activity)
+    var activity = await repository.findOne({
+      where: { domain: { id: domain.id }, id: activityId }
+    })
+
+    if (!activity) {
+      throw new Error(
+        context.t('error.activity not found', {
+          activity: activityId
+        })
+      )
+    }
+
+    try {
+      var handle = await registerSchedule({
+        name: activity.name,
+        client: {
+          application: 'operato-worklist',
+          group: `${domain.id}`,
+          type: 'activity',
+          key: activity.id,
+          operation: 'schedule'
+        },
+        type: 'cron',
+        schedule: activity.schedule,
+        timezone: activity.timezone,
+        task: {
+          type: 'rest',
+          connection: {
+            host: 'http://localhost:3000/callback-schedule-for-activity',
+            headers: {
+              'Content-Type': 'application/json',
+              accept: '*/*'
+            }
+          },
+          data: {
+            domainId: domain.id,
+            activityId
+          },
+          history_check: true,
+          failed_policy: 'retry_dlq',
+          max_retry_count: 3,
+          retry_period: 60
+        }
+      })
+
+      return await repository.save({
+        ...activity,
+        scheduleId: handle
+      })
+    } catch (err) {
+      console.error('startActivitySchedule', err)
+    }
+  }
+
+  @Directive('@transaction')
+  @Mutation(returns => Activity, {
+    nullable: true,
+    description: 'To stop posting activity based on the schedule of the given activity'
+  })
+  async stopActivitySchedule(
+    @Arg('activityId') activityId: string,
+    @Ctx() context: ResolverContext
+  ): Promise<Activity | undefined> {
+    const { domain, tx } = context.state
+
+    var repository = tx.getRepository(Activity)
+    var activity = await repository.findOne({
+      where: { domain: { id: domain.id }, id: activityId }
+    })
+
+    if (!activity) {
+      throw new Error(
+        context.t('error.activity not found', {
+          activity: activityId
+        })
+      )
+    }
+
+    try {
+      await unregisterSchedule(activity.scheduleId)
+
+      return await repository.save({
+        ...activity,
+        scheduleId: null
+      })
+    } catch (err) {
+      console.error('stopActivitySchedule', err)
+    }
+  }
 }

package/server/service/activity/activity-type.ts

@@ -42,6 +42,9 @@ export class NewActivity {
   @Field({ nullable: true })
   timezone?: string
 
+  @Field({ nullable: true })
+  scheduleId?: string
+
   @Field({ nullable: true })
   standardTime?: number
 
@@ -129,6 +132,9 @@ export class ActivityPatch {
   @Field({ nullable: true })
   timezone?: string
 
+  @Field({ nullable: true })
+  scheduleId?: string
+
   @Field({ nullable: true })
   standardTime?: number
 

package/server/service/activity/activity.ts

@@ -114,12 +114,14 @@ export class Activity {
   @Field({ nullable: true, description: 'Whether the task can be started arbitrarily by a user with privileges.' })
   startable?: boolean
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   schedule?: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  scheduleId?: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   timezone?: string

package/server/service/activity-approval/event-subscriber.ts

@@ -1,6 +1,6 @@
 import { EventSubscriber, EntitySubscriberInterface, InsertEvent, UpdateEvent } from 'typeorm'
 
-import { Domain, pubsub } from '@things-factory/shell'
+import { pubsub } from '@things-factory/shell'
 
 import { ActivityApproval } from './activity-approval'
 import { callWebhook } from '../../controllers/activity-installation/call-webhook'

package/server/service/activity-template/activity-template-type.ts

@@ -40,6 +40,12 @@ export class NewActivityTemplate {
   @Field({ nullable: true })
   uiSource?: string
 
+  @Field({ nullable: true })
+  viewType?: ActivityUIType
+
+  @Field({ nullable: true })
+  viewSource?: string
+
   @Field({ nullable: true })
   reportType?: ActivityUIType
 
@@ -85,6 +91,12 @@ export class ActivityTemplatePatch {
   @Field({ nullable: true })
   uiSource?: string
 
+  @Field({ nullable: true })
+  viewType?: ActivityUIType
+
+  @Field({ nullable: true })
+  viewSource?: string
+
   @Field({ nullable: true })
   reportType?: ActivityUIType
 

package/server/service/activity-template/activity-template.ts

@@ -91,6 +91,14 @@ export class ActivityTemplate {
   @Field({ nullable: true })
   uiSource?: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  viewType?: ActivityUIType
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  viewSource?: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   reportType?: ActivityUIType

package/server/service/installable-activity/installable-activity.ts

@@ -35,6 +35,12 @@ export class InstallableActivity {
   @Field({ nullable: true })
   uiSource?: string
 
+  @Field({ nullable: true })
+  viewType?: ActivityUIType
+
+  @Field({ nullable: true })
+  viewSource?: string
+
   @Field({ nullable: true })
   reportType?: ActivityUIType
 

package/things-factory.config.js

@@ -23,6 +23,7 @@ export default {
     { tagname: 'activity-instance-list-page', page: 'activity-instance-list' },
     { tagname: 'activity-instance-page', page: 'activity-instance' },
     { tagname: 'activity-thread-page', page: 'activity-thread' },
+    { tagname: 'activity-thread-view-page', page: 'activity-thread-view' },
     { tagname: 'activity-approval-page', page: 'activity-approval' },
     { tagname: 'worklist-home', page: 'worklist-home' },
     { tagname: 'activity-template-list-page', page: 'activity-template-list' },

package/translations/en.json

@@ -46,6 +46,8 @@
   "field.ui-type": "UI type",
   "field.ui-source": "UI source",
   "field.unit": "unit",
+  "field.view-type": "view type",
+  "field.view-source": "view source",
   "label.activity-instance": "activity instance",
   "label.days": "days",
   "label.hours": "hours",

package/translations/ko.json

@@ -46,6 +46,8 @@
   "field.ui-type": "화면 타입",
   "field.ui-source": "화면 소스",
   "field.unit": "단위",
+  "field.view-type": "뷰 타입",
+  "field.view-source": "뷰 소스",
   "label.activity-instance": "업무 인스턴스",
   "label.days": "일",
   "label.hours": "시간",

package/translations/ms.json

@@ -46,6 +46,8 @@
   "field.ui-type": "UI type",
   "field.ui-source": "UI source",
   "field.unit": "[ms] unit",
+  "field.view-type": "[ms] view type",
+  "field.view-source": "[ms] view source",
   "label.activity-instance": "[ms] activity instance",
   "label.days": "[ms] days",
   "label.hours": "[ms] hours",

package/translations/zh.json

@@ -46,6 +46,8 @@
   "field.ui-type": "UI type",
   "field.ui-source": "UI source",
   "field.unit": "[zh] unit",
+  "field.view-type": "[zh] view type",
+  "field.view-source": "[zh] view source",
   "label.activity-instance": "[zh] activity instance",
   "label.days": "天",
   "label.hours": "小时",

package/client/pages/activity-thread/activity-thread-view.ts

@@ -1,102 +0,0 @@
-import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit'
-import { customElement, property, query, state } from 'lit/decorators.js'
-
-import { client } from '@operato/graphql'
-import { i18next, localize } from '@operato/i18n'
-import { ScrollbarStyles } from '@operato/styles'
-
-@customElement('activity-thread-view')
-export class ActivityThreadView extends localize(i18next)(LitElement) {
-  static styles = [
-    ScrollbarStyles,
-    css`
-      :host {
-        display: flex;
-        flex-direction: column;
-
-        background-color: #fff;
-      }
-
-      div[content] {
-        flex: 1;
-
-        display: flex;
-        overflow: auto;
-      }
-    `
-  ]
-
-  @property({
-    type: String,
-    attribute: 'activity-instance-id'
-  })
-  activityInstanceId?: string
-  @state() activityInstance?: any //ActivityInstance
-
-  render() {
-    const { id, name, description, activity } = this.activityInstance
-    const instance = this.activityInstance
-
-    return html`<div content>XXX</div>`
-  }
-
-  updated(changes) {
-    if (changes.has('activityInstanceId')) {
-      this.fetchActivityInstance()
-    }
-  }
-
-  async fetchActivityInstance() {
-    const id = this.activityInstanceId
-
-    const response = await client.query({
-      query: gql`
-        query ($id: String!) {
-          activityInstance(id: $id) {
-            id
-            name
-            description
-            key01
-            key02
-            key03
-            key04
-            key05
-            input
-            output
-            activity {
-              id
-              name
-              description
-            }
-            activityThreads {
-              state
-              transaction
-              output
-              assignee {
-                id
-                name
-                email
-              }
-              round
-              assignedAt
-              startedAt
-              terminatedAt
-            }
-            updater {
-              id
-              name
-            }
-            updatedAt
-            collectedAt
-          }
-        }
-      `,
-      variables: {
-        id
-      }
-    })
-
-    this.activityInstance = response.data.activityInstance
-  }
-}