@things-factory/worklist 6.2.96 → 6.2.98

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worklist",
-  "version": "6.2.96",
+  "version": "6.2.98",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -34,10 +34,10 @@
     "@things-factory/auth-base": "^6.2.96",
     "@things-factory/board-service": "^6.2.96",
     "@things-factory/context-ui": "^6.2.96",
-    "@things-factory/organization": "^6.2.96",
+    "@things-factory/organization": "^6.2.97",
     "@things-factory/scheduler-client": "^6.2.96",
     "@things-factory/shell": "^6.2.96",
     "moment-timezone": "^0.5.40"
   },
-  "gitHead": "1b99f2ee4cd91db25748b376648b2905869e7a33"
+  "gitHead": "72d30969be4b3775047b2dc504aaf6188163b228"
 }

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

@@ -12,11 +12,7 @@ export class ActivityApprovalMutation {
 
   @Directive('@transaction')
   @Mutation(returns => ActivityApproval!, { nullable: true, description: 'To approve ActivityApproval' })
-  async saveActivityApproval(
-    @Arg('id') id: string,
-    @Arg('comment', { nullable: true }) comment: string,
-    @Ctx() context: ResolverContext
-  ): Promise<ActivityApproval> {
+  async saveActivityApproval(@Arg('id') id: string, @Arg('comment', { nullable: true }) comment: string, @Ctx() context: ResolverContext): Promise<ActivityApproval> {
     const { domain, user, tx } = context.state
 
     var repository = tx.getRepository(ActivityApproval)
@@ -42,27 +38,15 @@ export class ActivityApprovalMutation {
 
   @Directive('@transaction')
   @Mutation(returns => ActivityApproval!, { nullable: true, description: 'To approve ActivityApproval' })
-  async approveActivityApproval(
-    @Arg('id') id: string,
-    @Arg('comment', { nullable: true }) comment: string,
-    @Ctx() context: ResolverContext
-  ): Promise<ActivityApproval> {
+  async approveActivityApproval(@Arg('id') id: string, @Arg('comment', { nullable: true }) comment: string, @Ctx() context: ResolverContext): Promise<ActivityApproval> {
     const { t } = context
 
-    if (!comment) {
-      throw t('text.enter a comment')
-    }
-
     return await approve({ id, comment }, context)
   }
 
   @Directive('@transaction')
   @Mutation(returns => ActivityApproval!, { nullable: true, description: 'To reject ActivityApproval' })
-  async rejectActivityApproval(
-    @Arg('id') id: string,
-    @Arg('comment', { nullable: true }) comment: string,
-    @Ctx() context: ResolverContext
-  ): Promise<ActivityApproval> {
+  async rejectActivityApproval(@Arg('id') id: string, @Arg('comment', { nullable: true }) comment: string, @Ctx() context: ResolverContext): Promise<ActivityApproval> {
     const { t } = context
 
     if (!comment) {