Skip to content

fix: copy-paste and clone losing request URL and body data #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chirag-bruno wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: copy-paste and clone losing request URL and body data #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions src/extension/ipc/collection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,6 +847,38 @@ const registerCollectionIpc = (watcher: CollectionWatcherInterface): void => {
}
});

registerHandler('renderer:clone-request', async (args) => {
const [sourcePathname, destPathname, newName, newSeq] = args as [string, string, string, number];

try {
if (!fs.existsSync(sourcePathname)) {
throw new Error(`source: ${sourcePathname} does not exist`);
}
if (fs.existsSync(destPathname)) {
throw new Error(`destination: ${destPathname} already exists`);
}

const collectionPath = findCollectionPathByItemPath(sourcePathname);
if (!collectionPath) {
throw new Error('Collection not found for the given pathname');
}

const format = getCollectionFormat(collectionPath);
const content = fs.readFileSync(sourcePathname, 'utf8');
const parsed = await parseRequest(content, { format });

parsed.name = newName;
parsed.seq = newSeq;

const newContent = await stringifyRequest(parsed, { format });
await writeFile(destPathname, newContent);

return { success: true };
} catch (error) {
throw error;
}
});

registerHandler('renderer:copy-item', async (args) => {
const [sourcePath, destinationPath] = args as [string, string];

Expand Down
24 changes: 6 additions & 18 deletions src/webview/providers/ReduxStore/slices/collections/actions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1041,9 +1041,6 @@ export const cloneItem = (newName: string, newFilename: string, itemUid: string,

const parentItem = findParentItemInCollection(collectionCopy, itemUid);
const filename = resolveRequestFilename(newFilename, collection.format);
const itemToSave = refreshUidsInItem(transformRequestToSaveToFilesystem(item));
set(itemToSave, 'name', trim(newName));
set(itemToSave, 'filename', trim(filename));
if (!parentItem) {
const reqWithSameNameExists = find(
collection.items,
Expand All @@ -1053,11 +1050,9 @@ export const cloneItem = (newName: string, newFilename: string, itemUid: string,
const fullPathname = path.join(collection.pathname, filename);
const { ipcRenderer } = window;
const requestItems = filter(collection.items, (i) => i.type !== 'folder');
itemToSave.seq = requestItems ? requestItems.length + 1 : 1;
const newSeq = requestItems ? requestItems.length + 1 : 1;

itemSchema
.validate(itemToSave)
.then(() => ipcRenderer.invoke('renderer:new-request', fullPathname, itemToSave))
ipcRenderer.invoke('renderer:clone-request', item.pathname, fullPathname, trim(newName), newSeq)
.then(resolve)
.catch(reject);

Expand All @@ -1082,11 +1077,9 @@ export const cloneItem = (newName: string, newFilename: string, itemUid: string,
const fullName = path.join(dirname, filename);
const { ipcRenderer } = window;
const requestItems = filter(parentItem.items, (i) => i.type !== 'folder');
itemToSave.seq = requestItems ? requestItems.length + 1 : 1;
const newSeq = requestItems ? requestItems.length + 1 : 1;

itemSchema
.validate(itemToSave)
.then(() => ipcRenderer.invoke('renderer:new-request', fullName, itemToSave))
ipcRenderer.invoke('renderer:clone-request', item.pathname, fullName, trim(newName), newSeq)
.then(resolve)
.catch(reject);

Expand Down Expand Up @@ -1159,17 +1152,12 @@ export const pasteItem = (targetCollectionUid: string, targetItemUid: string | n
const { newName, newFilename } = generateUniqueName(copiedItem.name, existingItems, false);

const filename = resolveRequestFilename(newFilename, targetCollection.format);
const itemToSave = refreshUidsInItem(transformRequestToSaveToFilesystem(copiedItem));
set(itemToSave, 'name', trim(newName));
set(itemToSave, 'filename', trim(filename));

const fullPathname = path.join(targetParentPathname, filename);
const { ipcRenderer } = window;
const requestItems = filter(existingItems, (i) => i.type !== 'folder');
itemToSave.seq = requestItems ? requestItems.length + 1 : 1;
const newSeq = requestItems ? requestItems.length + 1 : 1;

await itemSchema.validate(itemToSave);
await ipcRenderer.invoke('renderer:new-request', fullPathname, itemToSave, targetCollection.format);
await ipcRenderer.invoke('renderer:clone-request', copiedItem.pathname, fullPathname, trim(newName), newSeq);

dispatch(insertTaskIntoQueue({
uid: uuid(),
Expand Down