Skip to content

fix: use collection name when importing from postman #7142

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 2 commits into from
Mar 8, 2024
Merged

fix: use collection name when importing from postman #7142

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39ee404
detect postman workspace name
jackkav Mar 4, 2024
c5ad782
check import type
jackkav Mar 5, 2024
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
10 changes: 10 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 @@ -8,6 +8,7 @@ import { BaseModel, getModel } from '../models/index';
import * as models from '../models/index';
import { isMockRoute, MockRoute } from '../models/mock-route';
import { isRequest, Request } from '../models/request';
import { isRequestGroup } from '../models/request-group';
import { isUnitTest, UnitTest } from '../models/unit-test';
import { isUnitTestSuite, UnitTestSuite } from '../models/unit-test-suite';
import {
Expand Down Expand Up @@ -151,10 +152,19 @@ export async function importResourcesToProject({ projectId }: { projectId: strin
invariant(ResourceCache, 'No resources to import');
const resources = ResourceCache.resources;
const bufferId = await db.bufferChanges();
const postmanTopLevelFolder = resources.find(
resource => isRequestGroup(resource) && resource.parentId === '__WORKSPACE_ID__'
) as Workspace | undefined;
if (ResourceCache.type.id === 'postman' && postmanTopLevelFolder) {
await importResourcesToNewWorkspace(projectId, postmanTopLevelFolder);
return { resources };
}
// No workspace, so create one
if (!resources.find(isWorkspace)) {
await importResourcesToNewWorkspace(projectId);
return { resources };
}
// One or more workspaces
const r = await Promise.all(resources.filter(isWorkspace)
.map(resource => importResourcesToNewWorkspace(projectId, resource)));

Expand Down