Skip to content

preserve relationships in nunjucks tags #7915

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

Merged
jackkav merged 1 commit into from
Sep 5, 2024
Merged

preserve relationships in nunjucks tags #7915

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
20 changes: 20 additions & 0 deletions packages/insomnia/src/common/import.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,22 @@ export async function importResourcesToProject({ projectId }: { projectId: strin
await db.flushChanges(bufferId);
return { resources: r.flat() };
}
const updateIdsInString = (str: string, ResourceIdMap: Map<string, string>) => {
let newString = str;
for (const [idA, idB] of ResourceIdMap.entries()) {
newString = newString.replace(new RegExp(idA, 'g'), idB);
}
return newString;
};

const importRequestWithNewIds = (request: Request, ResourceIdMap: Map<string, string>) => {
const newRequestWithIdsUpdated = JSON.parse(updateIdsInString(JSON.stringify(request), ResourceIdMap));
return ({
...newRequestWithIdsUpdated,
_id: ResourceIdMap.get(request._id),
parentId: ResourceIdMap.get(request.parentId),
});
};

export const importResourcesToWorkspace = async ({ workspaceId }: { workspaceId: string }) => {
invariant(ResourceCache, 'No resources to import');
Expand Down Expand Up @@ -297,6 +313,8 @@ export const importResourcesToWorkspace = async ({ workspaceId }: { workspaceId:
requestId: ResourceIdMap.get(resource.requestId),
parentId: ResourceIdMap.get(resource.parentId),
});
} else if (isRequest(resource)) {
await db.docCreate(model.type, importRequestWithNewIds(resource, ResourceIdMap));
} else {
await db.docCreate(model.type, {
...resource,
Expand Down Expand Up @@ -398,6 +416,8 @@ const importResourcesToNewWorkspace = async (projectId: string, workspaceToImpor
requestId: ResourceIdMap.get(resource.requestId),
parentId: ResourceIdMap.get(resource.parentId),
});
} else if (isRequest(resource)) {
await db.docCreate(model.type, importRequestWithNewIds(resource, ResourceIdMap));
} else {
await db.docCreate(model.type, {
...resource,
Expand Down