diff --git a/app/src/controllers/email.ts b/app/src/controllers/email.ts index 7b5cfbfb..3bc7f188 100644 --- a/app/src/controllers/email.ts +++ b/app/src/controllers/email.ts @@ -1,4 +1,3 @@ - import config from 'config'; import emailService from '../services/email'; @@ -11,11 +10,7 @@ const controller = { * Send email using CHES API * https://ches.api.gov.bc.ca/api/v1/docs#tag/EmailMerge/operation/postMerge */ - send: async ( - req: Request, - res: Response, - next: NextFunction - ) => { + send: async (req: Request, res: Response, next: NextFunction) => { try { req.body.from = config.get('server.ches.from'); req.body.bodyType = 'html'; diff --git a/app/src/validators/email.ts b/app/src/validators/email.ts index 4dc9a7e5..21f54685 100644 --- a/app/src/validators/email.ts +++ b/app/src/validators/email.ts @@ -4,7 +4,6 @@ import { emailJoi } from './common'; import { validate } from '../middleware/validation'; const schema = { - mergeSchema: { body: Joi.object().keys({ body: Joi.string().required(), @@ -13,13 +12,13 @@ const schema = { Joi.object().keys({ to: Joi.array().items(emailJoi).required(), context: Joi.object().keys({ - token: Joi.string().required(), + token: Joi.string(), + fullName: Joi.string() }) }) ) }) - }, - + } }; export default { diff --git a/frontend/src/components/common/BulkPermission.vue b/frontend/src/components/common/BulkPermission.vue index bc549c6f..493290fb 100644 --- a/frontend/src/components/common/BulkPermission.vue +++ b/frontend/src/components/common/BulkPermission.vue @@ -207,7 +207,7 @@ const onSubmit = handleSubmit(async (values: any, { resetForm }) => { } // format results into human-readable descriptions - results.value = toBulkResult(values.notFound, values.action, resultData); + results.value = toBulkResult(values.notFound, values.action, false, resultData); // refresh store if (props.resourceType === 'object') { diff --git a/frontend/src/components/common/BulkPermissionResults.vue b/frontend/src/components/common/BulkPermissionResults.vue index 0eca347f..cdef5f11 100644 --- a/frontend/src/components/common/BulkPermissionResults.vue +++ b/frontend/src/components/common/BulkPermissionResults.vue @@ -1,6 +1,6 @@