Release v1.49.0 (#1136)

chore: new landing page refactor
chore: set ioredis config to resend failed command
chore: order excel single row output
chore: allow lookup for blank cells in Excel actions
chore: bump axios and multer
fix: warn for unsaved changes on delete step
fix: warn for unsaved changes on publish
fix: remove deleted FormSG attachments from email step parameters
fix: postman attachments selector

Author: kevinkim-ogp

package-lock.json

@@ -24,6 +24,9 @@
       "packages/*"
     ]
   },
+  "overrides": {
+    "axios": "1.11.0"
+  },
   "devDependencies": {
     "@eddeee888/gcg-typescript-resolver-files": "0.7.2",
     "@graphql-codegen/cli": "5.0.6",

package.json

@@ -41,7 +41,7 @@
     "@taskforcesh/bullmq-pro": "7.7.1",
     "ajv-formats": "^2.1.1",
     "async-mutex": "0.4.0",
-    "axios": "1.8.3",
+    "axios": "1.11.0",
     "big.js": "6.2.1",
     "cookie-parser": "1.4.6",
     "copyfiles": "^2.4.1",
@@ -69,7 +69,7 @@
     "lottie-web": "5.12.2",
     "luxon": "2.5.2",
     "morgan": "^1.10.0",
-    "multer": "2.0.1",
+    "multer": "2.0.2",
     "nanoid": "3.3.8",
     "objection": "^3.0.0",
     "p-limit": "3.1.0",
@@ -108,5 +108,5 @@
     "tsconfig-paths": "^4.2.0",
     "type-fest": "4.10.3"
   },
-  "version": "1.48.1"
+  "version": "1.49.0"
 }

packages/backend/package.json

@@ -83,6 +83,9 @@ describe('getTableRowsAction', () => {
         ['non-matching', 'data1'],
         ['test-value', 'data2'],
         ['test-value', 'data3'],
+        ['', 'data4'],
+        ['row5', ''],
+        ['', 'data6'],
       ],
       headerSheetRowIndex: 0,
     })
@@ -202,6 +205,56 @@ describe('getTableRowsAction', () => {
     expect(rowData[1].data[getHexEncodedColumnName('Column2')]).toBe('data3')
   })
 
+  it('should return matching rows when lookup value is empty', async () => {
+    $.step.parameters.lookupValue = ''
+    await getTableRowsAction.run($)
+
+    expect($.setActionItem).toHaveBeenCalledWith({
+      raw: expect.objectContaining({
+        rowsFound: 2,
+        data: {
+          columns: expect.arrayContaining([
+            expect.objectContaining({
+              id: getHexEncodedColumnName('Column1'),
+              name: 'Column1',
+              value: `data.rows.*.data.${getHexEncodedColumnName('Column1')}`,
+            }),
+            expect.objectContaining({
+              id: getHexEncodedColumnName('Column2'),
+              name: 'Column2',
+              value: `data.rows.*.data.${getHexEncodedColumnName('Column2')}`,
+            }),
+          ]),
+          rows: expect.arrayContaining([
+            expect.objectContaining({
+              data: {
+                [getHexEncodedColumnName('Column1')]: '',
+                [getHexEncodedColumnName('Column2')]: 'data4',
+              },
+            }),
+            expect.objectContaining({
+              data: {
+                [getHexEncodedColumnName('Column1')]: '',
+                [getHexEncodedColumnName('Column2')]: 'data6',
+              },
+            }),
+          ]),
+          inputSource: FOR_EACH_INPUT_SOURCE.M365_EXCEL,
+        },
+      }),
+    })
+
+    // Verify the rowData contains the expected rows
+    const call = ($.setActionItem as ReturnType<typeof vi.fn>).mock.calls[0][0]
+    const rowData = call.raw.data.rows
+
+    expect(rowData).toHaveLength(2)
+    expect(rowData[0].data[getHexEncodedColumnName('Column1')]).toBe('')
+    expect(rowData[0].data[getHexEncodedColumnName('Column2')]).toBe('data4')
+    expect(rowData[1].data[getHexEncodedColumnName('Column1')]).toBe('')
+    expect(rowData[1].data[getHexEncodedColumnName('Column2')]).toBe('data6')
+  })
+
   it('should handle invalid parameters', async () => {
     $.step.parameters.fileId = ''
     await expect(getTableRowsAction.run($)).rejects.toThrow(StepError)

packages/backend/src/apps/m365-excel/__tests__/actions/get-table-rows.itest.ts

@@ -21,12 +21,21 @@ async function getDataOutMetadata(
     return metadata
   }
 
+  // hide column array from the output, its only used to order the row data
+  metadata.columns =
+    dataOut?.columns?.map((column) => ({
+      type: 'text',
+      label: column,
+      isHidden: true,
+    })) || []
+
   metadata.rowData = Object.create(null)
   for (const [key, datum] of Object.entries(dataOut.rowData)) {
     metadata.rowData[key] = {
       value: {
         type: 'text',
         label: datum.columnName,
+        order: (dataOut?.columns?.indexOf(datum.columnName) ?? 0) + 1,
       },
       columnName: {
         isHidden: true,
@@ -57,5 +66,6 @@ export default getDataOutMetadata
 //       value: '5',
 //     },
 //   },
-//   sheetRowNumber: 3
+//   sheetRowNumber: 3,
+//   columns: ['Item', 'Unit Price'],
 // }

packages/backend/src/apps/m365-excel/actions/get-table-row/get-data-out-metadata.ts

@@ -104,9 +104,9 @@ const action: IRawAction = {
       // weird (e.g. currency cells have a trailing space), and will lead to too
       // much user confusion.
       description:
-        'Case sensitive and should not include units. E.g. $5.20 → 5.2',
+        'Case sensitive and should not include units (e.g., $5.20 → 5.2). Leave blank to search for empty cells.',
       type: 'string' as const,
-      required: true,
+      required: false,
       variables: true,
       hiddenIf: {
         fieldKey: 'tableId',
@@ -174,6 +174,7 @@ const action: IRawAction = {
           columns,
         }),
         sheetRowNumber,
+        columns,
       } satisfies DataOut,
     })
   },

packages/backend/src/apps/m365-excel/actions/get-table-row/index.ts

@@ -17,7 +17,7 @@ export const parametersSchema = z.object({
   }),
   // * We don't trim as we want to match _exactly_ on the user's input.
   // * We allow empty strings to support optional form fields.
-  lookupValue: z.string(),
+  lookupValue: z.string().default(''),
 })
 
 export const dataOutSchema = z.discriminatedUnion('foundRow', [
@@ -26,5 +26,7 @@ export const dataOutSchema = z.discriminatedUnion('foundRow', [
     foundRow: z.literal(true),
     rowData: hexEncodedRowRecordSchema,
     sheetRowNumber: z.number(),
+    // optional for backward compatibility
+    columns: z.array(z.string()).optional(),
   }),
 ])

packages/backend/src/apps/m365-excel/actions/get-table-row/schemas.ts

@@ -103,9 +103,9 @@ const action: IRawAction = {
       // weird (e.g. currency cells have a trailing space), and will lead to too
       // much user confusion.
       description:
-        'Case sensitive and should not include units. E.g. $5.20 → 5.2',
+        'Case sensitive and should not include units (e.g., $5.20 → 5.2). Leave blank to search for empty cells.',
       type: 'string' as const,
-      required: true,
+      required: false,
       variables: true,
     },
   ],

packages/backend/src/apps/m365-excel/actions/get-table-rows/index.ts

@@ -17,7 +17,7 @@ export const parametersSchema = z.object({
   }),
   // * We don't trim as we want to match _exactly_ on the user's input.
   // * We allow empty strings to support optional form fields.
-  lookupValue: z.string(),
+  lookupValue: z.string().default(''),
 })
 
 export const dataOutSchema = z.object({

packages/backend/src/apps/m365-excel/actions/get-table-rows/schemas.ts

@@ -10,7 +10,6 @@ export const REDIS_DB_INDEX = {
   RATE_LIMIT: 1,
   PIPE_ERRORS: 2,
   APP_DATA: 3,
-  GLOBAL_DATA: 4,
 }
 
 function reconnectOnError(err: Error) {
@@ -19,7 +18,9 @@ function reconnectOnError(err: Error) {
   if (err.message.includes(targetError)) {
     // Only reconnect when the error contains "READONLY"
     // during node failover, this is thrown: 149: -READONLY You can't write against a read only replica.
-    return true
+    // Using reconnectOnError, we can force the connection to reconnect on this error in order to connect to the new master.
+    // We return 2 so that ioredis will resend the failed command after reconnecting.
+    return 2
   }
   return false
 }