@things-factory/worklist 6.0.26 → 6.0.28

package/client/pages/activity-store/activity-store-page.ts

@@ -13,7 +13,7 @@ import { openPopup } from '@operato/layout'
 import { PageView, store } from '@operato/shell'
 import { CommonButtonStyles, CommonGristStyles, ScrollbarStyles } from '@operato/styles'
 
-import { ActivityTypes } from '../../types.js'
+import { ActivityTypes } from '../../types/types.js'
 
 @customElement('activity-store-page')
 export class ActivityStorePage extends connect(store)(localize(i18next)(PageView)) {

package/client/pages/activity-template/activity-template-list-page.ts

@@ -15,7 +15,7 @@ import { PageView, store } from '@operato/shell'
 import { CommonButtonStyles, CommonGristStyles, ScrollbarStyles } from '@operato/styles'
 import { isMobileDevice } from '@operato/utils'
 
-import { ActivityTypes, ActivityUITypes } from '../../types.js'
+import { ActivityTypes, ActivityUITypes } from '../../types/types.js'
 
 @customElement('activity-template-list-page')
 export class ActivityTemplateListPage extends connect(store)(localize(i18next)(PageView)) {

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

@@ -1,11 +1,10 @@
 import '@operato/property-editor/ox-properties-dynamic-view.js'
 import '@operato/board/ox-board-viewer.js'
-import '@things-factory/organization'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit'
 import { unsafeHTML } from 'lit-html/directives/unsafe-html.js'
-import { customElement, property, query } from 'lit/decorators.js'
+import { customElement, property, query, state } from 'lit/decorators.js'
 import { keyed } from 'lit/directives/keyed.js'
 import { connect } from 'pwa-helpers/connect-mixin.js'
 
@@ -48,6 +47,7 @@ const ActivityThreadFetchResult = `\
     }
     approvalLine {
       type
+      value
       approver {
         id
         name
@@ -93,11 +93,15 @@ export class ActivityThreadPage extends connect(store)(localize(i18next)(PageVie
         width: 100%;
         height: 100%;
       }
+
+      #custom-content {
+        flex: 1;
+      }
     `
   ]
 
-  @property({ type: Object }) activityThread: any
-  @property({ type: Object }) board: any
+  @state() activityThread: any
+  @state() board: any
 
   get context() {
     const state = this.activityThread?.state
@@ -165,6 +169,8 @@ export class ActivityThreadPage extends connect(store)(localize(i18next)(PageVie
         return this.generatedContent()
       case 'board':
         return this.boardContent()
+      case 'custom-element':
+        return this.customElementContent()
       case 'page':
       case 'external':
       default:
@@ -220,7 +226,7 @@ export class ActivityThreadPage extends connect(store)(localize(i18next)(PageVie
     }
 
     return keyed(
-      activityInstance.id,
+      this.activityThread.id,
       html`
         <fieldset>
           <legend>Input</legend>
@@ -254,8 +260,13 @@ export class ActivityThreadPage extends connect(store)(localize(i18next)(PageVie
       }
     }
 
+    /* 
+      ox-board-viewer에서 provider에 의해 공급되는 board가 각 id별로 instance를 하나씩 밖에 가지지 않으므로,
+      동일한 id의 보드를 다른 page에 뺏기는 경우가 있다.
+      따라서, Page가 active될 때마다 타임스탬프를 refresh key로 설정하였다.
+      */
     return keyed(
-      activityInstance.id,
+      this.activityThread.id,
       html`
         <ox-board-viewer
           style="background-color: white;"
@@ -269,6 +280,21 @@ export class ActivityThreadPage extends connect(store)(localize(i18next)(PageVie
     )
   }
 
+  customElementContent() {
+    const { output, activityInstance } = this.activityThread
+    const { uiSource: tagName, input } = activityInstance || {}
+
+    const element = document.createElement(tagName)
+    element.id = 'custom-content'
+    element.input = input
+    element.output = output
+    element.addEventListener('change', (e: CustomEvent) => {
+      this.activityThread.output = e.detail
+    })
+
+    return element
+  }
+
   @query('ox-board-viewer') oxBoardViewer: any
 
   getOutputFromBoard() {

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

@@ -0,0 +1,102 @@
+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
+  }
+}

package/client/pages/installable-activity/installable-activity-list-page.ts

@@ -13,7 +13,7 @@ import { PageView, store } from '@operato/shell'
 import { CommonButtonStyles, CommonGristStyles, ScrollbarStyles } from '@operato/styles'
 import { isMobileDevice } from '@operato/utils'
 
-import { ActivityTypes, ActivityUITypes } from '../../types.js'
+import { ActivityTypes, ActivityUITypes } from '../../types/types.js'
 
 @customElement('installable-activity-list-page')
 export class ActivityTemplateListPage extends connect(store)(localize(i18next)(PageView)) {

package/client/pages/todo/approval-waiting-list-page.ts

@@ -14,7 +14,7 @@ import { navigate, PageView, store } from '@operato/shell'
 import { CommonGristStyles, ScrollbarStyles } from '@operato/styles'
 import { isMobileDevice, sleep } from '@operato/utils'
 
-import { ActivityInstanceStatus, Priorities } from '../../types.js'
+import { Priorities } from '../../types/types.js'
 
 const MIN = 60
 const HOUR = 60 * MIN
@@ -183,7 +183,17 @@ export class ApprovalWaitingListPage extends connect(store)(localize(i18next)(Pa
           header: i18next.t('field.status'),
           record: {
             editable: false,
-            options: ActivityInstanceStatus
+            options: [
+              { display: 'Draft', value: 'draft' },
+              { display: 'Posted', value: 'posted' },
+              { display: 'WaitingAssignment', value: 'waiting-assignment' },
+              { display: 'Assigned', value: 'assigned' },
+              { display: 'Started', value: 'started' },
+              { display: 'Pending', value: 'pending' },
+              { display: 'Escalated', value: 'escalated' },
+              { display: 'Ended', value: 'ended' },
+              { display: 'Aborted', value: 'aborted' }
+            ]
           },
           // filter: true,
           width: 60

package/client/pages/todo/draft-list-page.ts

@@ -6,15 +6,17 @@ import { css, html } from 'lit'
 import { customElement, property, query } from 'lit/decorators.js'
 import { connect } from 'pwa-helpers/connect-mixin.js'
 
-import { DataGrist, getRenderer } from '@operato/data-grist'
+import { DataGrist, FetchOption, getRenderer } from '@operato/data-grist'
 import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { openPopup } from '@operato/layout'
 import { PageView, store } from '@operato/shell'
 import { CommonGristStyles, ScrollbarStyles } from '@operato/styles'
 import { isMobileDevice } from '@operato/utils'
+import { OxPopup } from '@operato/popup'
 
-import { ActivityInstanceStatus, Priorities } from '../../types.js'
+import { ActivityInstanceStatus } from '../../types/activity-instance'
+import { Priorities } from '../../types/types.js'
 
 const MIN = 60
 const HOUR = 60 * MIN
@@ -59,7 +61,7 @@ export class DraftListPage extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  @query('#sorter-control') sorterControl?: any
+  @query('#sorter-control') sorterControl!: OxPopup
   @query('ox-grist') grist!: DataGrist
 
   render() {
@@ -192,7 +194,17 @@ export class DraftListPage extends connect(store)(localize(i18next)(PageView)) {
           header: i18next.t('field.status'),
           record: {
             editable: false,
-            options: ActivityInstanceStatus
+            options: [
+              { display: 'Draft', value: 'draft' },
+              { display: 'Posted', value: 'posted' },
+              { display: 'WaitingAssignment', value: 'waiting-assignment' },
+              { display: 'Assigned', value: 'assigned' },
+              { display: 'Started', value: 'started' },
+              { display: 'Pending', value: 'pending' },
+              { display: 'Escalated', value: 'escalated' },
+              { display: 'Ended', value: 'ended' },
+              { display: 'Aborted', value: 'aborted' }
+            ]
           },
           // filter: true,
           width: 60
@@ -283,7 +295,7 @@ export class DraftListPage extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  async fetchHandler({ page, limit, sortings = [], filters = [] }) {
+  async fetchHandler({ page, limit, sortings = [], filters = [] }: FetchOption) {
     const response = await client.query({
       query: gql`
         query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
@@ -303,6 +315,7 @@ export class DraftListPage extends connect(store)(localize(i18next)(PageView)) {
               activityType
               assignees {
                 type
+                value
                 assignee {
                   id
                   name
@@ -312,6 +325,7 @@ export class DraftListPage extends connect(store)(localize(i18next)(PageView)) {
               }
               approvalLine {
                 type
+                value
                 approver {
                   id
                   name

package/client/pages/todo/todo-list-page.ts

@@ -14,7 +14,8 @@ import { navigate, PageView, store } from '@operato/shell'
 import { CommonGristStyles, ScrollbarStyles } from '@operato/styles'
 import { isMobileDevice, sleep } from '@operato/utils'
 
-import { ActivityInstanceStatus, Priorities } from '../../types.js'
+import { ActivityInstanceStatus } from '../../types/activity-instance'
+import { Priorities } from '../../types/types.js'
 
 const MIN = 60
 const HOUR = 60 * MIN
@@ -183,9 +184,19 @@ export class TodoListPage extends connect(store)(localize(i18next)(PageView)) {
           header: i18next.t('field.status'),
           record: {
             editable: false,
-            options: ActivityInstanceStatus
+            options: [
+              { display: 'Draft', value: 'draft' },
+              { display: 'Posted', value: 'posted' },
+              { display: 'WaitingAssignment', value: 'waiting-assignment' },
+              { display: 'Assigned', value: 'assigned' },
+              { display: 'Started', value: 'started' },
+              { display: 'Pending', value: 'pending' },
+              { display: 'Escalated', value: 'escalated' },
+              { display: 'Ended', value: 'ended' },
+              { display: 'Aborted', value: 'aborted' }
+            ]
           },
-          // filter: true,
+          filter: false,
           width: 60
         },
         {

package/client/route.ts

@@ -60,6 +60,10 @@ export default function route(page: string) {
       import('./pages/activity-instance/activity-instance-list-page.js')
       return page
 
+    case 'activity-instance-search':
+      import('./pages/activity-instance/activity-instance-search-page.js')
+      return page
+
     case 'activity-template-list':
       import('./pages/activity-template/activity-template-list-page.js')
       return page

package/client/types/activity-instance-type.ts

@@ -0,0 +1,123 @@
+import { Role } from '@operato/shell'
+import { ApprovalLineItem } from '@things-factory/organization'
+
+import { ActivityType, ActivityUIType } from './activity'
+import { AssigneeItem, ActivityInstance, ActivityInstanceStatus } from './activity-instance'
+
+export class NewActivityInstance {
+  name?: string
+
+  activityId?: string
+
+  description?: string
+
+  priority?: number
+
+  reason?: string
+
+  threadsMin?: number
+
+  threadsMax?: number
+
+  dueAt?: Date
+
+  input?: { [key: string]: any }
+
+  adhocType?: string
+
+  refBy?: string
+
+  activityType?: ActivityType
+
+  uiType?: ActivityUIType
+
+  uiSource?: string
+
+  supervisoryRole?: Role
+
+  assigneeRole?: Role
+
+  assignees?: AssigneeItem[]
+
+  approvalLine?: ApprovalLineItem[]
+}
+
+export class ActivityInstancePost {
+  id?: string
+
+  name?: string
+
+  activityId?: string
+
+  description?: string
+
+  priority?: number
+
+  reason?: string
+
+  threadsMin?: number
+
+  threadsMax?: number
+
+  dueAt?: Date
+
+  input?: { [key: string]: any }
+
+  adhocType?: string
+
+  refBy?: string
+
+  activityType?: ActivityType
+
+  uiType?: ActivityUIType
+
+  uiSource?: string
+
+  supervisoryRole?: Role
+
+  assigneeRole?: Role
+
+  assignees?: AssigneeItem[]
+
+  approvalLine?: ApprovalLineItem[]
+}
+
+export class ActivityInstanceSave {
+  output?: { [key: string]: any }
+
+  assignees?: AssigneeItem[]
+
+  approvalLine?: ApprovalLineItem[]
+}
+
+export class ActivityInstancePatch {
+  id?: string
+
+  name?: string
+
+  description?: string
+
+  priority?: number
+
+  state?: ActivityInstanceStatus
+
+  threadsMin?: number
+
+  threadsMax?: number
+
+  dueAt?: Date
+
+  input?: { [key: string]: any }
+
+  assignees?: AssigneeItem[]
+
+  approvalLine?: ApprovalLineItem[]
+
+  cuFlag?: string
+}
+
+export class ActivityInstanceList {
+  items?: ActivityInstance[]
+
+  total?: number
+}

package/client/types/activity-instance.ts

@@ -0,0 +1,124 @@
+import { Domain, User, Role } from '@operato/shell'
+import { OrgMemberTargetType, OrgMemberTarget, ApprovalLineItem } from '@things-factory/organization'
+
+import { ActivityThread } from './activity-thread'
+import { Activity, ActivityType, ActivityUIType } from './activity'
+
+export enum ActivityInstanceStatus {
+  Draft = 'draft',
+  Posted = 'posted',
+  WaitingAssignment = 'waiting-assignment',
+  Assigned = 'assigned',
+  Started = 'started',
+  Pending = 'pending',
+  Ended = 'ended',
+  Aborted = 'aborted'
+}
+
+export class AssigneeItem {
+  type?: OrgMemberTargetType
+
+  value?: string
+
+  assignee?: OrgMemberTarget
+}
+
+export class ActivityInstance {
+  id?: string
+
+  version?: number = 1
+
+  domain?: Domain
+
+  name?: string
+
+  description?: string
+
+  activityType?: ActivityType
+
+  adhocType?: string
+
+  key01?: string = ''
+
+  key02?: string = ''
+
+  key03?: string = ''
+
+  key04?: string = ''
+
+  key05?: string = ''
+
+  activityThreads?: ActivityThread[]
+
+  uiType?: ActivityUIType
+
+  uiSource?: string
+
+  priority?: number = 1
+
+  state?: ActivityInstanceStatus
+
+  reason?: string
+
+  threadsMin?: number = 0
+
+  threadsMax?: number = 0
+
+  input?: { [key: string]: any }
+
+  output?: { [key: string]: any }
+
+  refBy?: string
+
+  activity?: Activity
+
+  assigneeRole?: Role
+
+  supervisoryRole?: Role
+
+  dueAt?: Date
+
+  transaction?: string
+
+  assignees?: AssigneeItem[]
+
+  approvalLine?: ApprovalLineItem[]
+
+  createdAt?: Date
+
+  updatedAt?: Date
+
+  assignedAt?: Date
+
+  startedAt?: Date
+
+  terminatedAt?: Date
+
+  creator?: User
+
+  creatorId?: string
+
+  updater?: User
+
+  updaterId?: string
+
+  starter?: User
+
+  starterId?: string
+
+  terminator?: User
+
+  terminatorId?: string
+
+  thumbnail?: string
+
+  isDelegatable(): boolean {
+    switch (this.state) {
+      case ActivityInstanceStatus.Posted:
+      case ActivityInstanceStatus.Assigned:
+        return true
+      default:
+        return false
+    }
+  }
+}

package/client/types/activity-model-type.ts

@@ -0,0 +1,40 @@
+export enum ActivityModelItemInoutType {
+  in = 'in',
+  out = 'out',
+  inout = 'inout'
+}
+
+export enum ActivityModelItemType {
+  number = 'number',
+  text = 'text',
+  textarea = 'textarea',
+  boolean = 'boolean',
+  select = 'select',
+  file = 'file'
+}
+
+export class ActivityModelItem {
+  name?: string
+
+  description?: string
+
+  tag?: string
+
+  active?: boolean
+
+  hidden?: boolean
+
+  mandatory?: boolean
+
+  inout?: ActivityModelItemInoutType
+
+  type?: ActivityModelItemType
+
+  options?: { [option: string]: any }
+
+  unit?: string
+
+  quantifier?: number[]
+
+  spec?: { [key: string]: any }
+}

package/client/types/activity-search-key-item-type.ts

@@ -0,0 +1,9 @@
+export class ActivitySearchKeyItem {
+  name?: string
+
+  description?: string
+
+  inputKey?: string
+
+  tKey?: string
+}

package/client/types/activity-thread-type.ts

@@ -0,0 +1,19 @@
+import { ActivityThread, ActivityThreadStatus } from './activity-thread'
+
+export class ActivityThreadPatch {
+  id?: string
+
+  state?: ActivityThreadStatus
+
+  active?: boolean
+}
+
+export class ActivityThreadSave {
+  output?: { [key: string]: any }
+}
+
+export class ActivityThreadList {
+  items?: ActivityThread[]
+
+  total?: number
+}