diff --git a/lerna.json b/lerna.json index 346a78d907..4475368785 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "packages": [ "packages/*", "plugins/*" diff --git a/packages/insomnia-inso/package-lock.json b/packages/insomnia-inso/package-lock.json index f3cf577f94..82c916295f 100644 --- a/packages/insomnia-inso/package-lock.json +++ b/packages/insomnia-inso/package-lock.json @@ -1,12 +1,12 @@ { "name": "insomnia-inso", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "insomnia-inso", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "license": "Apache-2.0", "dependencies": { "@stoplight/spectral-core": "^1.16.0", diff --git a/packages/insomnia-inso/package.json b/packages/insomnia-inso/package.json index 4b2d0ab5b2..d65e2340c6 100644 --- a/packages/insomnia-inso/package.json +++ b/packages/insomnia-inso/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "insomnia-inso", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "homepage": "https://insomnia.rest", "description": "A CLI for Insomnia - The Collaborative API Design Tool", "author": "Kong ", @@ -71,24 +71,24 @@ "consola": "^2.15.0", "cosmiconfig": "^6.0.0", "enquirer": "^2.3.6", - "insomnia-plugin-base64": "^3.14.0-beta.0", - "insomnia-plugin-cookie-jar": "^3.14.0-beta.0", - "insomnia-plugin-core-themes": "^3.14.0-beta.0", - "insomnia-plugin-default-headers": "^3.14.0-beta.0", - "insomnia-plugin-file": "^3.14.0-beta.0", - "insomnia-plugin-hash": "^3.14.0-beta.0", - "insomnia-plugin-jsonpath": "^3.14.0-beta.0", - "insomnia-plugin-now": "^3.14.0-beta.0", - "insomnia-plugin-os": "^3.14.0-beta.0", - "insomnia-plugin-prompt": "^3.14.0-beta.0", - "insomnia-plugin-request": "^3.14.0-beta.0", - "insomnia-plugin-response": "^3.14.0-beta.0", - "insomnia-plugin-uuid": "^3.14.0-beta.0", - "insomnia-send-request": "^3.14.0-beta.0", - "insomnia-testing": "^3.14.0-beta.0", + "insomnia-plugin-base64": "^3.14.0-beta.1", + "insomnia-plugin-cookie-jar": "^3.14.0-beta.1", + "insomnia-plugin-core-themes": "^3.14.0-beta.1", + "insomnia-plugin-default-headers": "^3.14.0-beta.1", + "insomnia-plugin-file": "^3.14.0-beta.1", + "insomnia-plugin-hash": "^3.14.0-beta.1", + "insomnia-plugin-jsonpath": "^3.14.0-beta.1", + "insomnia-plugin-now": "^3.14.0-beta.1", + "insomnia-plugin-os": "^3.14.0-beta.1", + "insomnia-plugin-prompt": "^3.14.0-beta.1", + "insomnia-plugin-request": "^3.14.0-beta.1", + "insomnia-plugin-response": "^3.14.0-beta.1", + "insomnia-plugin-uuid": "^3.14.0-beta.1", + "insomnia-send-request": "^3.14.0-beta.1", + "insomnia-testing": "^3.14.0-beta.1", "mkdirp": "^1.0.4", "nedb": "^1.8.0", - "openapi-2-kong": "^3.14.0-beta.0", + "openapi-2-kong": "^3.14.0-beta.1", "string-argv": "^0.3.1", "yaml": "^1.10.0" } diff --git a/packages/insomnia-send-request/package-lock.json b/packages/insomnia-send-request/package-lock.json index 5726aebaa4..2a3202b99e 100644 --- a/packages/insomnia-send-request/package-lock.json +++ b/packages/insomnia-send-request/package-lock.json @@ -1,12 +1,12 @@ { "name": "insomnia-send-request", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "insomnia-send-request", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "license": "Apache-2.0", "dependencies": { "@getinsomnia/node-libcurl": "2.3.5-6", diff --git a/packages/insomnia-send-request/package.json b/packages/insomnia-send-request/package.json index 7afd1b65ce..0d27144902 100644 --- a/packages/insomnia-send-request/package.json +++ b/packages/insomnia-send-request/package.json @@ -2,7 +2,7 @@ "private": true, "name": "insomnia-send-request", "license": "Apache-2.0", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "author": "Kong ", "main": "dist/index.js", "types": "dist/send-request/index.d.ts", @@ -22,7 +22,7 @@ "hkdf": "0.0.2", "html-entities": "^1.3.1", "httpsnippet": "^1.22.0", - "insomnia-testing": "^3.14.0-beta.0", + "insomnia-testing": "^3.14.0-beta.1", "isomorphic-git": "^1.5.0", "jshint": "^2.11.1", "jsonlint-mod-fixed": "1.7.7", @@ -35,7 +35,7 @@ "node-forge": "^1.3.0", "nunjucks": "^3.2.1", "oauth-1.0a": "^2.2.6", - "openapi-2-kong": "^3.14.0-beta.0", + "openapi-2-kong": "^3.14.0-beta.1", "tough-cookie": "^4.0.0", "ts-assert-unreachable": "^0.0.9", "url-join": "^4.0.1", diff --git a/packages/insomnia-smoke-test/package-lock.json b/packages/insomnia-smoke-test/package-lock.json index 63a155abfc..fa591a4901 100644 --- a/packages/insomnia-smoke-test/package-lock.json +++ b/packages/insomnia-smoke-test/package-lock.json @@ -1,12 +1,12 @@ { "name": "insomnia-smoke-test", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "insomnia-smoke-test", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "license": "Apache-2.0", "devDependencies": { "@grpc/grpc-js": "^1.6.7", diff --git a/packages/insomnia-smoke-test/package.json b/packages/insomnia-smoke-test/package.json index 6b3ad8ff1a..0b1c2869e6 100644 --- a/packages/insomnia-smoke-test/package.json +++ b/packages/insomnia-smoke-test/package.json @@ -11,7 +11,7 @@ "bugs": { "url": "https://github.com/kong/insomnia/issues" }, - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "scripts": { "bootstrap": "npm run build", "lint": "eslint . --ext .js,.ts,.tsx --cache", diff --git a/packages/insomnia-smoke-test/tests/prerelease/dashboard-interactions.test.ts b/packages/insomnia-smoke-test/tests/prerelease/dashboard-interactions.test.ts index 802b749e1b..ad11acb1c4 100644 --- a/packages/insomnia-smoke-test/tests/prerelease/dashboard-interactions.test.ts +++ b/packages/insomnia-smoke-test/tests/prerelease/dashboard-interactions.test.ts @@ -48,7 +48,8 @@ test.describe('Dashboard', async () => { }); }); test.describe('Interactions', async () => { // Not sure about the name here - test('Can filter through multiple collections', async ({ app, page }) => { + // TODO(INS-2504) - we don't support importing multiple collections at this time + test.skip('Can filter through multiple collections', async ({ app, page }) => { await page.getByTestId('project').click(); await expect(page.locator('.app')).toContainText('All Files (1)'); await expect(page.locator('.app')).not.toContainText('Setup Git Sync'); @@ -56,7 +57,10 @@ test.describe('Dashboard', async () => { await page.getByRole('button', { name: 'Create' }).click(); const text = await loadFixture('multiple-workspaces.yaml'); await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text); - await page.getByRole('menuitem', { name: 'Clipboard' }).click(); + await page.getByRole('menuitem', { name: 'Import' }).click(); + await page.getByText('Clipboard').click(); + await page.getByRole('button', { name: 'Scan' }).click(); + await page.getByRole('button', { name: 'Import' }).click(); // Check that 10 new workspaces are imported besides the default one const workspaceCards = page.locator('.card-badge'); diff --git a/packages/insomnia-smoke-test/tests/prerelease/design-interactions.test.ts b/packages/insomnia-smoke-test/tests/prerelease/design-interactions.test.ts index 4a390e6946..8d62840719 100644 --- a/packages/insomnia-smoke-test/tests/prerelease/design-interactions.test.ts +++ b/packages/insomnia-smoke-test/tests/prerelease/design-interactions.test.ts @@ -11,53 +11,22 @@ test.describe('Design interactions', async () => { await expect(true).toBeTruthy(); }); - test('Can import an OpenAPI 3 spec into a Design Document', async ({ app, page }) => { - // Setup - await page.getByTestId('project').click(); - await page.getByRole('button', { name: 'Create' }).click(); - const text = await loadFixture('openapi3.yaml'); - await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text); - await page.getByRole('menuitem', { name: 'Import' }).click(); - await page.getByText('Clipboard').click(); - await page.getByRole('button', { name: 'Scan' }).click(); - await page.getByRole('button', { name: 'Import' }).click(); - - // Renders the spec code - const codeEditor = page.locator('.pane-one'); - await expect(codeEditor).toContainText('openapi: 3.0.0'); - - // Created requests from spec - await page.locator('text=Debug').click(); - await expect(page.locator('.app')).toContainText('File'); - await expect(page.locator('.app')).toContainText('Misc'); - await expect(page.locator('.app')).toContainText('Auth'); - - // Created Environment from spec - await page.getByRole('button', { name: 'OpenAPI env' }).click(); - await page.getByRole('menuitem', { name: 'Manage Environments' }).click(); - await page.click('text=/.*"localhost:4010".*/'); - }); - test.fixme('Can filter values in Design sidebar', async ({ page }) => { // TODO(filipe) implement in another PR await page.getByTestId('project').click(); await expect(true).toBeTruthy(); }); - test.fixme('[INS-567] Requests are not duplicated when switching between tabs', async ({ page }) => { - // TODO(filipe) implement in another PR - await page.getByTestId('project').click(); - await expect(true).toBeTruthy(); - }); - test('Unit Test interactions', async ({ app, page }) => { // Setup await page.getByTestId('project').click(); await page.getByRole('button', { name: 'Create' }).click(); const text = await loadFixture('unit-test.yaml'); await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text); - await page.getByRole('menuitem', { name: 'Clipboard' }).click(); - await page.click('text=unit-test.yamljust now'); + await page.getByRole('menuitem', { name: 'Import' }).click(); + await page.getByText('Clipboard').click(); + await page.getByRole('button', { name: 'Scan' }).click(); + await page.getByRole('button', { name: 'Import' }).click(); // Switch to Test tab await page.click('a:has-text("Test")'); @@ -76,7 +45,10 @@ test.describe('Design interactions', async () => { // Add a new test await page.locator('text=New Test').nth(1).click(); await page.click('div[role="dialog"] button:has-text("New Test")'); - await page.locator('select[name="request"]').selectOption('req_17ca8bbd46374144a089f891e32842d6'); + const label = await page.locator('option', { hasText: 'Request A' }).textContent() || ''; + await page.locator('select[name="request"]').selectOption({ + label, + }); await page.click('#wrapper >> text=Run Tests'); await expect(page.locator('.app')).toContainText('Tests Passed 1/1'); diff --git a/packages/insomnia-smoke-test/tests/prerelease/environment-editor-interactions.test.ts b/packages/insomnia-smoke-test/tests/prerelease/environment-editor-interactions.test.ts index b1db34da0c..de0d97c587 100644 --- a/packages/insomnia-smoke-test/tests/prerelease/environment-editor-interactions.test.ts +++ b/packages/insomnia-smoke-test/tests/prerelease/environment-editor-interactions.test.ts @@ -18,7 +18,7 @@ test.describe('Environment Editor', async () => { test('create a new environment', async ({ page }) => { // Create the environment - await page.getByText('ExampleB').click(); + await page.getByText('ExampleA').click(); await page.getByRole('menuitem', { name: 'Manage Environments' }).click(); await page.getByTestId('CreateEnvironmentDropdown').click(); await page.getByRole('menuitem', { name: 'Environment', exact: true }).click(); @@ -26,7 +26,7 @@ test.describe('Environment Editor', async () => { await page.getByRole('button', { name: 'Close' }).click(); // Make it active one - await page.getByText('ExampleB').click(); + await page.getByText('ExampleA').click(); await page.getByRole('menuitem', { name: 'New Environment' }).click(); // Send a request check variables defaulted to base env since new env is empty @@ -40,32 +40,32 @@ test.describe('Environment Editor', async () => { // rename an existing environment test('Rename an existing environment', async ({ page }) => { // Rename the environment - await page.getByText('ExampleB').click(); + await page.getByText('ExampleA').click(); await page.getByRole('menuitem', { name: 'Manage Environments' }).click(); - await page.getByRole('button', { name: 'ExampleA' }).click(); + await page.getByRole('button', { name: 'ExampleB' }).click(); await page.getByTitle('Click to edit', { exact: true }).click(); await page.getByRole('dialog').locator('input[type="text"]').fill('Gandalf'); await page.getByRole('button', { name: 'Close' }).click(); // Make it active one - await page.getByText('ExampleB').click(); + await page.getByText('ExampleA').click(); await page.getByRole('menuitem', { name: 'Gandalf' }).click(); // Send a request check variables defaulted to base env since new env is empty await page.getByRole('button', { name: 'GET New Request' }).click(); await page.getByRole('button', { name: 'Send' }).click(); await page.getByRole('tab', { name: 'Timeline' }).click(); - await page.getByText('subenvA0').click(); - await page.getByText('subenvA1').click(); + await page.getByText('subenvB0').click(); + await page.getByText('subenvB1').click(); }); test('Add new variables to an existing environment', async ({ page }) => { // Rename the environment - await page.getByText('ExampleB').click(); + await page.getByText('ExampleA').click(); await page.getByRole('menuitem', { name: 'Manage Environments' }).click(); // add a new string environment variable - await page.locator('pre').filter({ hasText: '"exampleNumber": 2222,' }).click(); + await page.locator('pre').filter({ hasText: '"exampleNumber": 1111,' }).click(); await page.getByTestId('CodeEditor').getByRole('textbox').press('Enter'); await page.getByTestId('CodeEditor').getByRole('textbox').fill('"testNumber":9000,'); await page.getByTestId('CodeEditor').getByRole('textbox').press('Enter'); @@ -95,7 +95,10 @@ test.describe('Environment Editor', async () => { await page.getByRole('tab', { name: 'Timeline' }).click(); // FIXME(filipe) - adding variables to request body can be so fast they don't get picked up when sending request + await page.locator('pre').filter({ hasText: '| 9000' }).click(); + + // NOTE - Test fails due to actual bug - the variables are not being added to the request body when the request is sent await page.locator('pre').filter({ hasText: '| Gandalf' }).click(); }); diff --git a/packages/insomnia-smoke-test/tests/prerelease/git-sync-interactions.test.ts b/packages/insomnia-smoke-test/tests/prerelease/git-sync-interactions.test.ts index dce7ca6d8e..468c0f80ab 100644 --- a/packages/insomnia-smoke-test/tests/prerelease/git-sync-interactions.test.ts +++ b/packages/insomnia-smoke-test/tests/prerelease/git-sync-interactions.test.ts @@ -36,7 +36,7 @@ test('Clone Repo with bad values', async ({ page }) => { // Check a recent and old commit show up on history await page.getByRole('cell', { name: 'bump to OpenAPI v3.1' }).click(); - await page.getByRole('cell', { name: 'initial commit' }).click(); + await page.getByRole('cell', { name: 'Fix environments' }).click(); await page.locator('text=Done').click(); // Create a branch and try to push with bad Git token diff --git a/packages/insomnia-smoke-test/tests/prerelease/grpc-interactions.test.ts b/packages/insomnia-smoke-test/tests/prerelease/grpc-interactions.test.ts index aed4de0a72..8f65c2fa01 100644 --- a/packages/insomnia-smoke-test/tests/prerelease/grpc-interactions.test.ts +++ b/packages/insomnia-smoke-test/tests/prerelease/grpc-interactions.test.ts @@ -32,7 +32,7 @@ test.describe('gRPC interactions', () => { }); test('can send unidirectional requests', async ({ page }) => { - await page.locator('button:has-text("gRPCUnary")').nth(1).click(); + await page.getByRole('button', { name: 'gRPC Unary', exact: true }).click(); await page.locator('[data-testid="request-pane"] >> text=Unary').click(); await page.click('text=Send'); diff --git a/packages/insomnia-testing/package-lock.json b/packages/insomnia-testing/package-lock.json index 14c422df9c..ff1e4c59c8 100644 --- a/packages/insomnia-testing/package-lock.json +++ b/packages/insomnia-testing/package-lock.json @@ -1,12 +1,12 @@ { "name": "insomnia-testing", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "insomnia-testing", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "license": "Apache-2.0", "dependencies": { "chai": "^4.3.4", diff --git a/packages/insomnia-testing/package.json b/packages/insomnia-testing/package.json index ad52186b36..075d12bf76 100644 --- a/packages/insomnia-testing/package.json +++ b/packages/insomnia-testing/package.json @@ -2,7 +2,7 @@ "private": true, "name": "insomnia-testing", "license": "Apache-2.0", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "author": "Kong ", "repository": { "type": "git", diff --git a/packages/insomnia/package-lock.json b/packages/insomnia/package-lock.json index e409c72a7f..721f95acd2 100644 --- a/packages/insomnia/package-lock.json +++ b/packages/insomnia/package-lock.json @@ -1,12 +1,12 @@ { "name": "insomnia", - "version": "2023.2.0-beta.0", + "version": "2023.2.0-beta.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "insomnia", - "version": "2023.2.0-beta.0", + "version": "2023.2.0-beta.1", "license": "MIT", "dependencies": { "@apideck/better-ajv-errors": "^0.2.6", diff --git a/packages/insomnia/package.json b/packages/insomnia/package.json index 71670337a0..c55b624213 100644 --- a/packages/insomnia/package.json +++ b/packages/insomnia/package.json @@ -1,6 +1,6 @@ { "name": "insomnia", - "version": "2023.2.0-beta.0", + "version": "2023.2.0-beta.1", "productName": "Insomnia", "private": true, "description": "The Collaborative API Design Tool", @@ -72,23 +72,23 @@ "html-entities": "^1.2.0", "httpsnippet": "^2.0.0", "iconv-lite": "^0.6.3", - "insomnia-plugin-base64": "^3.14.0-beta.0", - "insomnia-plugin-cookie-jar": "^3.14.0-beta.0", - "insomnia-plugin-core-themes": "^3.14.0-beta.0", - "insomnia-plugin-default-headers": "^3.14.0-beta.0", - "insomnia-plugin-file": "^3.14.0-beta.0", - "insomnia-plugin-hash": "^3.14.0-beta.0", - "insomnia-plugin-jsonpath": "^3.14.0-beta.0", - "insomnia-plugin-kong-declarative-config": "^3.14.0-beta.0", - "insomnia-plugin-kong-kubernetes-config": "^3.14.0-beta.0", - "insomnia-plugin-kong-portal": "^3.14.0-beta.0", - "insomnia-plugin-now": "^3.14.0-beta.0", - "insomnia-plugin-os": "^3.14.0-beta.0", - "insomnia-plugin-prompt": "^3.14.0-beta.0", - "insomnia-plugin-request": "^3.14.0-beta.0", - "insomnia-plugin-response": "^3.14.0-beta.0", - "insomnia-plugin-uuid": "^3.14.0-beta.0", - "insomnia-testing": "^3.14.0-beta.0", + "insomnia-plugin-base64": "^3.14.0-beta.1", + "insomnia-plugin-cookie-jar": "^3.14.0-beta.1", + "insomnia-plugin-core-themes": "^3.14.0-beta.1", + "insomnia-plugin-default-headers": "^3.14.0-beta.1", + "insomnia-plugin-file": "^3.14.0-beta.1", + "insomnia-plugin-hash": "^3.14.0-beta.1", + "insomnia-plugin-jsonpath": "^3.14.0-beta.1", + "insomnia-plugin-kong-declarative-config": "^3.14.0-beta.1", + "insomnia-plugin-kong-kubernetes-config": "^3.14.0-beta.1", + "insomnia-plugin-kong-portal": "^3.14.0-beta.1", + "insomnia-plugin-now": "^3.14.0-beta.1", + "insomnia-plugin-os": "^3.14.0-beta.1", + "insomnia-plugin-prompt": "^3.14.0-beta.1", + "insomnia-plugin-request": "^3.14.0-beta.1", + "insomnia-plugin-response": "^3.14.0-beta.1", + "insomnia-plugin-uuid": "^3.14.0-beta.1", + "insomnia-testing": "^3.14.0-beta.1", "isomorphic-git": "^1.10.4", "js-yaml": "^3.14.1", "jshint": "^2.11.1", @@ -103,7 +103,7 @@ "node-forge": "^1.0.0", "nunjucks": "^3.2.0", "oauth-1.0a": "^2.2.2", - "openapi-2-kong": "^3.14.0-beta.0", + "openapi-2-kong": "^3.14.0-beta.1", "papaparse": "^5.2.0", "prettier": "2.4.1", "shell-quote": "^1.7.2", diff --git a/packages/insomnia/src/common/import.ts b/packages/insomnia/src/common/import.ts index de0d11787d..1ae791d520 100644 --- a/packages/insomnia/src/common/import.ts +++ b/packages/insomnia/src/common/import.ts @@ -168,7 +168,6 @@ export async function importResources({ `Could not find workspace with id ${workspaceId}` ); - // If we're importing into a new workspace // Map new IDs ResourceIdMap.set(workspaceId, existingWorkspace._id); ResourceIdMap.set('__WORKSPACE_ID__', existingWorkspace._id); @@ -198,11 +197,30 @@ export async function importResources({ const model = getModel(resource.type); if (model) { - 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), + }); + } } } @@ -229,6 +247,7 @@ export async function importResources({ if (apiSpec) { await models.apiSpec.updateOrCreateForParentId(newWorkspace._id, { ...apiSpec, + _id: generateId(models.apiSpec.prefix), fileName: workspaceName || workspace?.name, }); } @@ -270,10 +289,47 @@ export async function importResources({ const model = getModel(resource.type); if (model) { - 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), + }); + } 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), + }); + } + } + } + + // Use the first environment as the active one + const subEnvironments = + resources.filter(isEnvironment).filter(env => env.parentId.startsWith(models.environment.prefix)) || []; + + console.log({ subEnvironments }); + + 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), }); } } diff --git a/packages/insomnia/src/ui/components/modals/import-modal.tsx b/packages/insomnia/src/ui/components/modals/import-modal.tsx index bd3664b034..07ac90ab2a 100644 --- a/packages/insomnia/src/ui/components/modals/import-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/import-modal.tsx @@ -878,9 +878,9 @@ const ImportResourcesForm = ({ {scanResult.unitTestSuites.length === 1 ? 'Test Suite' : 'Test Suites'} + {' with '} {scanResult.unitTests?.length} - {' with'} - {scanResult.unitTests?.length === 1 ? 'Test' : 'Tests'} + {scanResult.unitTests?.length === 1 ? ' Test' : ' Tests'} )} diff --git a/packages/openapi-2-kong/package-lock.json b/packages/openapi-2-kong/package-lock.json index 063b3b1d31..43f37b09bf 100644 --- a/packages/openapi-2-kong/package-lock.json +++ b/packages/openapi-2-kong/package-lock.json @@ -1,12 +1,12 @@ { "name": "openapi-2-kong", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "openapi-2-kong", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "license": "Apache-2.0", "dependencies": { "@apidevtools/swagger-parser": "10.1.0", diff --git a/packages/openapi-2-kong/package.json b/packages/openapi-2-kong/package.json index 64fd25b88f..0295487c7f 100644 --- a/packages/openapi-2-kong/package.json +++ b/packages/openapi-2-kong/package.json @@ -2,7 +2,7 @@ "private": true, "name": "openapi-2-kong", "license": "Apache-2.0", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "author": "Kong ", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/plugins/insomnia-plugin-base64/package.json b/plugins/insomnia-plugin-base64/package.json index 4f67491079..f1ad66d645 100644 --- a/plugins/insomnia-plugin-base64/package.json +++ b/plugins/insomnia-plugin-base64/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "insomnia-plugin-base64", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "author": "Kong ", "description": "Insomnia base64 template tag", "license": "MIT", diff --git a/plugins/insomnia-plugin-cookie-jar/package-lock.json b/plugins/insomnia-plugin-cookie-jar/package-lock.json index 1d023ee5ef..b62f8d35bf 100644 --- a/plugins/insomnia-plugin-cookie-jar/package-lock.json +++ b/plugins/insomnia-plugin-cookie-jar/package-lock.json @@ -1,12 +1,12 @@ { "name": "insomnia-plugin-cookie-jar", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "insomnia-plugin-cookie-jar", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "license": "MIT", "dependencies": { "tough-cookie": "^2.3.3" diff --git a/plugins/insomnia-plugin-cookie-jar/package.json b/plugins/insomnia-plugin-cookie-jar/package.json index e81b151783..cc942080ef 100644 --- a/plugins/insomnia-plugin-cookie-jar/package.json +++ b/plugins/insomnia-plugin-cookie-jar/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "insomnia-plugin-cookie-jar", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "author": "Kong ", "contributors": [ { diff --git a/plugins/insomnia-plugin-core-themes/package.json b/plugins/insomnia-plugin-core-themes/package.json index c840d70a4c..f7a7d5700d 100644 --- a/plugins/insomnia-plugin-core-themes/package.json +++ b/plugins/insomnia-plugin-core-themes/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "insomnia-plugin-core-themes", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "author": "Kong ", "description": "Insomnia core themes", "license": "MIT", diff --git a/plugins/insomnia-plugin-default-headers/package.json b/plugins/insomnia-plugin-default-headers/package.json index bed1870b30..bc52cd9411 100644 --- a/plugins/insomnia-plugin-default-headers/package.json +++ b/plugins/insomnia-plugin-default-headers/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "insomnia-plugin-default-headers", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "author": "Kong ", "description": "Various data importers for Insomnia", "license": "MIT", diff --git a/plugins/insomnia-plugin-file/package.json b/plugins/insomnia-plugin-file/package.json index 648d61952d..616a363d3a 100644 --- a/plugins/insomnia-plugin-file/package.json +++ b/plugins/insomnia-plugin-file/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "insomnia-plugin-file", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "author": "Kong ", "description": "Insomnia file templte tag", "license": "MIT", diff --git a/plugins/insomnia-plugin-hash/package.json b/plugins/insomnia-plugin-hash/package.json index 422f725b21..cf82fc68d0 100644 --- a/plugins/insomnia-plugin-hash/package.json +++ b/plugins/insomnia-plugin-hash/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "insomnia-plugin-hash", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "author": "Kong ", "description": "Insomnia hash template tag", "license": "MIT", diff --git a/plugins/insomnia-plugin-jsonpath/package-lock.json b/plugins/insomnia-plugin-jsonpath/package-lock.json index f24727013d..cd90e6aa75 100644 --- a/plugins/insomnia-plugin-jsonpath/package-lock.json +++ b/plugins/insomnia-plugin-jsonpath/package-lock.json @@ -1,12 +1,12 @@ { "name": "insomnia-plugin-jsonpath", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "insomnia-plugin-jsonpath", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "license": "MIT", "dependencies": { "jsonpath-plus": "^6.0.1" diff --git a/plugins/insomnia-plugin-jsonpath/package.json b/plugins/insomnia-plugin-jsonpath/package.json index ed2d21c241..08d2c6ab84 100644 --- a/plugins/insomnia-plugin-jsonpath/package.json +++ b/plugins/insomnia-plugin-jsonpath/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "insomnia-plugin-jsonpath", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "author": "Kong ", "description": "Template tag to pull data from JSON strings", "license": "MIT", diff --git a/plugins/insomnia-plugin-kong-declarative-config/package-lock.json b/plugins/insomnia-plugin-kong-declarative-config/package-lock.json index 225765eda9..7eeaa2a32f 100644 --- a/plugins/insomnia-plugin-kong-declarative-config/package-lock.json +++ b/plugins/insomnia-plugin-kong-declarative-config/package-lock.json @@ -1,12 +1,12 @@ { "name": "insomnia-plugin-kong-declarative-config", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "insomnia-plugin-kong-declarative-config", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "license": "Apache-2.0", "dependencies": { "yaml": "^1.8.3" diff --git a/plugins/insomnia-plugin-kong-declarative-config/package.json b/plugins/insomnia-plugin-kong-declarative-config/package.json index 218235d5e5..872e327e88 100644 --- a/plugins/insomnia-plugin-kong-declarative-config/package.json +++ b/plugins/insomnia-plugin-kong-declarative-config/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "insomnia-plugin-kong-declarative-config", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "main": "index.js", "author": "Kong ", "license": "Apache-2.0", @@ -19,7 +19,7 @@ "unlisted": true }, "dependencies": { - "openapi-2-kong": "^3.14.0-beta.0", + "openapi-2-kong": "^3.14.0-beta.1", "yaml": "^1.8.3" } } diff --git a/plugins/insomnia-plugin-kong-kubernetes-config/package-lock.json b/plugins/insomnia-plugin-kong-kubernetes-config/package-lock.json index 443f8b4dd7..9ca8b0607b 100644 --- a/plugins/insomnia-plugin-kong-kubernetes-config/package-lock.json +++ b/plugins/insomnia-plugin-kong-kubernetes-config/package-lock.json @@ -1,12 +1,12 @@ { "name": "insomnia-plugin-kong-kubernetes-config", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "insomnia-plugin-kong-kubernetes-config", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "license": "Apache-2.0", "dependencies": { "yaml": "^1.8.3" diff --git a/plugins/insomnia-plugin-kong-kubernetes-config/package.json b/plugins/insomnia-plugin-kong-kubernetes-config/package.json index 2da08af5ea..b05826cd93 100644 --- a/plugins/insomnia-plugin-kong-kubernetes-config/package.json +++ b/plugins/insomnia-plugin-kong-kubernetes-config/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "insomnia-plugin-kong-kubernetes-config", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "main": "index.js", "author": "Kong ", "license": "Apache-2.0", @@ -19,7 +19,7 @@ "unlisted": true }, "dependencies": { - "openapi-2-kong": "^3.14.0-beta.0", + "openapi-2-kong": "^3.14.0-beta.1", "yaml": "^1.8.3" } } diff --git a/plugins/insomnia-plugin-kong-portal/package-lock.json b/plugins/insomnia-plugin-kong-portal/package-lock.json index 5be6ef0273..91eb3f1e34 100644 --- a/plugins/insomnia-plugin-kong-portal/package-lock.json +++ b/plugins/insomnia-plugin-kong-portal/package-lock.json @@ -1,12 +1,12 @@ { "name": "insomnia-plugin-kong-portal", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "insomnia-plugin-kong-portal", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "license": "Apache-2.0", "dependencies": { "url-join": "^4.0.1" diff --git a/plugins/insomnia-plugin-kong-portal/package.json b/plugins/insomnia-plugin-kong-portal/package.json index 8a5aa59f75..d8dd37ffc4 100644 --- a/plugins/insomnia-plugin-kong-portal/package.json +++ b/plugins/insomnia-plugin-kong-portal/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "insomnia-plugin-kong-portal", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "main": "dist/index.js", "types": "dist/index.d.ts", "author": "Kong ", diff --git a/plugins/insomnia-plugin-now/package-lock.json b/plugins/insomnia-plugin-now/package-lock.json index b9072d5c5c..7d51f2ff2c 100644 --- a/plugins/insomnia-plugin-now/package-lock.json +++ b/plugins/insomnia-plugin-now/package-lock.json @@ -1,12 +1,12 @@ { "name": "insomnia-plugin-now", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "insomnia-plugin-now", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "license": "MIT", "dependencies": { "moment": "^2.21.0" diff --git a/plugins/insomnia-plugin-now/package.json b/plugins/insomnia-plugin-now/package.json index 5a54f2fb5c..d0787572a8 100644 --- a/plugins/insomnia-plugin-now/package.json +++ b/plugins/insomnia-plugin-now/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "insomnia-plugin-now", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "author": "Kong ", "description": "Insomnia now template tag", "license": "MIT", diff --git a/plugins/insomnia-plugin-os/package-lock.json b/plugins/insomnia-plugin-os/package-lock.json index 096f2dc639..296c8f056a 100644 --- a/plugins/insomnia-plugin-os/package-lock.json +++ b/plugins/insomnia-plugin-os/package-lock.json @@ -1,12 +1,12 @@ { "name": "insomnia-plugin-os", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "insomnia-plugin-os", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "license": "MIT", "dependencies": { "jsonpath-plus": "^6.0.1" diff --git a/plugins/insomnia-plugin-os/package.json b/plugins/insomnia-plugin-os/package.json index 87d3c928fe..709901b4e4 100644 --- a/plugins/insomnia-plugin-os/package.json +++ b/plugins/insomnia-plugin-os/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "insomnia-plugin-os", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "author": "Kong ", "description": "Template tag to get information about the OS", "license": "MIT", diff --git a/plugins/insomnia-plugin-prompt/package.json b/plugins/insomnia-plugin-prompt/package.json index 559bc7a36b..7ba8f377cb 100644 --- a/plugins/insomnia-plugin-prompt/package.json +++ b/plugins/insomnia-plugin-prompt/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "insomnia-plugin-prompt", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "author": "Kong ", "description": "Insomnia prompt template tag", "license": "MIT", diff --git a/plugins/insomnia-plugin-request/package-lock.json b/plugins/insomnia-plugin-request/package-lock.json index 870f198fd3..fae4288d6a 100644 --- a/plugins/insomnia-plugin-request/package-lock.json +++ b/plugins/insomnia-plugin-request/package-lock.json @@ -1,12 +1,12 @@ { "name": "insomnia-plugin-request", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "insomnia-plugin-request", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "license": "MIT", "dependencies": { "tough-cookie": "^2.3.1" diff --git a/plugins/insomnia-plugin-request/package.json b/plugins/insomnia-plugin-request/package.json index 097539f122..16efcda189 100644 --- a/plugins/insomnia-plugin-request/package.json +++ b/plugins/insomnia-plugin-request/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "insomnia-plugin-request", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "author": "Kong ", "description": "Insomnia request template tag", "license": "MIT", diff --git a/plugins/insomnia-plugin-response/package-lock.json b/plugins/insomnia-plugin-response/package-lock.json index 2f5840d9cb..6c7d9bbe99 100644 --- a/plugins/insomnia-plugin-response/package-lock.json +++ b/plugins/insomnia-plugin-response/package-lock.json @@ -1,12 +1,12 @@ { "name": "insomnia-plugin-response", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "insomnia-plugin-response", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "license": "MIT", "dependencies": { "iconv-lite": "^0.6.3", diff --git a/plugins/insomnia-plugin-response/package.json b/plugins/insomnia-plugin-response/package.json index efbd51046e..9716938fbf 100644 --- a/plugins/insomnia-plugin-response/package.json +++ b/plugins/insomnia-plugin-response/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "insomnia-plugin-response", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "author": "Kong ", "description": "Insomnia response template tag", "license": "MIT", diff --git a/plugins/insomnia-plugin-uuid/package-lock.json b/plugins/insomnia-plugin-uuid/package-lock.json index 5be4b164be..9bc4f58129 100644 --- a/plugins/insomnia-plugin-uuid/package-lock.json +++ b/plugins/insomnia-plugin-uuid/package-lock.json @@ -1,12 +1,12 @@ { "name": "insomnia-plugin-uuid", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "insomnia-plugin-uuid", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "license": "MIT", "dependencies": { "uuid": "^8.3.2" diff --git a/plugins/insomnia-plugin-uuid/package.json b/plugins/insomnia-plugin-uuid/package.json index 55abc8255e..2b52f37cad 100644 --- a/plugins/insomnia-plugin-uuid/package.json +++ b/plugins/insomnia-plugin-uuid/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "insomnia-plugin-uuid", - "version": "3.14.0-beta.0", + "version": "3.14.0-beta.1", "author": "Kong ", "description": "Insomnia uuid template tag", "license": "MIT",