Commit Graph

31 Commits

Author SHA1 Message Date
SaintAPI
f1dbd4fdd3
fix: only change environment on fresh import (#2979)
Co-authored-by: SaintAPI <comfygangsta@gmail.com>
Co-authored-by: Opender Singh <opender.singh@konghq.com>
2021-03-03 10:22:12 -08:00
SaintAPI
a2bc704f80
Differential (Additive/Removal) patching when switching between design / debug (#3124)
* fix(import) do differential patching for design activity imports

This patch adds differential patching for imports that occur during the switching between
design and debug tabs inside of Designer. As reported through #2971, and others, this patch
favors existing data over imported data, values that exist already on the document will remain
unchanged, only new values (including array based values) will be added / removed.

This also includes a bypass feature for urls, currently these options are not exposed through
the interface but could be. This feature is an object to allow for future properties for
preference-based patching.

- Adds `options.enableDiffBasedPatching` and `options.enableDiffDeep` to `importRaw` for backwards compat.
- Adds `options.bypassDiffProps.url` for url bypassing and use an object for future items.
- Adds `diffPatchObj` based on differential patching for objects (works with arrays as well).

Future ideas:

- `hasBeenModifiedByUser` property map object to allow changing properties that haven't been touched by the user with options.

fixes: #2971, #2882, #3038, #2442

* adds some basic tests

- also adds jest (which was (mistakenly) not there before)
- does not call `.hasOwnProperty` directly, per https://eslint.org/docs/rules/no-prototype-builtins (which, we will add more formally at a later date)

* don't special-case workspaces

this ensures the behavior of the initial PR is more preserved

Co-authored-by: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>
2021-03-03 12:57:09 -05:00
Opender Singh
049964bb9b
Prompt for import as collection or document (#3130)
* feat: add prompt and update import logic

* feat: update usages and plugin api

* chore: WIP

* chore: convert to options

* chore: don't create workspace model until needed

* chore: add OR condition

* chore: add workspace name and don't change scope

* feat: prompt with appropriate name

* chore: rename

* chore: rename type

* chore: update signature

* chore: properly type the import functions

* feat: don't activate the workspace after importing

* chore: show loading on homepage

* fix: typo

* chore: fix tests and rename

* Update packages/insomnia-app/app/common/__tests__/import.test.js

Co-authored-by: David Marby <david@dmarby.se>

Co-authored-by: David Marby <david@dmarby.se>
2021-03-03 10:16:48 +13:00
Opender Singh
1fe337dd2d
Sync & Export support for ProtoDirectory (#3014) 2021-01-25 16:27:36 +13:00
Opender Singh
ccd270a9fb
gRPC with Insomnia export format V4 (#2830)
* feat: initial commit to export grpc entities

* feat: grpc requests and protofiles in v4 export format

* test(export): add grpc requests and protofiles in export tests

* test(models): add isProtoFile tests
2020-11-14 12:31:18 +13:00
Mike Ellan
19a9d6a7e7
Export import unit tests (#2663)
Co-authored-by: Opender Singh <opender94@gmail.com>
2020-09-25 12:16:51 +12:00
Opender Singh
200c354a3a
Handle empty security object in openapi3 (#2170) 2020-05-14 14:11:15 +12:00
Gregory Schier
c6a7c4d682 Initial designer merge 2020-04-26 13:33:39 -07:00
Gregory Schier
7bc219422e
Update Babel and ESLint and fix all related errors (#2032)
* Update Babel and ESLint and fix all related errors

* Update babel-jest
2020-04-09 10:32:19 -07:00
Gregory Schier
ae803c5c5f Support importing raw string and naming the import 2020-02-12 14:01:51 -05:00
Gregory Schier
8baf4a482c Add JSON Content-Type on import if it doesn't include it 2019-12-11 11:58:12 -05:00
Gregory Schier
899926450a Fix tests 2019-08-15 14:06:55 -07:00
Gregory Schier
3e2311e4e1 Make OpenAPI importer generate deterministic IDs 2019-08-15 12:56:32 -07:00
Gregory Schier
257685ca47 Ask user on import whether they want to use current workspace 2019-08-12 17:15:44 -04:00
Gregory Schier
7c5dc005ae GraphQL explorer now uses font color from theme 2019-08-12 16:50:41 -04:00
Gregory Schier
972477d2d4 Fix for Swagger and OpenAPI importers using wrong workspace key 2019-08-09 16:45:25 -04:00
Gregory Schier
c2b4b373b9
Try importing Swagger even if validation fails (Fixes #1354) (#1462) 2019-04-25 21:27:01 -07:00
Gregory Schier
a33fb6b9fa Fix tests 2019-04-18 11:13:12 -07:00
Gregory Schier
300ede1ff9 Merge branch 'develop' of github.com:getinsomnia/insomnia into pull/1396 2019-04-18 10:23:15 -07:00
Gregory Schier
9208505bd9 Choose between YAML and JSON during export 2019-04-17 21:21:29 -07:00
Behrooz Shabani
86860e455b making exports git friendly (#1409)
As YAML supports multi line content, each line of requests' body will
appear in separate line when exported. Hence, making the exports git
friendly.
2019-04-17 20:50:23 -07:00
Gregory Schier
0a616fba6b
Version Control (beta) (#1439)
* VCS proof of concept underway!

* Stuff

* Some things

* Replace deprecated Electron makeSingleInstance

* Rename `window` variables so not to be confused with window object

* Don't unnecessarily update request when URL does not change

* Regenerate package-lock

* Fix tests + ESLint

* Publish

 - insomnia-app@1.0.49
 - insomnia-cookies@0.0.12
 - insomnia-httpsnippet@1.16.18
 - insomnia-importers@2.0.13
 - insomnia-libcurl@0.0.23
 - insomnia-prettify@0.1.7
 - insomnia-url@0.1.6
 - insomnia-xpath@1.0.9
 - insomnia-plugin-base64@1.0.6
 - insomnia-plugin-cookie-jar@1.0.8
 - insomnia-plugin-core-themes@1.0.5
 - insomnia-plugin-default-headers@1.1.9
 - insomnia-plugin-file@1.0.7
 - insomnia-plugin-hash@1.0.7
 - insomnia-plugin-jsonpath@1.0.12
 - insomnia-plugin-now@1.0.11
 - insomnia-plugin-os@1.0.13
 - insomnia-plugin-prompt@1.1.9
 - insomnia-plugin-request@1.0.18
 - insomnia-plugin-response@1.0.16
 - insomnia-plugin-uuid@1.0.10

* Broken but w/e

* Some tweaks

* Big refactor. Create local snapshots and push done

* POC merging and a lot of improvements

* Lots of work done on initial UI/UX

* Fix old tests

* Atomic writes and size-based batches

* Update StageEntry definition once again to be better

* Factor out GraphQL query logic

* Merge algorithm, history modal, other minor things

* Fix test

* Merge, checkout, revert w/ user changes now work

* Force UI to refresh when switching branches changes active request

* Rough draft pull() and some cleanup

* E2EE stuff and some refactoring

* Add ability to share project with team and fixed tests

* VCS now created in root component and better remote project handling

* Remove unused definition

* Publish

 - insomnia-account@0.0.2
 - insomnia-app@1.1.1
 - insomnia-cookies@0.0.14
 - insomnia-httpsnippet@1.16.20
 - insomnia-importers@2.0.15
 - insomnia-libcurl@0.0.25
 - insomnia-prettify@0.1.9
 - insomnia-sync@0.0.2
 - insomnia-url@0.1.8
 - insomnia-xpath@1.0.11
 - insomnia-plugin-base64@1.0.8
 - insomnia-plugin-cookie-jar@1.0.10
 - insomnia-plugin-core-themes@1.0.7
 - insomnia-plugin-file@1.0.9
 - insomnia-plugin-hash@1.0.9
 - insomnia-plugin-jsonpath@1.0.14
 - insomnia-plugin-now@1.0.13
 - insomnia-plugin-os@1.0.15
 - insomnia-plugin-prompt@1.1.11
 - insomnia-plugin-request@1.0.20
 - insomnia-plugin-response@1.0.18
 - insomnia-plugin-uuid@1.0.12

* Move some deps around

* Fix Flow errors

* Update package.json

* Fix eslint errors

* Fix tests

* Update deps

* bootstrap insomnia-sync

* TRy fixing appveyor

* Try something else

* Bump lerna

* try powershell

*  Try again

* Fix imports

* Fixed errors

* sync types refactor

* Show remote projects in workspace dropdown

* Improved pulling of non-local workspaces

* Loading indicators and some tweaks

* Clean up sync staging modal

* Some sync improvements:

- No longer store stage
- Upgrade Electron
- Sync UI/UX improvements

* Fix snyc tests

* Upgraded deps and hot loader tweaks (it's broken for some reason)

* Fix tests

* Branches dialog, network refactoring, some tweaks

* Fixed merging when other branch is empty

* A bunch of small fixes from real testing

* Fixed pull merge logic

* Fix tests

* Some bug fixes

* A few small tweaks

* Conflict resolution and other improvements

* Fix tests

* Add revert changes

* Deal with duplicate projects per workspace

* Some tweaks and accessibility improvements

* Tooltip accessibility

* Fix API endpoint

* Fix tests

* Remove jest dep from insomnia-importers
2019-04-17 17:50:03 -07:00
Ricky Chandra
683ac86f4f refactor: refactor exportWorkspacesHAR() and exportWorkspacesJSON(), and fix affected tests 2019-03-12 23:37:05 +07:00
Ricky Chandra
63150be087 feat: Add functions to export requests and refactor existing export functions 2019-03-05 18:48:31 +07:00
Gregory Schier
88b0bb784f Add trailing commas to ESLint + Prettier 2018-12-12 12:36:11 -05:00
Gregory Schier
99de4725fa prettier entire project 2018-10-17 12:42:33 -04:00
Gregory Schier
4901f03041 Add Prettier 2018-06-25 13:42:50 -04:00
Gregory Schier
f918e647c0 Remove analytics 2018-05-23 00:28:25 -04:00
Gregory Schier
c9402c58d0 Upgrade flow 2018-03-29 13:59:32 -04:00
slawus
71ed57143e Added support for async importers (#694) 2018-01-16 12:51:28 +07:00
Gregory Schier
549ce23ce8
Merge All Repositories into Monorepo for easier maintenance (#629)
* All projects into monorepo

* Update CI

* More CI updates

* Extracted a bunch of things into packages

* Publish

 - insomnia-plugin-base64@1.0.1
 - insomnia-plugin-default-headers@1.0.2
 - insomnia-plugin-file@1.0.1
 - insomnia-plugin-hash@1.0.1
 - insomnia-plugin-now@1.0.1
 - insomnia-plugin-request@1.0.1
 - insomnia-plugin-response@1.0.1
 - insomnia-plugin-uuid@1.0.1
 - insomnia-cookies@0.0.2
 - insomnia-importers@1.5.2
 - insomnia-prettify@0.0.3
 - insomnia-url@0.0.2
 - insomnia-xpath@0.0.2

* A bunch of small fixes

* Improved build script

* Fixed

* Merge dangling files

* Usability refactor

* Handle duplicate plugin names
2017-11-26 20:45:40 +00:00