@things-factory/worklist 6.0.50 → 6.0.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worklist",
-  "version": "6.0.50",
+  "version": "6.0.52",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -30,12 +30,12 @@
     "@operato/grist-editor": "^1.0.0",
     "@things-factory/attachment-base": "^6.0.49",
     "@things-factory/auth-base": "^6.0.49",
-    "@things-factory/board-service": "^6.0.49",
+    "@things-factory/board-service": "^6.0.52",
     "@things-factory/context-ui": "^6.0.49",
     "@things-factory/organization": "^6.0.50",
     "@things-factory/scheduler-client": "^6.0.49",
     "@things-factory/shell": "^6.0.49",
     "moment-timezone": "^0.5.40"
   },
-  "gitHead": "0bc016c1f46f81fcac0afd43609fd6fdb7fda857"
+  "gitHead": "be223b9a3f3a093cba2f97110e109597c9f9b21f"
 }

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

@@ -132,21 +132,21 @@ export class ActivityApprovalQuery {
 
   @FieldResolver(type => User)
   async approver(@Root() activityApproval: ActivityApproval): Promise<User> {
-    return await getRepository(User).findOneBy({ id: activityApproval.approverId })
+    return activityApproval.approver && (await getRepository(User).findOneBy({ id: activityApproval.approverId }))
   }
 
   @FieldResolver(type => User)
   async updater(@Root() activityApproval: ActivityApproval): Promise<User> {
-    return await getRepository(User).findOneBy({ id: activityApproval.updaterId })
+    return activityApproval.updater && (await getRepository(User).findOneBy({ id: activityApproval.updaterId }))
   }
 
   @FieldResolver(type => User)
   async creator(@Root() activityApproval: ActivityApproval): Promise<User> {
-    return await getRepository(User).findOneBy({ id: activityApproval.creatorId })
+    return activityApproval.creator && (await getRepository(User).findOneBy({ id: activityApproval.creatorId }))
   }
 
   @FieldResolver(type => User)
   async terminator(@Root() activityApproval: ActivityApproval): Promise<User> {
-    return await getRepository(User).findOneBy({ id: activityApproval.terminatorId })
+    return activityApproval.terminator && (await getRepository(User).findOneBy({ id: activityApproval.terminatorId }))
   }
 }

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

@@ -299,11 +299,11 @@ export class ActivityInstanceQuery {
 
   @FieldResolver(type => User)
   async updater(@Root() activityInstance: ActivityInstance): Promise<User> {
-    return await getRepository(User).findOneBy({ id: activityInstance.updaterId })
+    return activityInstance.updater && (await getRepository(User).findOneBy({ id: activityInstance.updaterId }))
   }
 
   @FieldResolver(type => User)
   async creator(@Root() activityInstance: ActivityInstance): Promise<User> {
-    return await getRepository(User).findOneBy({ id: activityInstance.creatorId })
+    return activityInstance.creator && (await getRepository(User).findOneBy({ id: activityInstance.creatorId }))
   }
 }

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

@@ -64,11 +64,11 @@ export class ActivityTemplateQuery {
 
   @FieldResolver(type => User)
   async updater(@Root() activityTemplate: ActivityTemplate): Promise<User> {
-    return await getRepository(User).findOneBy({ id: activityTemplate.updaterId })
+    return activityTemplate.updater && (await getRepository(User).findOneBy({ id: activityTemplate.updaterId }))
   }
 
   @FieldResolver(type => User)
   async creator(@Root() activityTemplate: ActivityTemplate): Promise<User> {
-    return await getRepository(User).findOneBy({ id: activityTemplate.creatorId })
+    return activityTemplate.creator && (await getRepository(User).findOneBy({ id: activityTemplate.creatorId }))
   }
 }

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

@@ -111,16 +111,16 @@ export class ActivityThreadQuery {
 
   @FieldResolver(type => User)
   async updater(@Root() activityThread: ActivityThread): Promise<User> {
-    return await getRepository(User).findOneBy({ id: activityThread.updaterId })
+    return activityThread.updater && (await getRepository(User).findOneBy({ id: activityThread.updaterId }))
   }
 
   @FieldResolver(type => User)
   async creator(@Root() activityThread: ActivityThread): Promise<User> {
-    return await getRepository(User).findOneBy({ id: activityThread.creatorId })
+    return activityThread.creator && (await getRepository(User).findOneBy({ id: activityThread.creatorId }))
   }
 
   @FieldResolver(type => User)
   async terminator(@Root() activityThread: ActivityThread): Promise<User> {
-    return await getRepository(User).findOneBy({ id: activityThread.terminatorId })
+    return activityThread.terminator && (await getRepository(User).findOneBy({ id: activityThread.terminatorId }))
   }
 }