Skip to content
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

Jump to bottom

Feature/swagger2 importer #695

Merged
merged 6 commits into from Jan 16, 2018
Merged

Feature/swagger2 importer #695

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
241dbb8
Added support for async importers
slawus Dec 27, 2017
28fc42f
Swagger importer v0.1 - supports import of workspace, environment and…
slawus Jan 2, 2018
2c4fd34
Refactor: added comments, removed function-in-function declarations
slawus Jan 8, 2018
a39f85e
Fixed import of yaml files. Added tests for both .json and .yaml
slawus Jan 9, 2018
ec06635
Merge branch 'develop' into feature/swagger2-importer
gschier Jan 16, 2018
220286d
Merge branch 'develop' into feature/swagger2-importer
gschier Jan 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1,026 changes: 0 additions & 1,026 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/insomnia-app/app/common/import.js
View file
Open in desktop
Expand Up @@ -76,7 +76,7 @@ export async function importRaw (
): Promise<{source: string, error: string | null, summary: {[string]: Array<BaseModel>}}> {
let results;
try {
results = convert(rawContent);
results = await convert(rawContent);
} catch (e) {
console.warn('Failed to import data', e);
return {
Expand Down
2 changes: 1 addition & 1 deletion packages/insomnia-app/app/ui/components/wrapper.js
View file
Open in desktop
Expand Up @@ -199,7 +199,7 @@ class Wrapper extends React.PureComponent<Props, State> {
// Allow user to paste any import file into the url. If it results in
// only one item, it will overwrite the current request.
try {
const {data} = importers.convert(text);
const {data} = await importers.convert(text);
const {resources} = data;
const r = resources[0];

Expand Down