fix Kong#5942: Retain exported ID for resource

schminkel · Oct 4, 2023 · e00173c · e00173c
1 parent 7867080
commit e00173c
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/packages/insomnia/src/common/import.ts b/packages/insomnia/src/common/import.ts
@@ -201,7 +201,14 @@ export const importResourcesToWorkspace = async ({ workspaceId }: { workspaceId:
  // Create new ids for each resource below optionalResources
  for (const resource of optionalResources) {
  const model = getModel(resource.type);
- model && ResourceIdMap.set(resource._id, generateId(model.prefix));
+ if (model) {
+ if (!resource._id) {
+ ResourceIdMap.set(resource._id, generateId(model.prefix));
+ } else {
+ console.log('[Import Scan] Retaining ID: ', resource._id);
+ ResourceIdMap.set(resource._id, resource._id);
+ }
+ }
  }
 
  // Preserve optionalResource relationships
@@ -298,7 +305,14 @@ const importResourcesToNewWorkspace = async (projectId: string, workspaceToImpor
 
  for (const resource of resourcesWithoutWorkspaceAndApiSpec) {
  const model = getModel(resource.type);
- model && ResourceIdMap.set(resource._id, generateId(model.prefix));
+ if (model) {
+ if (!resource._id) {
+ ResourceIdMap.set(resource._id, generateId(model.prefix));
+ } else {
+ console.log('[Import Scan] Retaining ID: ', resource._id);
+ ResourceIdMap.set(resource._id, resource._id);
+ }
+ }
  }
 
  for (const resource of resourcesWithoutWorkspaceAndApiSpec) {