Skip to content
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

Jump to bottom

fix importing creates duplicate resources #7081

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+71 −44
Open

fix importing creates duplicate resources #7081

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
115 changes: 71 additions & 44 deletions packages/insomnia/src/common/import.ts
View file
Open in desktop
Expand Up @@ -193,48 +193,67 @@ export const importResourcesToWorkspace = async ({ workspaceId }: { workspaceId:

for (const environment of subEnvironments) {
const model = getModel(environment.type);
model && ResourceIdMap.set(environment._id, generateId(model.prefix));

await db.docCreate(environment.type, {
...environment,
_id: ResourceIdMap.get(environment._id),
parentId: baseEnvironment._id,
});
model && ResourceIdMap.set(environment._id, environment._id || generateId(model.prefix));
if (model) {
const existingEnvironment = await db.get(model?.type, environment._id);
if (existingEnvironment) {
await db.docUpdate(existingEnvironment, {
...environment,
_id: ResourceIdMap.get(environment._id),
parentId: baseEnvironment._id,
});
} else {
await db.docCreate(environment.type, {
...environment,
_id: ResourceIdMap.get(environment._id),
parentId: baseEnvironment._id,
});
}
}
}

// Create new ids for each resource below optionalResources
// Create new ids if needed for each resource below optionalResources
for (const resource of optionalResources) {
const model = getModel(resource.type);
model && ResourceIdMap.set(resource._id, generateId(model.prefix));
model && ResourceIdMap.set(resource._id, resource._id || generateId(model.prefix));
}

// Preserve optionalResource relationships
for (const resource of optionalResources) {
const model = getModel(resource.type);
if (model) {
// Make sure we point to the new proto file
if (isGrpcRequest(resource)) {
await db.docCreate(model.type, {
...resource,
_id: ResourceIdMap.get(resource._id),
protoFileId: ResourceIdMap.get(resource.protoFileId),
parentId: ResourceIdMap.get(resource.parentId),
});

// Make sure we point unit test to the new request
} else if (isUnitTest(resource)) {
await db.docCreate(model.type, {
const existingDoc = await db.get(model?.type, resource._id);
if (existingDoc) {
await db.docUpdate(existingDoc, {
...resource,
_id: ResourceIdMap.get(resource._id),
requestId: ResourceIdMap.get(resource.requestId),
parentId: ResourceIdMap.get(resource.parentId),
});
} else {
await db.docCreate(model.type, {
...resource,
_id: ResourceIdMap.get(resource._id),
parentId: ResourceIdMap.get(resource.parentId),
});
// Make sure we point to the new proto file
if (isGrpcRequest(resource)) {
await db.docCreate(model.type, {
...resource,
_id: ResourceIdMap.get(resource._id),
protoFileId: ResourceIdMap.get(resource.protoFileId),
parentId: ResourceIdMap.get(resource.parentId),
});

// Make sure we point unit test to the new request
} else if (isUnitTest(resource)) {
await db.docCreate(model.type, {
...resource,
_id: ResourceIdMap.get(resource._id),
requestId: ResourceIdMap.get(resource.requestId),
parentId: ResourceIdMap.get(resource.parentId),
});
} else {
await db.docCreate(model.type, {
...resource,
_id: ResourceIdMap.get(resource._id),
parentId: ResourceIdMap.get(resource.parentId),
});
}
}
}
}
Expand Down Expand Up @@ -288,7 +307,6 @@ const importResourcesToNewWorkspace = async (projectId: string, workspaceToImpor
contentType: apiSpec.contentType,
fileName: workspaceToImport?.name,
});

}

// If we're importing into a new workspace
Expand All @@ -302,33 +320,42 @@ const importResourcesToNewWorkspace = async (projectId: string, workspaceToImpor

for (const resource of resourcesWithoutWorkspaceAndApiSpec) {
const model = getModel(resource.type);
model && ResourceIdMap.set(resource._id, generateId(model.prefix));
model && ResourceIdMap.set(resource._id, resource._id || generateId(model.prefix));
}

for (const resource of resourcesWithoutWorkspaceAndApiSpec) {
const model = getModel(resource.type);

if (model) {
if (isGrpcRequest(resource)) {
await db.docCreate(model.type, {
const existingResource = await db.get(model.type, resource._id);
if (existingResource) {
await db.docUpdate(existingResource, {
...resource,
_id: ResourceIdMap.get(resource._id),
protoFileId: ResourceIdMap.get(resource.protoFileId),
parentId: ResourceIdMap.get(resource.parentId),
});
} else if (isUnitTest(resource)) {
await db.docCreate(model.type, {
...resource,
_id: ResourceIdMap.get(resource._id),
requestId: ResourceIdMap.get(resource.requestId),
parentId: ResourceIdMap.get(resource.parentId),
});
} else {
await db.docCreate(model.type, {
...resource,
_id: ResourceIdMap.get(resource._id),
parentId: ResourceIdMap.get(resource.parentId),
});
if (isGrpcRequest(resource)) {
await db.docCreate(model.type, {
...resource,
_id: ResourceIdMap.get(resource._id),
protoFileId: ResourceIdMap.get(resource.protoFileId),
parentId: ResourceIdMap.get(resource.parentId),
});
} else if (isUnitTest(resource)) {
await db.docCreate(model.type, {
...resource,
_id: ResourceIdMap.get(resource._id),
requestId: ResourceIdMap.get(resource.requestId),
parentId: ResourceIdMap.get(resource.parentId),
});
} else {
await db.docCreate(model.type, {
...resource,
_id: ResourceIdMap.get(resource._id),
parentId: ResourceIdMap.get(resource.parentId),
});
}
}
}
}
Expand Down