Release v1.33.0 (#862)

* FormSG local address field
* Fix step position race condition
* Show past execution steps even if step was deleted
* Add execution back button
* Update dependencies (`nanoid` and `express`)
* Export ExecutionsForFlow page for admin dashboard

Author: kevinkim-ogp

package-lock.json

@@ -34,7 +34,7 @@
     "@bull-board/express": "5.17.0",
     "@graphql-tools/schema": "10.0.0",
     "@launchdarkly/node-server-sdk": "9.0.4",
-    "@opengovsg/formsg-sdk": "0.11.0",
+    "@opengovsg/formsg-sdk": "0.13.0",
     "@opengovsg/sgid-client": "2.1.0",
     "@plumber/types": "file:../types",
     "@taskforcesh/bullmq-pro": "7.7.1",
@@ -52,7 +52,7 @@
     "dotenv": "^10.0.0",
     "electrodb": "2.12.0",
     "email-validator": "2.0.4",
-    "express": "4.19.2",
+    "express": "4.21.2",
     "form-data": "4.0.0",
     "graphql": "16.8.1",
     "graphql-middleware": "6.1.35",
@@ -69,7 +69,7 @@
     "luxon": "2.5.2",
     "morgan": "^1.10.0",
     "multer": "1.4.5-lts.1",
-    "nanoid": "3.3.6",
+    "nanoid": "3.3.8",
     "objection": "^3.0.0",
     "p-limit": "3.1.0",
     "pg": "^8.7.1",
@@ -105,5 +105,5 @@
     "tsconfig-paths": "^4.2.0",
     "type-fest": "4.10.3"
   },
-  "version": "1.32.3"
+  "version": "1.33.0"
 }

packages/backend/package.json

@@ -535,4 +535,59 @@ describe('decrypt form response', () => {
       expect(mocks.getSdk).toBeCalledWith('staging')
     })
   })
+
+  describe('local address field', () => {
+    it('should handle local address fields', async () => {
+      $.flow.hasFileProcessingActions = false
+      mocks.cryptoDecrypt.mockReturnValueOnce({
+        responses: [
+          {
+            _id: 'addressFieldComplete',
+            fieldType: 'address',
+            question: 'What is your address?',
+            answerArray: [
+              '51',
+              'BRAS BASAH ROAD',
+              'Lazada One',
+              '08',
+              '888',
+              '189554',
+            ],
+          },
+          {
+            _id: 'addressFieldPartial',
+            fieldType: 'address',
+            question: 'What is your address?',
+            answerArray: ['51', 'BRAS BASAH ROAD', '', '', '', '189554'],
+          },
+        ],
+      })
+
+      await expect(decryptFormResponse($)).resolves.toEqual(true)
+      expect($.request.body).toEqual(
+        expect.objectContaining({
+          fields: {
+            addressFieldComplete: {
+              fieldType: 'address',
+              question: 'What is your address?',
+              answerArray: [
+                '51',
+                'BRAS BASAH ROAD',
+                'Lazada One',
+                '#08-888',
+                '189554',
+              ],
+              order: 1,
+            },
+            addressFieldPartial: {
+              fieldType: 'address',
+              question: 'What is your address?',
+              answerArray: ['51', 'BRAS BASAH ROAD', '', '', '189554'],
+              order: 2,
+            },
+          },
+        }),
+      )
+    })
+  })
 })

packages/backend/src/apps/formsg/__tests__/auth/decrypt-form-response.test.ts

@@ -7,6 +7,7 @@ import {
 
 import { beforeEach, describe, expect, it } from 'vitest'
 
+import { ADDRESS_LABELS } from '../../common/constants'
 import trigger from '../../triggers/new-submission'
 
 describe('new submission trigger', () => {
@@ -290,6 +291,24 @@ describe('new submission trigger for answer array fields', () => {
             order: 3,
             answerArray: ['weird', 'strange'],
           },
+          addressFieldComplete: {
+            question: 'What is your address?',
+            fieldType: 'address',
+            order: 4,
+            answerArray: [
+              '51',
+              'BRAS BASAH ROAD',
+              'Lazada One',
+              '#08-888',
+              '189554',
+            ],
+          },
+          addressFieldPartial: {
+            question: 'What is your address?',
+            fieldType: 'address',
+            order: 5,
+            answerArray: ['51', 'BRAS BASAH ROAD', '', '', '189554'], // Some empty fields
+          },
         },
       },
     } as unknown as IExecutionStep
@@ -343,5 +362,25 @@ describe('new submission trigger for answer array fields', () => {
       const metadata = await trigger.getDataOutMetadata(executionStep)
       expect(metadata.fields.textFieldId3.answerArray).toBeUndefined()
     })
+
+    it('Address type: includes all address fields', async () => {
+      const metadata = await trigger.getDataOutMetadata(executionStep)
+      const addressMetadata = metadata.fields.addressFieldComplete
+        .answerArray as IDataOutMetadatum[]
+
+      expect(addressMetadata).toHaveLength(5)
+      ADDRESS_LABELS.forEach((label, index) => {
+        expect(addressMetadata[index].label).toEqual(`Response 4, ${label}`)
+      })
+    })
+
+    it('Address type: includes all metadata for empty address fields', async () => {
+      const metadata = await trigger.getDataOutMetadata(executionStep)
+      const addressMetadata = metadata.fields.addressFieldPartial
+        .answerArray as IDataOutMetadatum[]
+      ADDRESS_LABELS.forEach((label, index) => {
+        expect(addressMetadata[index].label).toEqual(`Response 5, ${label}`)
+      })
+    })
   })
 })

packages/backend/src/apps/formsg/__tests__/triggers/new-submission.test.ts

@@ -16,6 +16,19 @@ import storeAttachmentInS3 from './helpers/store-attachment-in-s3'
 
 const NRIC_VERIFIED_FIELDS = new Set(['sgidUinFin', 'uinFin'])
 
+function processLocalAddress(answerArray: string[]): string[] {
+  const answer = [...answerArray]
+
+  // Combine level number and unit number if both exist
+  const levelNumber = answer[3]
+  const unitNumber = answer[4]
+  answer[3] = levelNumber && unitNumber ? `#${levelNumber}-${unitNumber}` : ''
+  // Remove element at index 4 since we've combined it with element 3
+  answer.splice(4, 1)
+
+  return answer
+}
+
 /**
  * Filters NRIC if an NRIC filter was configured for the pipe.
  *
@@ -119,6 +132,10 @@ export async function decryptFormResponse(
         )
       }
 
+      if (rest.fieldType === 'address') {
+        rest.answerArray = processLocalAddress(rest.answerArray as string[])
+      }
+
       // Note: the order may not be sequential; fields (e.g. NRIC) can be
       // omitted from the output.
       // Note: FormSG uses dot notation for field ids for MyInfo children

packages/backend/src/apps/formsg/auth/decrypt-form-response.ts

@@ -1 +1,22 @@
 export const FORM_ID_LENGTH = 24
+
+/**
+ * NOTE: this must be updated if there are any changes to the address fields
+ * Currently following the same field names as FormSG
+ */
+export const ADDRESS_LABELS = [
+  'Block number',
+  'Street name',
+  'Building name',
+  // this combines level number and unit number
+  'Unit number',
+  'Postal code',
+]
+
+// Reference form response for local address
+// ---
+// {
+//   question: 'Local address',
+//   fieldType: 'address',
+//   answerArray: [ '51', 'BRAS BASAH ROAD', 'Lazada One', '8', '8888', '189554' ]
+// }

packages/backend/src/apps/formsg/common/constants.ts

@@ -10,6 +10,8 @@ import {
 import logger from '@/helpers/logger'
 import { parseS3Id } from '@/helpers/s3'
 
+import { ADDRESS_LABELS } from '../../common/constants'
+
 function buildQuestionMetadatum(fieldData: IJSONObject): IDataOutMetadatum {
   const question: IDataOutMetadatum = {
     type: 'text',
@@ -57,8 +59,20 @@ function isAnswerArrayValid(fieldData: IJSONObject): boolean {
   if (!fieldData.answerArray) {
     return false
   }
-  // strict check for only table and checkbox variables
-  return fieldData.fieldType === 'table' || fieldData.fieldType === 'checkbox'
+  // strict check for only table, checkbox and address variables
+  const answerArrayFields = ['table', 'checkbox', 'address']
+  return answerArrayFields.includes(fieldData.fieldType as string)
+}
+
+function buildAnswerArrayForAddress(fieldData: IJSONObject): IDataOutMetadata {
+  const { order } = fieldData
+
+  // NOTE: we return all labels as there are some optional fields in FormSG
+  return ADDRESS_LABELS.map((label, index) => ({
+    type: 'text',
+    label: `Response ${order}, ${label}`,
+    order: order ? `${order}.${index + 1}` : null,
+  }))
 }
 
 function buildAnswerArrayForCheckbox(
@@ -108,6 +122,8 @@ function buildAnswerArrayMetadatum(
       return buildAnswerArrayForCheckbox(fieldData)
     case 'table':
       return buildAnswerArrayForTable(fieldData)
+    case 'address':
+      return buildAnswerArrayForAddress(fieldData)
     default:
       logger.warn(`Answer array unknown fieldtype: ${fieldType}`, {
         fieldType,

packages/backend/src/apps/formsg/triggers/new-submission/get-data-out-metadata.ts

@@ -64,6 +64,10 @@ function generateVerifiedSubmitterInfoData(
   return {}
 }
 
+function generateMockAddressData(): string[] {
+  return ['51', 'BRAS BASAH ROAD', 'Lazada One', '#08-888', '189554']
+}
+
 function generateMockPaymentData(products: Partial<PaymentProduct>[]) {
   // if there are no payment products, default to a mocked one
   const firstProduct: Partial<PaymentProduct> =
@@ -114,6 +118,11 @@ async function getMockData($: IGlobalVariable) {
           }
         }
 
+        if (data.responses[formFields[i]._id].fieldType === 'address') {
+          data.responses[formFields[i]._id].answerArray =
+            generateMockAddressData()
+        }
+
         if (data.responses[formFields[i]._id].fieldType === 'attachment') {
           data.responses[formFields[i]._id].answer = MOCK_ATTACHMENT_FILE_PATH
         }