use || for assignments

david-loe · Sep 24, 2024 · 6df9ae9 · 6df9ae9
1 parent 27b9fb6
commit 6df9ae9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/backend/controller/uploadController.ts b/backend/controller/uploadController.ts
@@ -80,7 +80,7 @@ export class UploadController extends Controller {
     const token = await Token.findOne({ _id: tokenId })
     if (token) {
       if (true) {
-        await documentFileHandler(['files'], { owner: ownerId ? ownerId : userId })(req)
+        await documentFileHandler(['files'], { owner: ownerId || userId })(req)
         token.files = token.files.concat(requestBody.files as unknown as _id[])
         token.markModified('files')
         await token.save()

diff --git a/backend/mail/mail.ts b/backend/mail/mail.ts
@@ -118,11 +118,9 @@ export async function sendNotificationMail(report: TravelSimple | ExpenseReportS
     }
   }
 
-  const subject = i18n.t(`mail.${reportType}.${textState ? textState : report.state}.subject`, interpolation)
-  const paragraph = i18n.t(`mail.${reportType}.${textState ? textState : report.state}.paragraph`, interpolation)
-  const lastParagraph = interpolation.comment
-    ? i18n.t(`mail.${reportType}.${textState ? textState : report.state}.lastParagraph`, interpolation)
-    : ''
+  const subject = i18n.t(`mail.${reportType}.${textState || report.state}.subject`, interpolation)
+  const paragraph = i18n.t(`mail.${reportType}.${textState || report.state}.paragraph`, interpolation)
+  const lastParagraph = interpolation.comment ? i18n.t(`mail.${reportType}.${textState || report.state}.lastParagraph`, interpolation) : ''
   button.text = i18n.t('labels.viewX', { lng: language, X: i18n.t(`labels.${reportType}`, { lng: language }) })
 
   sendMail(recipients, subject, paragraph, button, lastParagraph)

diff --git a/backend/models/vueformGenerator.ts b/backend/models/vueformGenerator.ts
@@ -137,7 +137,7 @@ function mapSchemaTypeToVueformElement(
     vueformElement['type'] = 'object'
     if (keys.length > 1 && isFlatObject(schemaType.type)) {
       vueformElement['schema'] = mongooseSchemaToVueformSchema(schemaType.type, language, {
-        columns: { lg: { container: 12 / (keys.length == 2 ? 2 : 3) }, sm: { container: 6 } }
+        columns: { lg: { container: 12 / (keys.length === 2 ? 2 : 3) }, sm: { container: 6 } }
       })
     } else {
       vueformElement['schema'] = mongooseSchemaToVueformSchema(schemaType.type, language)

diff --git a/backend/pdf/travel.ts b/backend/pdf/travel.ts
@@ -470,7 +470,7 @@ async function drawDays(page: pdf_lib.PDFPage, newPageFn: () => pdf_lib.PDFPage,
     width: 80,
     alignment: pdf_lib.TextAlignment.Left,
     title: i18n.t('labels.city', { lng: options.language }),
-    fn: (s?: string) => (s ? s : '')
+    fn: (s?: string) => s || ''
   })
   columns.push({
     key: 'purpose',