fix: oas should import requests where possible #9632
+69
−92
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -173,8 +173,12 @@ export async function scanResources(importEntries: ImportEntry[]): Promise<ScanR | |||||
| let v5Error = null; | ||||||
|
|
||||||
| try { | ||||||
| let insomnia5Import: ExportedModel[] = []; | ||||||
| if (contentStr.startsWith('type: ')) { | ||||||
| const { data, error } = tryImportV5Data(contentStr); | ||||||
| insomnia5Import = data as ExportedModel[]; | ||||||
| v5Error = error; | ||||||
| } | ||||||
|
Comment on lines
+176
to
+181
Contributor
Author
There was a problem hiding this comment. I did this because the error spam was killing my debugging experience
Comment on lines
+176
to
+181
There was a problem hiding this comment.
|
||||||
| if (insomnia5Import.length > 0) { | ||||||
| result = { | ||||||
| type: { | ||||||
|
|
@@ -183,7 +187,6 @@ export async function scanResources(importEntries: ImportEntry[]): Promise<ScanR | |||||
| description: 'Insomnia v5', | ||||||
| }, | ||||||
| data: { | ||||||
| resources: insomnia5Import, | ||||||
| }, | ||||||
| }; | ||||||
|
|
@@ -234,6 +237,7 @@ export async function scanResources(importEntries: ImportEntry[]): Promise<ScanR | |||||
| }); | ||||||
|
|
||||||
| const requests = resources.filter(isRequest); | ||||||
| const requestGroups = resources.filter(isRequestGroup); | ||||||
| const websocketRequests = resources.filter(isWebSocketRequest); | ||||||
| const grpcRequests = resources.filter(isGrpcRequest); | ||||||
| const socketIoRequests = resources.filter(isSocketIORequest); | ||||||
|
|
@@ -251,6 +255,7 @@ export async function scanResources(importEntries: ImportEntry[]): Promise<ScanR | |||||
| unitTests, | ||||||
| unitTestSuites, | ||||||
| requests: [...requests, ...websocketRequests, ...grpcRequests, ...socketIoRequests], | ||||||
| requestGroups, | ||||||
|
Comment on lines
240
to
258
Contributor
Author
There was a problem hiding this comment. This was most of what was broken about imports before, if im not mistaken |
||||||
| workspaces, | ||||||
|
Comment on lines
239
to
259
There was a problem hiding this comment.
|
||||||
| environments, | ||||||
| apiSpecs, | ||||||
|
|
@@ -598,21 +603,14 @@ export const importResourcesToNewWorkspace = async ({ | |||||
| const resources = resourceCacheItem.resources; | ||||||
| const ResourceIdMap = new Map(); | ||||||
| let newWorkspace: Workspace; | ||||||
| // support import from both insomnia export and api spec yaml | ||||||
| if (resources.find(isApiSpec) || isApiSpecImport(resourceCacheItem.importer)) { | ||||||
|
Contributor
Author
There was a problem hiding this comment. this makes the next code support both v5 and oas |
||||||
| newWorkspace = await models.workspace.create({ | ||||||
| name: workspaceToImport?.name, | ||||||
| scope: 'design', | ||||||
| parentId: projectId, | ||||||
| }); | ||||||
|
|
||||||
| await models.apiSpec.updateOrCreateForParentId(newWorkspace._id, { | ||||||
| contents: resourceCacheItem.content as string | undefined, | ||||||
| contentType: 'yaml', | ||||||
|
|
@@ -624,95 +622,81 @@ export const importResourcesToNewWorkspace = async ({ | |||||
| scope: workspaceToImport?.scope || 'collection', | ||||||
| parentId: projectId, | ||||||
| }); | ||||||
| } | ||||||
|
|
||||||
| // If we're importing into a new workspace | ||||||
| // Map new IDs | ||||||
| ResourceIdMap.set('__WORKSPACE_ID__', newWorkspace._id); | ||||||
| workspaceToImport && ResourceIdMap.set(workspaceToImport._id, newWorkspace._id); | ||||||
|
|
||||||
| const resourcesWithoutWorkspaceAndApiSpec = resources.filter( | ||||||
| resource => !isWorkspace(resource) && !isApiSpec(resource), | ||||||
| ); | ||||||
|
|
||||||
| for (const resource of resourcesWithoutWorkspaceAndApiSpec) { | ||||||
| const model = getModel(resource.type); | ||||||
| model && ResourceIdMap.set(resource._id, generateId(model.prefix)); | ||||||
| } | ||||||
|
|
||||||
| for (const resource of resourcesWithoutWorkspaceAndApiSpec) { | ||||||
| const model = getModel(resource.type); | ||||||
|
|
||||||
| if (model) { | ||||||
| const newParentId = ResourceIdMap.get(resource.parentId); | ||||||
| if (!newParentId) { | ||||||
| console.warn(`Could not find new parent id for ${resource.name} ${resource._id}`); | ||||||
| continue; | ||||||
| } | ||||||
| if (isGrpcRequest(resource)) { | ||||||
| await models.grpcRequest.create({ | ||||||
| ...resource, | ||||||
| _id: ResourceIdMap.get(resource._id), | ||||||
| protoFileId: ResourceIdMap.get(resource.protoFileId), | ||||||
| parentId: newParentId, | ||||||
| }); | ||||||
| } else if (isUnitTest(resource)) { | ||||||
| await models.unitTest.create({ | ||||||
| ...resource, | ||||||
| _id: ResourceIdMap.get(resource._id), | ||||||
| requestId: ResourceIdMap.get(resource.requestId), | ||||||
| parentId: newParentId, | ||||||
| }); | ||||||
| } else if (isRequest(resource)) { | ||||||
| await models.request.create(importRequestWithNewIds(resource, ResourceIdMap)); | ||||||
| } else { | ||||||
| await db.docCreate(model.type, { | ||||||
| ...resource, | ||||||
| _id: ResourceIdMap.get(resource._id), | ||||||
| parentId: newParentId, | ||||||
| }); | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| // Use the first sub environment as the active one | ||||||
| const subEnvironments = resources.filter(isEnvironment).filter(isSubEnvironmentResource) || []; | ||||||
|
|
||||||
| if (subEnvironments.length > 0) { | ||||||
| const firstSubEnvironment = subEnvironments[0]; | ||||||
|
|
||||||
| if (firstSubEnvironment) { | ||||||
| const workspaceMeta = await models.workspaceMeta.getOrCreateByParentId(newWorkspace._id); | ||||||
|
|
||||||
| await models.workspaceMeta.update(workspaceMeta, { | ||||||
| activeEnvironmentId: ResourceIdMap.get(firstSubEnvironment._id), | ||||||
| }); | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| // Make sure the new workspace has required resources like base environment, cookie jar and workspaceMeta | ||||||
| await models.environment.getOrCreateForParentId(newWorkspace._id); | ||||||
| const workspaceMeta = await models.workspaceMeta.getOrCreateByParentId(newWorkspace._id); | ||||||
|
|
||||||
| if (isGitProject(project)) { | ||||||
| await models.workspaceMeta.update(workspaceMeta, { | ||||||
| gitFilePath: `${newWorkspace.name}-${newWorkspace._id}.yaml`, | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| }); | ||||||
| } | ||||||
|
Comment on lines
+695
to
+699
Contributor
Author
There was a problem hiding this comment. moved this down since it was duplicated |
||||||
| // we sync the new workspace to the cloud in workspaceLoader when user enters the workspace | ||||||
| // since we won't navigate to the workspace automatically after import | ||||||
| // here we push to the cloud programmatically | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure if this will be true for all yaml imports.
Maybe we can improve the error logging instead?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm confused why this is not a consistent convert function like the others, as there are already too many try catches here