@things-factory/worklist 6.0.26 → 6.0.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worklist",
-  "version": "6.0.26",
+  "version": "6.0.27",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -27,11 +27,12 @@
   "dependencies": {
     "@operato/graphql": "^1.0.0",
     "@operato/grist-editor": "^1.0.0",
-    "@things-factory/attachment-base": "^6.0.25",
-    "@things-factory/auth-base": "^6.0.25",
-    "@things-factory/board-service": "^6.0.25",
-    "@things-factory/organization": "^6.0.25",
-    "@things-factory/shell": "^6.0.25"
+    "@things-factory/attachment-base": "^6.0.27",
+    "@things-factory/auth-base": "^6.0.27",
+    "@things-factory/board-service": "^6.0.27",
+    "@things-factory/context-ui": "^6.0.27",
+    "@things-factory/organization": "^6.0.27",
+    "@things-factory/shell": "^6.0.27"
   },
-  "gitHead": "2c9c046d7b1adf48d05b48cf9a6807e6bf9535b7"
+  "gitHead": "684784a4f3e450e9ce07dcd51db70b8a2d2c2a0f"
 }

package/server/controllers/activity-approval/approve.ts

@@ -1,4 +1,4 @@
-import { getSystemUserFromApprovalLineItem } from '../../controllers/common'
+import { getSystemUserFromOrgMemberItem } from '../../controllers/common'
 import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'
 import { ActivityApproval, ActivityApprovalJudgment } from '../../service/activity-approval/activity-approval'
 import { ApprovalLineItem } from '@things-factory/organization'
@@ -43,7 +43,7 @@ export async function approve(
 
   if (approvalLine && approvalLine.length > order) {
     // approvalLine에서 후속 승인자에게 escalating.
-    var approverUser = await getSystemUserFromApprovalLineItem(approvalLine[order], context)
+    var approverUser = await getSystemUserFromOrgMemberItem(approvalLine[order], context)
 
     if (!approverUser) {
       throw 'Cannot specify the approval user for this approval line'

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

@@ -34,6 +34,24 @@ export async function draft(
     activityInstance.dueAt = new Date(Date.now() + activity.standardTime * 1000)
   }
 
+  if (activityInstance.assignees) {
+    activityInstance.assignees = activityInstance.assignees.map(assignee => {
+      return {
+        type: assignee.type,
+        value: assignee.value
+      }
+    })
+  }
+
+  if (activityInstance.approvalLine) {
+    activityInstance.approvalLine = activityInstance.approvalLine.map(approval => {
+      return {
+        type: approval.type,
+        value: approval.value
+      }
+    })
+  }
+
   return await tx.getRepository(ActivityInstance).save({
     activityType: activity.activityType,
     uiType: activity.uiType,

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

@@ -3,7 +3,7 @@ import { ActivityInstancePost } from '../../service/activity-instance/activity-i
 import {
   createActivityThreadsForAllRoleUsers,
   createActivityThreadsForUsers,
-  getSystemUserFromAssigneeItem
+  getSystemUserFromOrgMemberItem
 } from '../common'
 
 export async function post(
@@ -39,9 +39,9 @@ export async function post(
     updater: user
   })
 
-  const assignedUsers = await Promise.all(assignees.map(assignee => getSystemUserFromAssigneeItem(assignee, context)))
+  const assignedUsers = await Promise.all(assignees.map(assignee => getSystemUserFromOrgMemberItem(assignee, context)))
 
-  assignees.map(async assignee => await getSystemUserFromAssigneeItem(assignee, context))
+  assignees.map(async assignee => await getSystemUserFromOrgMemberItem(assignee, context))
 
   if (assignedUsers.length == 0 && posted.threadsMin === 0 && posted.assigneeRoleId) {
     await createActivityThreadsForAllRoleUsers('post', posted, context)

package/server/controllers/activity-thread/submit.ts

@@ -1,6 +1,6 @@
 import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'
 import { ActivityApproval, ActivityApprovalJudgment } from '../../service/activity-approval/activity-approval'
-import { getSystemUserFromApprovalLineItem, updateActivityInstanceState } from '../common'
+import { getSystemUserFromOrgMemberItem, updateActivityInstanceState } from '../common'
 import { User } from '@things-factory/auth-base'
 import { Department, Employee, ApprovalLineItem, OrgMemberTargetType } from '@things-factory/organization'
 
@@ -28,7 +28,7 @@ export async function submit(
   const approvalLine: ApprovalLineItem[] = activityThread.activityInstance.approvalLine
 
   if (approvalLine && approvalLine.length > 0) {
-    var approverUser = await getSystemUserFromApprovalLineItem(approvalLine[0], context)
+    var approverUser = await getSystemUserFromOrgMemberItem(approvalLine[0], context)
 
     if (!approverUser) {
       throw 'Cannot specify the approval user for this approval line'

package/server/controllers/common.ts

@@ -111,65 +111,85 @@ export async function createActivityThreadsForAllRoleUsers(
   return await createActivityThreadsForUsers(transaction, activityInstance, assignees, context)
 }
 
-export async function getSystemUserFromApprovalLineItem(
-  approvalLineItem: ApprovalLineItem,
-  context: any
-): Promise<User> {
+export async function getSystemUserFromMyDepartmentManager(context: ResolverContext): Promise<User> {
   const { domain, user, tx } = context.state
 
-  const { type, value, approver } = approvalLineItem
-  const { id: approverId, name, description, controlNo } = approver
+  const employee = await tx.getRepository(Employee).findOneBy({
+    domain: { id: domain.id },
+    user: { id: user.id }
+  })
 
-  if (type == OrgMemberTargetType.Employee) {
-    const employee = await tx.getRepository(Employee).findOne({ where: { id: approverId }, relations: ['user'] })
+  if (!employee || !employee.departmentId) {
+    return
+  }
 
-    if (!employee || !employee.user) {
-      return
-    }
-    return employee.user
-  } else if (type == OrgMemberTargetType.Department) {
-    const department = await tx.getRepository(Department).findOne({ where: { id: approverId }, relations: ['manager'] })
+  const department = await tx.getRepository(Department).findOne({
+    where: {
+      id: employee.departmentId
+    },
+    relations: ['manager']
+  })
 
-    if (!department || !department.manager) {
-      return
-    }
-    return await tx.getRepository(User).findOneBy({ id: department.manager.userId })
-  } else if (type == OrgMemberTargetType.Role) {
-  } else if (type == OrgMemberTargetType.Myself) {
-    return user
-  } else if (type == OrgMemberTargetType.MyDepartment) {
-    // return user
-  } else if (type == OrgMemberTargetType.MySupervisor) {
-    // return user
+  return department.manager
+}
+
+export async function getSystemUserFromMySupervosor(context: ResolverContext): Promise<User> {
+  const { domain, user, tx } = context.state
+
+  const employee = await tx.getRepository(Employee).findOneBy({
+    domain: { id: domain.id },
+    user: { id: user.id }
+  })
+
+  if (!employee || !employee.supervisorId) {
+    return
   }
+
+  const supervisor = await tx.getRepository(Employee).findOne({
+    where: {
+      id: employee.supervisorId
+    },
+    relations: ['user']
+  })
+
+  return supervisor.user
 }
 
-export async function getSystemUserFromAssigneeItem(assigneeItem: AssigneeItem, context: any): Promise<User> {
+export async function getSystemUserFromOrgMemberItem(
+  item: AssigneeItem | ApprovalLineItem,
+  context: ResolverContext
+): Promise<User> {
   const { domain, user, tx } = context.state
 
-  const { type, value, assignee } = assigneeItem
-  const { id: assigneeId, name, description, controlNo } = assignee
+  const { type, value: id } = item
 
   if (type == OrgMemberTargetType.Employee) {
-    const employee = await tx.getRepository(Employee).findOne({ where: { id: assigneeId }, relations: ['user'] })
+    const employee = await tx.getRepository(Employee).findOne({ where: { id }, relations: ['user'] })
 
     if (!employee || !employee.user) {
       return
     }
     return employee.user
   } else if (type == OrgMemberTargetType.Department) {
-    const department = await tx.getRepository(Department).findOne({ where: { id: assigneeId }, relations: ['manager'] })
+    const department = await tx.getRepository(Department).findOne({ where: { id }, relations: ['manager'] })
 
     if (!department || !department.manager) {
       return
     }
     return await tx.getRepository(User).findOneBy({ id: department.manager.userId })
   } else if (type == OrgMemberTargetType.Role) {
+    const role = await tx.getRepository(Role).findOne({ where: { id }, relations: ['users'] })
+
+    if (!role || !role.users || !role.users[0]) {
+      return
+    }
+
+    return await tx.getRepository(User).findOneBy({ id: role.users[0].id })
   } else if (type == OrgMemberTargetType.Myself) {
     return user
   } else if (type == OrgMemberTargetType.MyDepartment) {
-    // return user
+    return await getSystemUserFromMyDepartmentManager(context)
   } else if (type == OrgMemberTargetType.MySupervisor) {
-    // return user
+    return await getSystemUserFromMySupervosor(context)
   }
 }

package/server/service/activity/activity.ts

@@ -48,8 +48,9 @@ registerEnumType(ActivityType, {
 export enum ActivityUIType {
   Generated = 'generated',
   Template = 'template',
-  Page = 'page',
   Board = 'board',
+  CustomElement = 'custom-element',
+  Page = 'page',
   External = 'external'
 }
 

package/server/service/activity-instance/activity-instance-query.ts

@@ -8,6 +8,7 @@ import { ActivityThread } from '../activity-thread/activity-thread'
 import { Activity } from '../activity/activity'
 import { ActivityInstance, ActivityInstanceStatus, AssigneeItem } from './activity-instance'
 import { ActivityInstanceList } from './activity-instance-type'
+import { ApprovalLineItem } from '@things-factory/organization'
 
 @Resolver(ActivityInstance)
 export class ActivityInstanceQuery {
@@ -193,6 +194,49 @@ export class ActivityInstanceQuery {
     return assigneeItemList
   }
 
+  @FieldResolver(type => [ApprovalLineItem])
+  async approvalLine(
+    @Root() activityInstance: ActivityInstance,
+    @Ctx() context: ResolverContext
+  ): Promise<ApprovalLineItem[]> {
+    const { domain, user } = context.state
+    const { approvalLine } = activityInstance
+
+    if (!approvalLine || !(approvalLine instanceof Array)) {
+      return null
+    }
+
+    var approvalLineItems = []
+
+    for (let item of approvalLine) {
+      var { type, value: id } = item
+      var approver
+
+      switch (type) {
+        case 'Employee':
+          approver = await getRepository('Employee').findOneBy({ domain: { id: domain.id }, id })
+          break
+        case 'Department':
+          approver = await getRepository('Department').findOneBy({ domain: { id: domain.id }, id })
+          break
+        case 'Role':
+          approver = await getRepository('Role').findOneBy({ domain: { id: domain.id }, id })
+          break
+        case 'Myself':
+          approver = user
+          break
+        case 'MyDepartment':
+        case 'MySupervisor':
+          break
+        default:
+      }
+
+      approver && approvalLineItems.push({ type, value: id, approver })
+    }
+
+    return approvalLineItems
+  }
+
   @FieldResolver(type => Role)
   async supervisoryRole(@Root() activityInstance: ActivityInstance): Promise<Role> {
     return (

package/things-factory.config.js

@@ -23,10 +23,7 @@ export default {
     { tagname: 'worklist-home', page: 'worklist-home' },
     { tagname: 'activity-template-list-page', page: 'activity-template-list' },
     { tagname: 'activity-store-page', page: 'activity-store' },
-    {
-      tagname: 'activity-thread-list-page',
-      page: 'activity-thread-list'
-    },
+    { tagname: 'activity-thread-list-page', page: 'activity-thread-list' },
     { tagname: 'installable-activity-list-page', page: 'installable-activity-list' },
     { tagname: 'activity-approval-list-page', page: 'activity-approval-list' }
   ]

package/translations/en.json

@@ -26,6 +26,7 @@
   "field.mandatory": "mandatory",
   "field.options": "options",
   "field.priority": "priority",
+  "field.provider": "provider",
   "field.quantifier": "quantifier",
   "field.report-type": "report type",
   "field.report-source": "report source",

package/translations/ko.json

@@ -26,6 +26,7 @@
   "field.mandatory": "필수",
   "field.options": "선택옵션",
   "field.priority": "우선순위",
+  "field.provider": "공급자",
   "field.quantifier": "수량",
   "field.report-type": "리포트 타입",
   "field.report-source": "리포트 소스",

package/translations/ms.json

@@ -26,6 +26,7 @@
   "field.mandatory": "mandatory",
   "field.options": "options",
   "field.priority": "priority",
+  "field.provider": "provider",
   "field.quantifier": "quantifier",
   "field.report-type": "report type",
   "field.report-source": "report source",

package/translations/zh.json

@@ -21,6 +21,7 @@
   "field.issuer": "issuer",
   "field.hidden": "hidden",
   "field.posted-at": "posted at",
+  "field.provider": "provider",
   "field.issuer-role": "issuer role",
   "field.lead-time": "LT(sec)",
   "field.mandatory": "mandatory",

package/dist-client/pages/installed-activity/installed-activity-list-page.d.ts

@@ -1,45 +0,0 @@
-import '@operato/data-grist';
-import './installed-activity-model-item-list.js';
-import { DataGrist } from '@operato/data-grist';
-import { PageView } from '@operato/shell';
-declare const ActivityTemplateListPage_base: (new (...args: any[]) => {
-    _storeUnsubscribe: import("redux").Unsubscribe;
-    connectedCallback(): void;
-    disconnectedCallback(): void;
-    stateChanged(_state: unknown): void;
-    readonly isConnected: boolean;
-}) & (new (...args: any[]) => import("lit").LitElement) & typeof PageView;
-export declare class ActivityTemplateListPage extends ActivityTemplateListPage_base {
-    static styles: import("lit").CSSResult[];
-    gristConfig: any;
-    mode?: 'GRID' | 'LIST' | 'CARD';
-    get context(): {
-        search: {
-            handler: (search: string) => void;
-            placeholder: string;
-            value: string;
-        };
-        filter: {
-            handler: () => void;
-        };
-        help: string;
-        actions: never[];
-    };
-    sorterControl?: any;
-    grist: DataGrist;
-    render(): import("lit-html").TemplateResult<1>;
-    pageInitialized(lifecycle: any): Promise<void>;
-    pageUpdated(changes: any, lifecycle: any): Promise<void>;
-    fetchHandler({ page, limit, sortings, filters }: {
-        page: any;
-        limit: any;
-        sortings?: never[] | undefined;
-        filters?: never[] | undefined;
-    }): Promise<{
-        total: any;
-        records: any;
-    } | undefined>;
-    activate(record: any): Promise<void>;
-    deactivate(record: any): Promise<void>;
-}
-export {};