mirror of
https://github.com/usebruno/bruno.git
synced 2026-06-11 09:51:30 +00:00
fix: allow file selection in multipart form without entering a key first (#7640)
This commit is contained in:
@@ -15,7 +15,7 @@ const Wrapper = styled.div`
|
||||
transition: color 0.15s ease;
|
||||
|
||||
&:hover {
|
||||
color: ${(props) => props.theme.colors.text.link};
|
||||
color: ${(props) => props.theme.text};
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -65,12 +65,21 @@ const MultipartFormParams = ({ item, collection }) => {
|
||||
const currentParams = item.draft
|
||||
? get(item, 'draft.request.body.multipartForm')
|
||||
: get(item, 'request.body.multipartForm');
|
||||
const updatedParams = (currentParams || []).map((p) => {
|
||||
if (p.uid === row.uid) {
|
||||
return { ...p, type: 'file', value: processedPaths };
|
||||
}
|
||||
return p;
|
||||
});
|
||||
const existsInParams = (currentParams || []).some((p) => p.uid === row.uid);
|
||||
let updatedParams;
|
||||
if (existsInParams) {
|
||||
updatedParams = currentParams.map((p) => {
|
||||
if (p.uid === row.uid) {
|
||||
return { ...p, type: 'file', value: processedPaths };
|
||||
}
|
||||
return p;
|
||||
});
|
||||
} else {
|
||||
updatedParams = [
|
||||
...(currentParams || []),
|
||||
{ uid: row.uid, name: row.name || '', enabled: true, type: 'file', value: processedPaths, contentType: '' }
|
||||
];
|
||||
}
|
||||
handleParamsChange(updatedParams);
|
||||
})
|
||||
.catch((error) => {
|
||||
@@ -139,13 +148,6 @@ const MultipartFormParams = ({ item, collection }) => {
|
||||
if (fileName) {
|
||||
return (
|
||||
<div className="flex items-center file-value-cell">
|
||||
<button
|
||||
className="clear-file-btn ml-1"
|
||||
onClick={() => handleClearFile(row)}
|
||||
title="Remove file"
|
||||
>
|
||||
<IconX size={16} />
|
||||
</button>
|
||||
<IconFile size={16} className="text-muted mr-1" />
|
||||
<div className="file-name flex-1 truncate" title={Array.isArray(value) ? value.join(', ') : value}>
|
||||
<SingleLineEditor
|
||||
@@ -156,6 +158,13 @@ const MultipartFormParams = ({ item, collection }) => {
|
||||
item={item}
|
||||
/>
|
||||
</div>
|
||||
<button
|
||||
className="clear-file-btn ml-1"
|
||||
onClick={() => handleClearFile(row)}
|
||||
title="Remove file"
|
||||
>
|
||||
<IconX size={16} />
|
||||
</button>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -71,7 +71,29 @@ const Wrapper = styled.div`
|
||||
|
||||
.upload-btn,
|
||||
.clear-file-btn {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 4px;
|
||||
color: ${(props) => props.theme.colors.text.muted};
|
||||
background: transparent;
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
border-radius: 4px;
|
||||
transition: color 0.15s ease;
|
||||
flex-shrink: 0;
|
||||
|
||||
&:hover {
|
||||
color: ${(props) => props.theme.text};
|
||||
}
|
||||
}
|
||||
|
||||
.clear-file-btn:hover {
|
||||
color: ${(props) => props.theme.colors.text.danger};
|
||||
}
|
||||
|
||||
.file-value-cell {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.value-cell {
|
||||
|
||||
@@ -0,0 +1,78 @@
|
||||
import { test, expect } from '../../../playwright';
|
||||
import { closeAllCollections, createCollection, createRequest, openCollection, openRequest, saveRequest, selectRequestPaneTab } from '../../utils/page';
|
||||
import { buildCommonLocators } from '../../utils/page/locators';
|
||||
import * as fs from 'fs';
|
||||
import * as path from 'path';
|
||||
|
||||
test.describe.serial('Multipart Form - File Select Without Key', () => {
|
||||
let tmpDir: string;
|
||||
let testFilePath: string;
|
||||
|
||||
test.afterAll(async ({ page, electronApp }) => {
|
||||
await electronApp.evaluate(({ dialog }) => {
|
||||
if ((dialog as any).__originalShowOpenDialog) {
|
||||
dialog.showOpenDialog = (dialog as any).__originalShowOpenDialog;
|
||||
delete (dialog as any).__originalShowOpenDialog;
|
||||
}
|
||||
});
|
||||
await closeAllCollections(page);
|
||||
});
|
||||
|
||||
test.beforeAll(async ({ page, electronApp, createTmpDir }) => {
|
||||
tmpDir = await createTmpDir('multipart-file-select');
|
||||
|
||||
// Create a temp file that the mocked dialog will "select"
|
||||
testFilePath = path.join(tmpDir, 'test-file.txt');
|
||||
await fs.promises.writeFile(testFilePath, 'hello world');
|
||||
expect(fs.existsSync(testFilePath)).toBe(true);
|
||||
|
||||
await electronApp.evaluate(({ dialog }, filePath: string) => {
|
||||
(dialog as any).__originalShowOpenDialog = dialog.showOpenDialog;
|
||||
dialog.showOpenDialog = async () => ({
|
||||
canceled: false,
|
||||
filePaths: [filePath]
|
||||
});
|
||||
}, testFilePath);
|
||||
|
||||
await test.step('Create collection and request', async () => {
|
||||
await createCollection(page, 'multipart-file-select', tmpDir);
|
||||
await createRequest(page, 'test-file-select', '', {
|
||||
url: 'https://testbench-sanity.usebruno.com/api/echo/json',
|
||||
method: 'POST',
|
||||
inFolder: false
|
||||
});
|
||||
});
|
||||
|
||||
await test.step('Open the request', async () => {
|
||||
await openCollection(page, 'multipart-file-select');
|
||||
await openRequest(page, 'multipart-file-select', 'test-file-select', { persist: true });
|
||||
});
|
||||
|
||||
await test.step('Switch body mode to Multipart Form', async () => {
|
||||
await selectRequestPaneTab(page, 'Body');
|
||||
const locators = buildCommonLocators(page);
|
||||
await locators.request.bodyModeSelector().click();
|
||||
await page.locator('.dropdown-item').filter({ hasText: 'Multipart Form' }).click();
|
||||
});
|
||||
});
|
||||
|
||||
test('file select should work on empty row without a key', async ({ page }) => {
|
||||
const table = buildCommonLocators(page).table('editable-table');
|
||||
|
||||
await test.step('Click upload on empty last row (no key entered)', async () => {
|
||||
const lastRow = table.allRows().last();
|
||||
const uploadBtn = lastRow.locator('.upload-btn');
|
||||
await expect(uploadBtn).toBeVisible();
|
||||
await uploadBtn.click();
|
||||
});
|
||||
|
||||
await test.step('Verify the file name appears in the row', async () => {
|
||||
const fileCell = table.allRows().locator('.file-value-cell').first();
|
||||
await expect(fileCell).toBeVisible();
|
||||
await expect(fileCell).toContainText('test-file.txt');
|
||||
});
|
||||
|
||||
// Save the request to clear draft state
|
||||
await saveRequest(page);
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user