notid/integreat
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

fixes a number of issues

Browse Source
This commit is contained in:
Bryce
2026-05-26 23:20:31 -07:00
parent 78bd1d92e0
commit 4fca49bff0
6 changed files with 199 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
e2e/bulk-code-transactions.spec.ts
View File

@@ -234,7 +234,7 @@ test.describe('Bulk Code Transactions - Happy Path', () => {
await openBulkCodeModal(page); await openBulkCodeModal(page);
// Should show all transactions // Should show all transactions
await expect(page.locator('text=Bulk editing 5 transactions')).toBeVisible(); await expect(page.locator('text=Bulk editing 6 transactions')).toBeVisible();
// Add account at 100% // Add account at 100%
await addNewAccount(page); await addNewAccount(page);
@@ -263,6 +263,61 @@ test.describe('Bulk Code Transactions - Validation', () => {
await expect(page.locator('#modal-holder[x-show="open"]')).toBeVisible(); await expect(page.locator('#modal-holder[x-show="open"]')).toBeVisible();
}); });
test('should preserve vendor and status on validation error', async ({ page }) => {
await navigateToTransactions(page);
await selectTransactionByIndex(page, 0);
await openBulkCodeModal(page);
// Select vendor
const testInfo = await getTestInfo(page);
const vendorId = testInfo.accounts.vendor;
const vendorContainer = page.locator('div[hx-post*="vendor-changed"]').first();
const vendorHidden = vendorContainer.locator('input[type="hidden"]').first();
await vendorHidden.evaluate((el: HTMLInputElement, value: string) => {
const newInput = document.createElement('input');
newInput.type = 'hidden';
newInput.name = el.name;
newInput.value = value;
el.parentNode.replaceChild(newInput, el);
}, vendorId.toString());
await vendorContainer.evaluate((el: HTMLElement) => {
el.dispatchEvent(new Event('change', { bubbles: true }));
});
await page.waitForResponse(response => response.url().includes('/vendor-changed') && response.status() === 200);
await page.waitForTimeout(500);
// Select approval status
const statusSelect = page.locator('select[name="step-params[approval-status]"]').first();
await statusSelect.selectOption('approved');
// Vendor selection pre-populated a default account row at 100%.
// Modify its percentage to 50% (invalid - doesn't total 100%).
await setAccountPercentage(page, 0, '50');
await submitBulkCodeForm(page);
await page.waitForTimeout(1000);
// Modal should still be open
await expect(page.locator('#modal-holder[x-show="open"]')).toBeVisible();
// Vendor should still be selected
const vendorHiddenAfter = page.locator('input[type="hidden"][name="step-params[vendor]"]').first();
const vendorValueAfter = await vendorHiddenAfter.inputValue();
expect(vendorValueAfter).toBe(vendorId.toString());
// Status should still be selected
const statusValueAfter = await statusSelect.inputValue();
expect(statusValueAfter).toBe('approved');
// Should show validation error
const errorText = await getModalErrorText(page);
expect(errorText).toContain('does not equal 100%');
});
test('should reject when account percentages total less than 100%', async ({ page }) => { test('should reject when account percentages total less than 100%', async ({ page }) => {
await navigateToTransactions(page); await navigateToTransactions(page);
await selectTransactionByIndex(page, 0); await selectTransactionByIndex(page, 0);
@@ -447,7 +502,7 @@ test.describe('Bulk Code Transactions - Vendor Pre-population', () => {
await page.waitForSelector('table tbody tr'); await page.waitForSelector('table tbody tr');
}); });
test('should NOT pre-populate default account when user has multiple clients', async ({ page }) => { test('should pre-populate non-clientized default account when user has multiple clients', async ({ page }) => {
// Switch to multi-client mode // Switch to multi-client mode
await page.request.get('/test-set-client-mode?mode=multi-client'); await page.request.get('/test-set-client-mode?mode=multi-client');
@@ -480,13 +535,15 @@ test.describe('Bulk Code Transactions - Vendor Pre-population', () => {
await page.waitForResponse(response => response.url().includes('/vendor-changed') && response.status() === 200); await page.waitForResponse(response => response.url().includes('/vendor-changed') && response.status() === 200);
await page.waitForTimeout(500); await page.waitForTimeout(500);
// Should NOT have pre-populated account rows - only the "New account" button row // Should pre-populate the vendor's default account (non-clientized) plus the "New account" row
const accountRows = page.locator('#account-entries tbody tr'); const accountInputs = page.locator('#account-entries input[type="hidden"][name*="[account]"]');
const rowCount = await accountRows.count(); const accountInputCount = await accountInputs.count();
expect(accountInputCount).toBe(1);
// With multi-client, no pre-population should happen, so only 1 row (the "New account" button)
expect(rowCount).toBe(1); // The pre-populated account should be the vendor's raw default account (test-account)
const accountValue = await accountInputs.first().inputValue();
expect(accountValue).toBe(testInfo.accounts['test-account'].toString());
// Switch back to single-client mode for other tests // Switch back to single-client mode for other tests
await page.request.get('/test-set-client-mode?mode=single-client'); await page.request.get('/test-set-client-mode?mode=single-client');
}); });

86
e2e/transaction-edit.spec.ts
View File

@@ -15,13 +15,8 @@ async function openEditModal(page: any, transactionIndex: number = 0) {
await page.waitForSelector('#modal-holder[x-show="open"]', { state: 'visible' }); await page.waitForSelector('#modal-holder[x-show="open"]', { state: 'visible' });
await page.waitForSelector('#wizardmodal'); await page.waitForSelector('#wizardmodal');
// Click Next to go to the links step (button says "Transaction Actions") // The modal is now single-page (Edit Transaction). Click "Manual" tab to ensure
await page.click('button:has-text("Transaction Actions")'); // the manual account coding form is active.
// Wait for the links step to load
await page.waitForSelector('text=Transaction Actions', { state: 'visible' });
// Click on "Manual" tab
await page.click('button:has-text("Manual")'); await page.click('button:has-text("Manual")');
// Wait for the manual form to appear // Wait for the manual form to appear
@@ -383,6 +378,83 @@ async function openEditModalForTransaction(page: any, description: string) {
await page.waitForSelector('text=Transaction Actions', { state: 'visible' }); await page.waitForSelector('text=Transaction Actions', { state: 'visible' });
} }
async function selectVendorFromTypeahead(page: any, vendorName: string) {
const testInfo = await getTestInfo(page);
const vendorId = testInfo.accounts.vendor;
if (!vendorId) {
throw new Error(`Could not find vendor with name ${vendorName}`);
}
const vendorContainer = page.locator('div[hx-post*="edit-vendor-changed"]').first();
const vendorHidden = vendorContainer.locator('input[type="hidden"]').first();
await vendorHidden.evaluate((el: HTMLInputElement, value: string) => {
const newInput = document.createElement('input');
newInput.type = 'hidden';
newInput.name = el.name;
newInput.value = value;
el.parentNode.replaceChild(newInput, el);
}, vendorId.toString());
await vendorContainer.evaluate((el: HTMLElement) => {
el.dispatchEvent(new Event('change', { bubbles: true }));
});
await page.waitForResponse(response => response.url().includes('/edit-vendor-changed') && response.status() === 200);
await page.waitForTimeout(500);
}
test.describe('Transaction Edit Vendor Pre-population', () => {
test('should start with no account rows when transaction has no accounts', async ({ page }) => {
await openEditModal(page, 3);
await page.click('button:has-text("Manual")');
await page.waitForSelector('#account-grid-body');
// Remove any existing accounts from previous tests
await removeAllAccounts(page);
await page.waitForTimeout(1000);
const accountRows = page.locator('#account-grid-body tbody tr.account-row');
const rowCount = await accountRows.count();
expect(rowCount).toBe(0);
});
test('should pre-populate default account when vendor is selected', async ({ page }) => {
await openEditModal(page, 3);
await page.click('button:has-text("Manual")');
await page.waitForSelector('#account-grid-body');
// Remove any existing accounts from previous tests
await removeAllAccounts(page);
await page.waitForTimeout(1000);
const accountRows = page.locator('#account-grid-body tbody tr.account-row');
const initialRowCount = await accountRows.count();
expect(initialRowCount).toBe(0);
await selectVendorFromTypeahead(page, 'Test Vendor');
const rowsAfterVendor = page.locator('#account-grid-body tbody tr.account-row');
const rowCountAfter = await rowsAfterVendor.count();
expect(rowCountAfter).toBe(1);
const accountHidden = page.locator('input[type="hidden"][name*="transaction-account/account"]').first();
const accountValue = await accountHidden.inputValue();
const testInfo = await getTestInfo(page);
expect(accountValue).toBe(testInfo.accounts['test-account'].toString());
const amountInput = page.locator('.account-amount-field').first();
const amountValue = await amountInput.inputValue();
expect(parseFloat(amountValue)).toBeCloseTo(400.0, 1);
});
});
test.describe('Transaction Link Date Display', () => { test.describe('Transaction Link Date Display', () => {
test('should show payment date when linking to payment', async ({ page }) => { test('should show payment date when linking to payment', async ({ page }) => {
await openEditModalForTransaction(page, 'Transaction for payment link'); await openEditModalForTransaction(page, 'Transaction for payment link');

6
e2e/transaction-navigation.spec.ts
View File

@@ -74,17 +74,17 @@ test.describe('Transaction Navigation - Amount Filter Persistence', () => {
test('should persist amount filter when navigating to Client Review', async ({ page }) => { test('should persist amount filter when navigating to Client Review', async ({ page }) => {
// Step 1: Navigate to All page and set amount filter // Step 1: Navigate to All page and set amount filter
await navigateToTransactions(page, '/transaction2'); await navigateToTransactions(page, '/transaction2');
await setAmountFilter(page, '', '250'); await setAmountFilter(page, '', '500');
// Step 2: Wait for URL to update // Step 2: Wait for URL to update
await page.waitForURL(url => url.search.includes('amount-lte=250'), { timeout: 5000 }); await page.waitForURL(url => url.search.includes('amount-lte=500'), { timeout: 5000 });
// Step 3: Click Client Review nav link // Step 3: Click Client Review nav link
await clickTransactionNavLink(page, 'Client Review'); await clickTransactionNavLink(page, 'Client Review');
// Step 4: Verify filter persisted // Step 4: Verify filter persisted
const feedbackUrl = page.url(); const feedbackUrl = page.url();
expect(feedbackUrl).toContain('amount-lte=250'); expect(feedbackUrl).toContain('amount-lte=500');
}); });
}); });

1
src/clj/auto_ap/ssr/form_cursor.clj
View File

@@ -56,7 +56,6 @@
(defn field-errors (defn field-errors
([] ([]
(println "CURRENT IS" *current*)
(field-errors *current*)) (field-errors *current*))
([cursor] ([cursor]
(get-in *form-errors* (cursor/path cursor)))) (get-in *form-errors* (cursor/path cursor))))

74
src/clj/auto_ap/ssr/transaction/bulk_code.clj
View File

@@ -185,25 +185,28 @@
:hx-target "#account-entries" :hx-target "#account-entries"
:hx-swap "innerHTML" :hx-swap "innerHTML"
:hx-include "closest form"} :hx-include "closest form"}
(fc/with-field :vendor (fc/with-field :vendor
(com/validated-field {:label "Vendor" (com/validated-field {:label "Vendor"
:errors (fc/field-errors)} :errors (fc/field-errors)}
(com/typeahead {:name (fc/field-name) (com/typeahead {:name (fc/field-name)
:placeholder "Search for vendor..." :placeholder "Search for vendor..."
:url (bidi/path-for ssr-routes/only-routes :vendor-search) :url (bidi/path-for ssr-routes/only-routes :vendor-search)
:content-fn (fn [c] (pull-attr (dc/db conn) :vendor/name c))})))] :value (fc/field-value)
:content-fn (fn [c] (pull-attr (dc/db conn) :vendor/name c))})))]
;; Status field ;; Status field
[:div [:div
(fc/with-field :approval-status (fc/with-field :approval-status
(com/validated-field {:label "Status" (com/validated-field {:label "Status"
:errors (fc/field-errors)} :errors (fc/field-errors)}
(com/select {:name (fc/field-name) (com/select {:name (fc/field-name)
:options [["" "No Change"] :value (some-> (fc/field-value)
["approved" "Approved"] name)
["unapproved" "Unapproved"] :options [["" "No Change"]
["suppressed" "Suppressed"] ["approved" "Approved"]
["requires_feedback" "Requires Feedback"]]})))] ["unapproved" "Unapproved"]
["suppressed" "Suppressed"]
["requires_feedback" "Requires Feedback"]]})))]
;; Accounts section ;; Accounts section
[:div.col-span-2.pt-4 [:div.col-span-2.pt-4
@@ -343,25 +346,26 @@
:percentage 1.0}) :percentage 1.0})
(defn- render-accounts-section [request] (defn- render-accounts-section [request]
(let [step-params (:step-params (:multi-form-state request))] (let [multi-form-state (:multi-form-state request)]
(html-response (html-response
[:div [:div
(fc/start-form step-params (fc/start-form multi-form-state
(when (:form-errors request) {:step-params (:form-errors request)}) (when (:form-errors request) {:step-params (:form-errors request)})
(fc/with-field :accounts (fc/with-field :step-params
(com/validated-field (fc/with-field :accounts
{:errors (fc/field-errors)} (com/validated-field
(com/data-grid {:headers [(com/data-grid-header {} "Account") {:errors (fc/field-errors)}
(com/data-grid-header {:class "w-32"} "Location") (com/data-grid {:headers [(com/data-grid-header {} "Account")
(com/data-grid-header {:class "w-16"} "%") (com/data-grid-header {:class "w-32"} "Location")
(com/data-grid-header {:class "w-16"})]} (com/data-grid-header {:class "w-16"} "%")
(fc/cursor-map #(transaction-account-row* {:value %})) (com/data-grid-header {:class "w-16"})]}
(com/data-grid-new-row {:colspan 4 (fc/cursor-map #(transaction-account-row* {:value %}))
:hx-get (bidi/path-for ssr-routes/only-routes (com/data-grid-new-row {:colspan 4
::route/bulk-code-new-account) :hx-get (bidi/path-for ssr-routes/only-routes
:row-offset 0 ::route/bulk-code-new-account)
:index (count (fc/field-value))} :row-offset 0
"New account")))))]))) :index (count (fc/field-value))}
"New account"))))))])))
(defn- single-client-id [request] (defn- single-client-id [request]
"Returns the client ID if the user has access to exactly one client, nil otherwise." "Returns the client ID if the user has access to exactly one client, nil otherwise."
@@ -373,10 +377,8 @@
step-params (:step-params (:multi-form-state request)) step-params (:step-params (:multi-form-state request))
client-id (single-client-id request) client-id (single-client-id request)
vendor-id (or (:vendor step-params) (:vendor snapshot)) vendor-id (or (:vendor step-params) (:vendor snapshot))
_ (println ::VENDOR-CHANGED :client-id client-id :vendor-id vendor-id :accounts-empty (empty? (:accounts step-params)))
updated-step-params (if (and (empty? (:accounts step-params)) updated-step-params (if (and (empty? (:accounts step-params))
vendor-id vendor-id)
client-id)
(if-let [default-account (vendor-default-account vendor-id client-id)] (if-let [default-account (vendor-default-account vendor-id client-id)]
(assoc step-params :accounts [(build-default-account-row default-account)]) (assoc step-params :accounts [(build-default-account-row default-account)])
step-params) step-params)

20
test/clj/auto_ap/test_server.clj
View File

@@ -135,13 +135,19 @@
:payment/status :payment-status/pending :payment/status :payment-status/pending
:payment/date #inst "2023-06-15") :payment/date #inst "2023-06-15")
;; Transaction and unpaid invoice for link testing ;; Transaction and unpaid invoice for link testing
(test-transaction :db/id "transaction-id-unpaid" (test-transaction :db/id "transaction-id-unpaid"
:transaction/client "client-id" :transaction/client "client-id"
:transaction/bank-account "bank-account-id" :transaction/bank-account "bank-account-id"
:transaction/amount -150.0 :transaction/amount -150.0
:transaction/description-original "Transaction for unpaid invoice link" :transaction/description-original "Transaction for unpaid invoice link"
:transaction/approval-status :transaction-approval-status/unapproved) :transaction/approval-status :transaction-approval-status/unapproved)
(test-invoice :db/id "invoice-unpaid-id" (test-transaction :db/id "transaction-id-feedback"
:transaction/client "client-id"
:transaction/bank-account "bank-account-id"
:transaction/amount 400.0
:transaction/description-original "Transaction for feedback review"
:transaction/approval-status :transaction-approval-status/requires-feedback)
(test-invoice :db/id "invoice-unpaid-id"
:invoice/client "client-id" :invoice/client "client-id"
:invoice/vendor "vendor-id" :invoice/vendor "vendor-id"
:invoice/total 150.0 :invoice/total 150.0