Merge branch 'master' into orphaned-payees

packages/desktop-client/e2e/accounts.test.js

@@ -1,3 +1,5 @@
+import { join } from 'path';
+
 import { test, expect } from '@playwright/test';
 
 import { ConfigurationPage } from './page-models/configuration-page';
@@ -9,7 +11,7 @@ test.describe('Accounts', () => {
   let configurationPage;
   let accountPage;
 
-  test.beforeAll(async ({ browser }) => {
+  test.beforeEach(async ({ browser }) => {
     page = await browser.newPage();
     navigation = new Navigation(page);
     configurationPage = new ConfigurationPage(page);
@@ -18,7 +20,7 @@ test.describe('Accounts', () => {
     await configurationPage.createTestFile();
   });
 
-  test.afterAll(async () => {
+  test.afterEach(async () => {
     await page.close();
   });
 
@@ -99,4 +101,40 @@ test.describe('Accounts', () => {
       await expect(transaction.account).toHaveText('Ally Savings');
     });
   });
+
+  test.describe('Import Transactions', () => {
+    test.beforeEach(async () => {
+      accountPage = await navigation.createAccount({
+        name: 'CSV import',
+        offBudget: false,
+        balance: 0,
+      });
+    });
+
+    async function importCsv(screenshot = false) {
+      const fileChooserPromise = page.waitForEvent('filechooser');
+      await accountPage.page.getByRole('button', { name: 'Import' }).click();
+
+      const fileChooser = await fileChooserPromise;
+      await fileChooser.setFiles(join(__dirname, 'data/test.csv'));
+
+      if (screenshot) await expect(page).toMatchThemeScreenshots();
+
+      const importButton = accountPage.page.getByRole('button', {
+        name: /Import \d+ transactions/,
+      });
+      await importButton.click();
+
+      await expect(importButton).not.toBeVisible();
+    }
+
+    test('imports transactions from a CSV file', async () => {
+      await importCsv(true);
+    });
+
+    test('import csv file twice', async () => {
+      await importCsv(false);
+      await importCsv(true);
+    });
+  });
 });

packages/desktop-client/e2e/data/test.csv

@@ -0,0 +1,9 @@
+Date,Payee,Notes,Category,Amount
+2024-08-02,Deposit,test 1,Income,1787.76
+2024-07-02,Deposit,test 2,Income,1787.76
+2024-06-02,Deposit,test 3,Income,1787.76
+2024-05-02,Deposit,test 4,Income,1787.76
+2024-04-02,Deposit,test 5,Income,1787.76
+2024-03-02,Deposit,test 6,Income,1787.76
+2024-02-02,Deposit,test 7,Income,1787.76
+2024-01-02,Starting Balance,test 8,Starting Balances,-330000

packages/desktop-client/src/components/modals/ImportTransactionsModal/FieldMappings.jsx

@@ -6,6 +6,7 @@ import { SectionLabel } from '../../forms';
 
 import { SelectField } from './SelectField';
 import { SubLabel } from './SubLabel';
+import { stripCsvImportTransaction } from './utils';
 
 export function FieldMappings({
   transactions,
@@ -19,8 +20,7 @@ export function FieldMappings({
     return null;
   }
 
-  const { existing, ignored, selected, selected_merge, trx_id, ...trans } =
-    transactions[0];
+  const trans = stripCsvImportTransaction(transactions[0]);
   const options = Object.keys(trans);
   mappings = mappings || {};
 
@@ -33,45 +33,41 @@ export function FieldMappings({
         spacing={1}
         style={{ marginTop: 5 }}
       >
-        <View style={{ flex: 1 }}>
+        <View style={{ flex: 1, marginRight: 10 }}>
           <SubLabel title="Date" />
           <SelectField
             options={options}
             value={mappings.date}
-            style={{ marginRight: 5 }}
             onChange={name => onChange('date', name)}
             hasHeaderRow={hasHeaderRow}
             firstTransaction={transactions[0]}
           />
         </View>
-        <View style={{ flex: 1 }}>
+        <View style={{ flex: 1, marginRight: 10 }}>
           <SubLabel title="Payee" />
           <SelectField
             options={options}
             value={mappings.payee}
-            style={{ marginRight: 5 }}
             onChange={name => onChange('payee', name)}
             hasHeaderRow={hasHeaderRow}
             firstTransaction={transactions[0]}
           />
         </View>
-        <View style={{ flex: 1 }}>
+        <View style={{ flex: 1, marginRight: 10 }}>
           <SubLabel title="Notes" />
           <SelectField
             options={options}
             value={mappings.notes}
-            style={{ marginRight: 5 }}
             onChange={name => onChange('notes', name)}
             hasHeaderRow={hasHeaderRow}
             firstTransaction={transactions[0]}
           />
         </View>
-        <View style={{ flex: 1 }}>
+        <View style={{ flex: 1, marginRight: 10 }}>
           <SubLabel title="Category" />
           <SelectField
             options={options}
             value={mappings.category}
-            style={{ marginRight: 5 }}
             onChange={name => onChange('category', name)}
             hasHeaderRow={hasHeaderRow}
             firstTransaction={transactions[0]}

packages/desktop-client/src/components/modals/ImportTransactionsModal/ImportTransactionsModal.jsx

@@ -29,6 +29,7 @@ import {
   dateFormats,
   parseAmountFields,
   parseDate,
+  stripCsvImportTransaction,
 } from './utils';
 
 function getFileType(filepath) {
@@ -59,7 +60,7 @@ function getInitialMappings(transactions) {
     return {};
   }
 
-  const transaction = transactions[0];
+  const transaction = stripCsvImportTransaction(transactions[0]);
   const fields = Object.entries(transaction);
 
   function key(entry) {

packages/desktop-client/src/components/modals/ImportTransactionsModal/utils.js

@@ -185,3 +185,10 @@ export function parseAmountFields(
     inflow: null,
   };
 }
+
+export function stripCsvImportTransaction(transaction) {
+  const { existing, ignored, selected, selected_merge, trx_id, ...trans } =
+    transaction;
+
+  return trans;
+}

packages/loot-core/src/server/accounts/rules.ts

@@ -443,12 +443,12 @@ export class Condition {
         if (fieldValue === null) {
           return false;
         }
-        return fieldValue.indexOf(this.value) !== -1;
+        return String(fieldValue).indexOf(this.value) !== -1;
       case 'doesNotContain':
         if (fieldValue === null) {
           return false;
         }
-        return fieldValue.indexOf(this.value) === -1;
+        return String(fieldValue).indexOf(this.value) === -1;
       case 'oneOf':
         if (fieldValue === null) {
           return false;
@@ -459,7 +459,7 @@ export class Condition {
         if (fieldValue === null) {
           return false;
         }
-        return fieldValue.indexOf(this.value) !== -1;
+        return String(fieldValue).indexOf(this.value) !== -1;
 
       case 'notOneOf':
         if (fieldValue === null) {

upcoming-release-notes/3499.md

@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [UnderKoen]
+---
+
+E2E tests for CSV import dialog

upcoming-release-notes/3605.md

@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [UnderKoen]
+---
+
+Fixes CSV import when CSV contains only 3 columns