2022-09-13 05:02:59 +00:00
|
|
|
import {
|
|
|
|
|
extractApiUrlPath,
|
|
|
|
|
transformRestAction,
|
|
|
|
|
} from "transformers/RestActionTransformer";
|
chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
## Description
This PR upgrades Prettier to v2 + enforces TypeScript’s [`import
type`](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-8.html#type-only-imports-and-export)
syntax where applicable. It’s submitted as a separate PR so we can merge
it easily.
As a part of this PR, we reformat the codebase heavily:
- add `import type` everywhere where it’s required, and
- re-format the code to account for Prettier 2’s breaking changes:
https://prettier.io/blog/2020/03/21/2.0.0.html#breaking-changes
This PR is submitted against `release` to make sure all new code by team
members will adhere to new formatting standards, and we’ll have fewer
conflicts when merging `bundle-optimizations` into `release`. (I’ll
merge `release` back into `bundle-optimizations` once this PR is
merged.)
### Why is this needed?
This PR is needed because, for the Lodash optimization from
https://github.com/appsmithorg/appsmith/commit/7cbb12af886621256224be0c93e6a465dd710ad3,
we need to use `import type`. Otherwise, `babel-plugin-lodash` complains
that `LoDashStatic` is not a lodash function.
However, just using `import type` in the current codebase will give you
this:
<img width="962" alt="Screenshot 2023-03-08 at 17 45 59"
src="https://user-images.githubusercontent.com/2953267/223775744-407afa0c-e8b9-44a1-90f9-b879348da57f.png">
That’s because Prettier 1 can’t parse `import type` at all. To parse it,
we need to upgrade to Prettier 2.
### Why enforce `import type`?
Apart from just enabling `import type` support, this PR enforces
specifying `import type` everywhere it’s needed. (Developers will get
immediate TypeScript and ESLint errors when they forget to do so.)
I’m doing this because I believe `import type` improves DX and makes
refactorings easier.
Let’s say you had a few imports like below. Can you tell which of these
imports will increase the bundle size? (Tip: it’s not all of them!)
```ts
// app/client/src/workers/Linting/utils.ts
import { Position } from "codemirror";
import { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
It’s pretty hard, right?
What about now?
```ts
// app/client/src/workers/Linting/utils.ts
import type { Position } from "codemirror";
import type { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
Now, it’s clear that only `lodash` will be bundled.
This helps developers to see which imports are problematic, but it
_also_ helps with refactorings. Now, if you want to see where
`codemirror` is bundled, you can just grep for `import \{.*\} from
"codemirror"` – and you won’t get any type-only imports.
This also helps (some) bundlers. Upon transpiling, TypeScript erases
type-only imports completely. In some environment (not ours), this makes
the bundle smaller, as the bundler doesn’t need to bundle type-only
imports anymore.
## Type of change
- Chore (housekeeping or task changes that don't impact user perception)
## How Has This Been Tested?
This was tested to not break the build.
### Test Plan
> Add Testsmith test cases links that relate to this PR
### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
## Checklist:
### Dev activity
- [x] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag
### QA activity:
- [ ] Test plan has been approved by relevant developers
- [ ] Test plan has been peer reviewed by QA
- [ ] Cypress test cases have been added and approved by either SDET or
manual QA
- [ ] Organized project review call with relevant stakeholders after
Round 1/2 of QA
- [ ] Added Test Plan Approved label after reveiwing all Cypress test
---------
Co-authored-by: Satish Gandham <hello@satishgandham.com>
Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
2023-03-16 11:41:47 +00:00
|
|
|
import type { ApiAction } from "entities/Action";
|
|
|
|
|
import { PluginType } from "entities/Action";
|
2021-10-06 19:20:35 +00:00
|
|
|
import {
|
2023-12-19 10:26:20 +00:00
|
|
|
HTTP_PROTOCOL,
|
2021-10-06 19:20:35 +00:00
|
|
|
MultiPartOptionTypes,
|
|
|
|
|
POST_BODY_FORMAT_OPTIONS,
|
feat: Support body in GET API requests (#7127)
* WIP
* Refactoring HTTP Method & Content Type to be objects instead of arrays
TODO:
1. Set the default content-type for Get request to "None". Currently, it's raw
2. For None content-type, don't send the body field in the API request
* Almost working implementation for the None type
Currently, the body still gets sent in non-GET requests even if the None tab is selected.
* Adding object.freeze to prevent any modifications to HTTP_METHOD_ENUM
* WIP: Using enum & const for ts autocomplete
* working implementation for NONE type, apiContentType prop added to API actions
* WIP
* Refactoring HTTP Method & Content Type to be objects instead of arrays
TODO:
1. Set the default content-type for Get request to "None". Currently, it's raw
2. For None content-type, don't send the body field in the API request
* Almost working implementation for the None type
Currently, the body still gets sent in non-GET requests even if the None tab is selected.
* Adding object.freeze to prevent any modifications to HTTP_METHOD_ENUM
* WIP: Using enum & const for ts autocomplete
* working implementation for NONE type, apiContentType prop added to API actions
* adds apiContentType to actionConfiguration.formData object
* Handling apiContentType property in Rest API formData
* change apiContentType when user types content-type value and switches http method
* makes api editor as similar as possible to postman, project postman.
* Correcting the import in ApiEditorConstants
* Resolved all merge conflicts
* replay DSL functtionality
* removes unneccessary files from worker
* Fixes type declarations, naming e.t.c.
* fix server side merge conflicts
* fix client side merge conflicts
* fix failing cypress tests
Co-authored-by: Irongade <adeoluayangade@yahoo.com>
Co-authored-by: Ayangade Adeoluwa <37867493+Irongade@users.noreply.github.com>
2022-02-15 11:13:48 +00:00
|
|
|
// POST_BODY_FORMAT_OPTIONS_ENUM,
|
2022-09-09 15:59:47 +00:00
|
|
|
} from "constants/ApiEditorConstants/CommonApiConstants";
|
2019-12-23 12:12:58 +00:00
|
|
|
|
2020-05-08 12:54:27 +00:00
|
|
|
// jest.mock("POST_");
|
2019-12-23 12:12:58 +00:00
|
|
|
|
2021-01-12 04:17:28 +00:00
|
|
|
const BASE_ACTION: ApiAction = {
|
2020-06-04 13:49:22 +00:00
|
|
|
dynamicBindingPathList: [],
|
|
|
|
|
cacheResponse: "",
|
|
|
|
|
executeOnLoad: false,
|
|
|
|
|
invalids: [],
|
|
|
|
|
isValid: false,
|
2022-06-15 15:37:41 +00:00
|
|
|
workspaceId: "",
|
2020-04-23 14:57:37 +00:00
|
|
|
pageId: "",
|
|
|
|
|
pluginId: "",
|
2019-12-23 12:12:58 +00:00
|
|
|
id: "testId",
|
|
|
|
|
datasource: {
|
|
|
|
|
id: "testDataSource",
|
|
|
|
|
},
|
|
|
|
|
name: "testName",
|
2020-06-04 13:49:22 +00:00
|
|
|
pluginType: PluginType.API,
|
2019-12-23 12:12:58 +00:00
|
|
|
actionConfiguration: {
|
2020-05-08 12:54:27 +00:00
|
|
|
httpMethod: "GET",
|
2023-12-19 10:26:20 +00:00
|
|
|
httpVersion: HTTP_PROTOCOL.HTTP11.value,
|
2021-02-16 15:01:35 +00:00
|
|
|
encodeParamsToggle: true,
|
2019-12-23 12:12:58 +00:00
|
|
|
path: "users",
|
2021-01-12 04:17:28 +00:00
|
|
|
headers: [],
|
feat: Support body in GET API requests (#7127)
* WIP
* Refactoring HTTP Method & Content Type to be objects instead of arrays
TODO:
1. Set the default content-type for Get request to "None". Currently, it's raw
2. For None content-type, don't send the body field in the API request
* Almost working implementation for the None type
Currently, the body still gets sent in non-GET requests even if the None tab is selected.
* Adding object.freeze to prevent any modifications to HTTP_METHOD_ENUM
* WIP: Using enum & const for ts autocomplete
* working implementation for NONE type, apiContentType prop added to API actions
* WIP
* Refactoring HTTP Method & Content Type to be objects instead of arrays
TODO:
1. Set the default content-type for Get request to "None". Currently, it's raw
2. For None content-type, don't send the body field in the API request
* Almost working implementation for the None type
Currently, the body still gets sent in non-GET requests even if the None tab is selected.
* Adding object.freeze to prevent any modifications to HTTP_METHOD_ENUM
* WIP: Using enum & const for ts autocomplete
* working implementation for NONE type, apiContentType prop added to API actions
* adds apiContentType to actionConfiguration.formData object
* Handling apiContentType property in Rest API formData
* change apiContentType when user types content-type value and switches http method
* makes api editor as similar as possible to postman, project postman.
* Correcting the import in ApiEditorConstants
* Resolved all merge conflicts
* replay DSL functtionality
* removes unneccessary files from worker
* Fixes type declarations, naming e.t.c.
* fix server side merge conflicts
* fix client side merge conflicts
* fix failing cypress tests
Co-authored-by: Irongade <adeoluayangade@yahoo.com>
Co-authored-by: Ayangade Adeoluwa <37867493+Irongade@users.noreply.github.com>
2022-02-15 11:13:48 +00:00
|
|
|
formData: {
|
|
|
|
|
apiContentType: "none",
|
|
|
|
|
},
|
2021-01-12 04:17:28 +00:00
|
|
|
timeoutInMillisecond: 5000,
|
2019-12-23 12:12:58 +00:00
|
|
|
},
|
|
|
|
|
jsonPathKeys: [],
|
2022-06-21 13:57:34 +00:00
|
|
|
messages: [],
|
2019-12-23 12:12:58 +00:00
|
|
|
};
|
|
|
|
|
|
2020-05-08 12:54:27 +00:00
|
|
|
describe("Api action transformer", () => {
|
|
|
|
|
it("Removes params from path", () => {
|
2021-01-12 04:17:28 +00:00
|
|
|
const input: ApiAction = {
|
2020-05-08 12:54:27 +00:00
|
|
|
...BASE_ACTION,
|
|
|
|
|
actionConfiguration: {
|
|
|
|
|
...BASE_ACTION.actionConfiguration,
|
|
|
|
|
path: "users?page=1",
|
|
|
|
|
queryParameters: [
|
|
|
|
|
{
|
|
|
|
|
key: "page",
|
|
|
|
|
value: "1",
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const output = {
|
|
|
|
|
...BASE_ACTION,
|
|
|
|
|
actionConfiguration: {
|
|
|
|
|
...BASE_ACTION.actionConfiguration,
|
|
|
|
|
path: "users",
|
|
|
|
|
queryParameters: [
|
|
|
|
|
{
|
|
|
|
|
key: "page",
|
|
|
|
|
value: "1",
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
const result = transformRestAction(input);
|
|
|
|
|
expect(result).toEqual(output);
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it("Sets the correct body for JSON display type", () => {
|
|
|
|
|
const input = {
|
|
|
|
|
...BASE_ACTION,
|
|
|
|
|
actionConfiguration: {
|
|
|
|
|
...BASE_ACTION.actionConfiguration,
|
|
|
|
|
httpMethod: "POST",
|
|
|
|
|
headers: [{ key: "content-type", value: "application/json" }],
|
2020-06-09 06:25:11 +00:00
|
|
|
body: "{ name: 'test' }",
|
2020-05-08 12:54:27 +00:00
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
const output = {
|
|
|
|
|
...BASE_ACTION,
|
|
|
|
|
actionConfiguration: {
|
|
|
|
|
...BASE_ACTION.actionConfiguration,
|
|
|
|
|
httpMethod: "POST",
|
|
|
|
|
headers: [{ key: "content-type", value: "application/json" }],
|
|
|
|
|
body: "{ name: 'test' }",
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
const result = transformRestAction(input);
|
|
|
|
|
expect(result).toEqual(output);
|
|
|
|
|
});
|
|
|
|
|
|
2020-11-10 09:41:05 +00:00
|
|
|
it("bodyFormData should not be reset for non xxx-form-encoded-data type", () => {
|
|
|
|
|
const input = {
|
|
|
|
|
...BASE_ACTION,
|
|
|
|
|
actionConfiguration: {
|
|
|
|
|
...BASE_ACTION.actionConfiguration,
|
|
|
|
|
httpMethod: "POST",
|
|
|
|
|
headers: [{ key: "content-type", value: "application/json" }],
|
|
|
|
|
body: "{ name: 'test' }",
|
2021-01-12 04:17:28 +00:00
|
|
|
bodyFormData: [
|
|
|
|
|
{
|
|
|
|
|
key: "hey",
|
|
|
|
|
value: "ho",
|
|
|
|
|
editable: true,
|
|
|
|
|
mandatory: false,
|
|
|
|
|
description: "I been tryin to do it right",
|
|
|
|
|
type: "",
|
|
|
|
|
},
|
|
|
|
|
],
|
2020-11-10 09:41:05 +00:00
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
const output = {
|
|
|
|
|
...BASE_ACTION,
|
|
|
|
|
actionConfiguration: {
|
|
|
|
|
...BASE_ACTION.actionConfiguration,
|
|
|
|
|
httpMethod: "POST",
|
|
|
|
|
headers: [{ key: "content-type", value: "application/json" }],
|
|
|
|
|
body: "{ name: 'test' }",
|
2021-01-12 04:17:28 +00:00
|
|
|
bodyFormData: [
|
|
|
|
|
{
|
|
|
|
|
key: "hey",
|
|
|
|
|
value: "ho",
|
|
|
|
|
editable: true,
|
|
|
|
|
mandatory: false,
|
|
|
|
|
description: "I been tryin to do it right",
|
|
|
|
|
type: "",
|
|
|
|
|
},
|
|
|
|
|
],
|
2020-11-10 09:41:05 +00:00
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
const result = transformRestAction(input);
|
|
|
|
|
expect(result).toEqual(output);
|
|
|
|
|
});
|
|
|
|
|
|
2020-11-10 11:12:31 +00:00
|
|
|
it("body should not be reset for xxx-form-encoded-data type", () => {
|
|
|
|
|
const input = {
|
|
|
|
|
...BASE_ACTION,
|
|
|
|
|
actionConfiguration: {
|
|
|
|
|
...BASE_ACTION.actionConfiguration,
|
|
|
|
|
httpMethod: "POST",
|
|
|
|
|
headers: [
|
feat: Support body in GET API requests (#7127)
* WIP
* Refactoring HTTP Method & Content Type to be objects instead of arrays
TODO:
1. Set the default content-type for Get request to "None". Currently, it's raw
2. For None content-type, don't send the body field in the API request
* Almost working implementation for the None type
Currently, the body still gets sent in non-GET requests even if the None tab is selected.
* Adding object.freeze to prevent any modifications to HTTP_METHOD_ENUM
* WIP: Using enum & const for ts autocomplete
* working implementation for NONE type, apiContentType prop added to API actions
* WIP
* Refactoring HTTP Method & Content Type to be objects instead of arrays
TODO:
1. Set the default content-type for Get request to "None". Currently, it's raw
2. For None content-type, don't send the body field in the API request
* Almost working implementation for the None type
Currently, the body still gets sent in non-GET requests even if the None tab is selected.
* Adding object.freeze to prevent any modifications to HTTP_METHOD_ENUM
* WIP: Using enum & const for ts autocomplete
* working implementation for NONE type, apiContentType prop added to API actions
* adds apiContentType to actionConfiguration.formData object
* Handling apiContentType property in Rest API formData
* change apiContentType when user types content-type value and switches http method
* makes api editor as similar as possible to postman, project postman.
* Correcting the import in ApiEditorConstants
* Resolved all merge conflicts
* replay DSL functtionality
* removes unneccessary files from worker
* Fixes type declarations, naming e.t.c.
* fix server side merge conflicts
* fix client side merge conflicts
* fix failing cypress tests
Co-authored-by: Irongade <adeoluayangade@yahoo.com>
Co-authored-by: Ayangade Adeoluwa <37867493+Irongade@users.noreply.github.com>
2022-02-15 11:13:48 +00:00
|
|
|
{
|
|
|
|
|
key: "content-type",
|
|
|
|
|
value: POST_BODY_FORMAT_OPTIONS.FORM_URLENCODED,
|
|
|
|
|
},
|
2020-11-10 11:12:31 +00:00
|
|
|
],
|
2021-01-12 04:17:28 +00:00
|
|
|
bodyFormData: [
|
|
|
|
|
{
|
|
|
|
|
key: "hey",
|
|
|
|
|
value: "ho",
|
|
|
|
|
editable: true,
|
|
|
|
|
mandatory: false,
|
|
|
|
|
description: "I been tryin to do it right",
|
|
|
|
|
type: "",
|
|
|
|
|
},
|
|
|
|
|
],
|
2020-11-10 11:12:31 +00:00
|
|
|
body: "{ name: 'test' }",
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
const output = {
|
|
|
|
|
...BASE_ACTION,
|
|
|
|
|
actionConfiguration: {
|
|
|
|
|
...BASE_ACTION.actionConfiguration,
|
|
|
|
|
httpMethod: "POST",
|
|
|
|
|
headers: [
|
feat: Support body in GET API requests (#7127)
* WIP
* Refactoring HTTP Method & Content Type to be objects instead of arrays
TODO:
1. Set the default content-type for Get request to "None". Currently, it's raw
2. For None content-type, don't send the body field in the API request
* Almost working implementation for the None type
Currently, the body still gets sent in non-GET requests even if the None tab is selected.
* Adding object.freeze to prevent any modifications to HTTP_METHOD_ENUM
* WIP: Using enum & const for ts autocomplete
* working implementation for NONE type, apiContentType prop added to API actions
* WIP
* Refactoring HTTP Method & Content Type to be objects instead of arrays
TODO:
1. Set the default content-type for Get request to "None". Currently, it's raw
2. For None content-type, don't send the body field in the API request
* Almost working implementation for the None type
Currently, the body still gets sent in non-GET requests even if the None tab is selected.
* Adding object.freeze to prevent any modifications to HTTP_METHOD_ENUM
* WIP: Using enum & const for ts autocomplete
* working implementation for NONE type, apiContentType prop added to API actions
* adds apiContentType to actionConfiguration.formData object
* Handling apiContentType property in Rest API formData
* change apiContentType when user types content-type value and switches http method
* makes api editor as similar as possible to postman, project postman.
* Correcting the import in ApiEditorConstants
* Resolved all merge conflicts
* replay DSL functtionality
* removes unneccessary files from worker
* Fixes type declarations, naming e.t.c.
* fix server side merge conflicts
* fix client side merge conflicts
* fix failing cypress tests
Co-authored-by: Irongade <adeoluayangade@yahoo.com>
Co-authored-by: Ayangade Adeoluwa <37867493+Irongade@users.noreply.github.com>
2022-02-15 11:13:48 +00:00
|
|
|
{
|
|
|
|
|
key: "content-type",
|
|
|
|
|
value: POST_BODY_FORMAT_OPTIONS.FORM_URLENCODED,
|
|
|
|
|
},
|
2020-11-10 11:12:31 +00:00
|
|
|
],
|
|
|
|
|
body: "{ name: 'test' }",
|
2021-01-12 04:17:28 +00:00
|
|
|
bodyFormData: [
|
|
|
|
|
{
|
|
|
|
|
key: "hey",
|
|
|
|
|
value: "ho",
|
|
|
|
|
editable: true,
|
|
|
|
|
mandatory: false,
|
|
|
|
|
description: "I been tryin to do it right",
|
|
|
|
|
type: "",
|
|
|
|
|
},
|
|
|
|
|
],
|
2020-11-10 11:12:31 +00:00
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
const result = transformRestAction(input);
|
|
|
|
|
expect(result).toEqual(output);
|
|
|
|
|
});
|
|
|
|
|
|
2020-05-08 12:54:27 +00:00
|
|
|
it("Sets the correct body for xxx-form-encoded-data display type", () => {
|
|
|
|
|
const input = {
|
|
|
|
|
...BASE_ACTION,
|
|
|
|
|
actionConfiguration: {
|
|
|
|
|
...BASE_ACTION.actionConfiguration,
|
|
|
|
|
httpMethod: "POST",
|
|
|
|
|
headers: [
|
feat: Support body in GET API requests (#7127)
* WIP
* Refactoring HTTP Method & Content Type to be objects instead of arrays
TODO:
1. Set the default content-type for Get request to "None". Currently, it's raw
2. For None content-type, don't send the body field in the API request
* Almost working implementation for the None type
Currently, the body still gets sent in non-GET requests even if the None tab is selected.
* Adding object.freeze to prevent any modifications to HTTP_METHOD_ENUM
* WIP: Using enum & const for ts autocomplete
* working implementation for NONE type, apiContentType prop added to API actions
* WIP
* Refactoring HTTP Method & Content Type to be objects instead of arrays
TODO:
1. Set the default content-type for Get request to "None". Currently, it's raw
2. For None content-type, don't send the body field in the API request
* Almost working implementation for the None type
Currently, the body still gets sent in non-GET requests even if the None tab is selected.
* Adding object.freeze to prevent any modifications to HTTP_METHOD_ENUM
* WIP: Using enum & const for ts autocomplete
* working implementation for NONE type, apiContentType prop added to API actions
* adds apiContentType to actionConfiguration.formData object
* Handling apiContentType property in Rest API formData
* change apiContentType when user types content-type value and switches http method
* makes api editor as similar as possible to postman, project postman.
* Correcting the import in ApiEditorConstants
* Resolved all merge conflicts
* replay DSL functtionality
* removes unneccessary files from worker
* Fixes type declarations, naming e.t.c.
* fix server side merge conflicts
* fix client side merge conflicts
* fix failing cypress tests
Co-authored-by: Irongade <adeoluayangade@yahoo.com>
Co-authored-by: Ayangade Adeoluwa <37867493+Irongade@users.noreply.github.com>
2022-02-15 11:13:48 +00:00
|
|
|
{
|
|
|
|
|
key: "content-type",
|
|
|
|
|
value: POST_BODY_FORMAT_OPTIONS.FORM_URLENCODED,
|
|
|
|
|
},
|
2020-05-08 12:54:27 +00:00
|
|
|
],
|
2021-01-12 04:17:28 +00:00
|
|
|
bodyFormData: [
|
|
|
|
|
{
|
|
|
|
|
key: "hey",
|
|
|
|
|
value: "ho",
|
|
|
|
|
editable: true,
|
|
|
|
|
mandatory: false,
|
|
|
|
|
description: "I been tryin to do it right",
|
|
|
|
|
type: "",
|
|
|
|
|
},
|
|
|
|
|
],
|
2020-05-08 12:54:27 +00:00
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
const output = {
|
|
|
|
|
...BASE_ACTION,
|
|
|
|
|
actionConfiguration: {
|
|
|
|
|
...BASE_ACTION.actionConfiguration,
|
|
|
|
|
httpMethod: "POST",
|
|
|
|
|
headers: [
|
feat: Support body in GET API requests (#7127)
* WIP
* Refactoring HTTP Method & Content Type to be objects instead of arrays
TODO:
1. Set the default content-type for Get request to "None". Currently, it's raw
2. For None content-type, don't send the body field in the API request
* Almost working implementation for the None type
Currently, the body still gets sent in non-GET requests even if the None tab is selected.
* Adding object.freeze to prevent any modifications to HTTP_METHOD_ENUM
* WIP: Using enum & const for ts autocomplete
* working implementation for NONE type, apiContentType prop added to API actions
* WIP
* Refactoring HTTP Method & Content Type to be objects instead of arrays
TODO:
1. Set the default content-type for Get request to "None". Currently, it's raw
2. For None content-type, don't send the body field in the API request
* Almost working implementation for the None type
Currently, the body still gets sent in non-GET requests even if the None tab is selected.
* Adding object.freeze to prevent any modifications to HTTP_METHOD_ENUM
* WIP: Using enum & const for ts autocomplete
* working implementation for NONE type, apiContentType prop added to API actions
* adds apiContentType to actionConfiguration.formData object
* Handling apiContentType property in Rest API formData
* change apiContentType when user types content-type value and switches http method
* makes api editor as similar as possible to postman, project postman.
* Correcting the import in ApiEditorConstants
* Resolved all merge conflicts
* replay DSL functtionality
* removes unneccessary files from worker
* Fixes type declarations, naming e.t.c.
* fix server side merge conflicts
* fix client side merge conflicts
* fix failing cypress tests
Co-authored-by: Irongade <adeoluayangade@yahoo.com>
Co-authored-by: Ayangade Adeoluwa <37867493+Irongade@users.noreply.github.com>
2022-02-15 11:13:48 +00:00
|
|
|
{
|
|
|
|
|
key: "content-type",
|
|
|
|
|
value: POST_BODY_FORMAT_OPTIONS.FORM_URLENCODED,
|
|
|
|
|
},
|
2020-05-08 12:54:27 +00:00
|
|
|
],
|
2020-06-09 06:25:11 +00:00
|
|
|
body: "",
|
2021-01-12 04:17:28 +00:00
|
|
|
bodyFormData: [
|
|
|
|
|
{
|
|
|
|
|
key: "hey",
|
|
|
|
|
value: "ho",
|
|
|
|
|
editable: true,
|
|
|
|
|
mandatory: false,
|
|
|
|
|
description: "I been tryin to do it right",
|
|
|
|
|
type: "",
|
|
|
|
|
},
|
|
|
|
|
],
|
2020-05-08 12:54:27 +00:00
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
const result = transformRestAction(input);
|
|
|
|
|
expect(result).toEqual(output);
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it("Sets the correct body for custom/raw display type", () => {
|
|
|
|
|
const input = {
|
|
|
|
|
...BASE_ACTION,
|
|
|
|
|
actionConfiguration: {
|
|
|
|
|
...BASE_ACTION.actionConfiguration,
|
|
|
|
|
headers: [{ key: "content-type", value: "text/html" }],
|
|
|
|
|
httpMethod: "POST",
|
2020-06-09 06:25:11 +00:00
|
|
|
body: "raw body",
|
2020-05-08 12:54:27 +00:00
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
const output = {
|
|
|
|
|
...BASE_ACTION,
|
|
|
|
|
actionConfiguration: {
|
|
|
|
|
...BASE_ACTION.actionConfiguration,
|
|
|
|
|
headers: [{ key: "content-type", value: "text/html" }],
|
|
|
|
|
httpMethod: "POST",
|
|
|
|
|
body: "raw body",
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
const result = transformRestAction(input);
|
|
|
|
|
expect(result).toEqual(output);
|
|
|
|
|
});
|
2021-10-06 19:20:35 +00:00
|
|
|
|
|
|
|
|
it("filters empty pairs from form data", () => {
|
|
|
|
|
const input: ApiAction = {
|
|
|
|
|
...BASE_ACTION,
|
|
|
|
|
actionConfiguration: {
|
|
|
|
|
...BASE_ACTION.actionConfiguration,
|
|
|
|
|
httpMethod: "POST",
|
|
|
|
|
headers: [
|
feat: Support body in GET API requests (#7127)
* WIP
* Refactoring HTTP Method & Content Type to be objects instead of arrays
TODO:
1. Set the default content-type for Get request to "None". Currently, it's raw
2. For None content-type, don't send the body field in the API request
* Almost working implementation for the None type
Currently, the body still gets sent in non-GET requests even if the None tab is selected.
* Adding object.freeze to prevent any modifications to HTTP_METHOD_ENUM
* WIP: Using enum & const for ts autocomplete
* working implementation for NONE type, apiContentType prop added to API actions
* WIP
* Refactoring HTTP Method & Content Type to be objects instead of arrays
TODO:
1. Set the default content-type for Get request to "None". Currently, it's raw
2. For None content-type, don't send the body field in the API request
* Almost working implementation for the None type
Currently, the body still gets sent in non-GET requests even if the None tab is selected.
* Adding object.freeze to prevent any modifications to HTTP_METHOD_ENUM
* WIP: Using enum & const for ts autocomplete
* working implementation for NONE type, apiContentType prop added to API actions
* adds apiContentType to actionConfiguration.formData object
* Handling apiContentType property in Rest API formData
* change apiContentType when user types content-type value and switches http method
* makes api editor as similar as possible to postman, project postman.
* Correcting the import in ApiEditorConstants
* Resolved all merge conflicts
* replay DSL functtionality
* removes unneccessary files from worker
* Fixes type declarations, naming e.t.c.
* fix server side merge conflicts
* fix client side merge conflicts
* fix failing cypress tests
Co-authored-by: Irongade <adeoluayangade@yahoo.com>
Co-authored-by: Ayangade Adeoluwa <37867493+Irongade@users.noreply.github.com>
2022-02-15 11:13:48 +00:00
|
|
|
{
|
|
|
|
|
key: "content-type",
|
|
|
|
|
value: POST_BODY_FORMAT_OPTIONS.MULTIPART_FORM_DATA,
|
|
|
|
|
},
|
2021-10-06 19:20:35 +00:00
|
|
|
],
|
|
|
|
|
body: "",
|
|
|
|
|
bodyFormData: [
|
|
|
|
|
{
|
|
|
|
|
key: "hey",
|
|
|
|
|
value: "ho",
|
|
|
|
|
type: MultiPartOptionTypes.TEXT,
|
|
|
|
|
editable: true,
|
|
|
|
|
mandatory: false,
|
|
|
|
|
description: "I been tryin to do it right",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
key: "",
|
|
|
|
|
value: "",
|
|
|
|
|
editable: true,
|
|
|
|
|
mandatory: false,
|
|
|
|
|
description: "I been tryin to do it right",
|
|
|
|
|
type: "",
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// output object should not include the second bodyFormData object
|
|
|
|
|
// as its key, value and type are empty
|
|
|
|
|
const output: ApiAction = {
|
|
|
|
|
...BASE_ACTION,
|
|
|
|
|
actionConfiguration: {
|
|
|
|
|
...BASE_ACTION.actionConfiguration,
|
|
|
|
|
httpMethod: "POST",
|
|
|
|
|
headers: [
|
feat: Support body in GET API requests (#7127)
* WIP
* Refactoring HTTP Method & Content Type to be objects instead of arrays
TODO:
1. Set the default content-type for Get request to "None". Currently, it's raw
2. For None content-type, don't send the body field in the API request
* Almost working implementation for the None type
Currently, the body still gets sent in non-GET requests even if the None tab is selected.
* Adding object.freeze to prevent any modifications to HTTP_METHOD_ENUM
* WIP: Using enum & const for ts autocomplete
* working implementation for NONE type, apiContentType prop added to API actions
* WIP
* Refactoring HTTP Method & Content Type to be objects instead of arrays
TODO:
1. Set the default content-type for Get request to "None". Currently, it's raw
2. For None content-type, don't send the body field in the API request
* Almost working implementation for the None type
Currently, the body still gets sent in non-GET requests even if the None tab is selected.
* Adding object.freeze to prevent any modifications to HTTP_METHOD_ENUM
* WIP: Using enum & const for ts autocomplete
* working implementation for NONE type, apiContentType prop added to API actions
* adds apiContentType to actionConfiguration.formData object
* Handling apiContentType property in Rest API formData
* change apiContentType when user types content-type value and switches http method
* makes api editor as similar as possible to postman, project postman.
* Correcting the import in ApiEditorConstants
* Resolved all merge conflicts
* replay DSL functtionality
* removes unneccessary files from worker
* Fixes type declarations, naming e.t.c.
* fix server side merge conflicts
* fix client side merge conflicts
* fix failing cypress tests
Co-authored-by: Irongade <adeoluayangade@yahoo.com>
Co-authored-by: Ayangade Adeoluwa <37867493+Irongade@users.noreply.github.com>
2022-02-15 11:13:48 +00:00
|
|
|
{
|
|
|
|
|
key: "content-type",
|
|
|
|
|
value: POST_BODY_FORMAT_OPTIONS.MULTIPART_FORM_DATA,
|
|
|
|
|
},
|
2021-10-06 19:20:35 +00:00
|
|
|
],
|
|
|
|
|
body: "",
|
|
|
|
|
bodyFormData: [
|
|
|
|
|
{
|
|
|
|
|
key: "hey",
|
|
|
|
|
value: "ho",
|
|
|
|
|
type: MultiPartOptionTypes.TEXT,
|
|
|
|
|
editable: true,
|
|
|
|
|
mandatory: false,
|
|
|
|
|
description: "I been tryin to do it right",
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
const result = transformRestAction(input);
|
|
|
|
|
expect(result).toEqual(output);
|
|
|
|
|
});
|
2022-09-13 05:02:59 +00:00
|
|
|
|
|
|
|
|
it("Ensures that Api url path is being correctly extracted regardless of expressions witin dynamic bindings", () => {
|
|
|
|
|
// testing for simple dynamic bindings in path
|
|
|
|
|
const path1 = `/{{Text1.text ? 'users' : 'user'}}`;
|
|
|
|
|
const output1 = `/{{Text1.text ? 'users' : 'user'}}`;
|
|
|
|
|
|
|
|
|
|
const result1 = extractApiUrlPath(path1);
|
|
|
|
|
expect(result1).toEqual(output1);
|
|
|
|
|
|
|
|
|
|
// testing multiple dynamic bindings in path with empty query params
|
|
|
|
|
const path2 = `/{{Text1.text ? 'users' : 'user'}}/{{"test"}}?`;
|
|
|
|
|
const output2 = `/{{Text1.text ? 'users' : 'user'}}/{{"test"}}`;
|
|
|
|
|
|
|
|
|
|
const result2 = extractApiUrlPath(path2);
|
|
|
|
|
expect(result2).toEqual(output2);
|
|
|
|
|
|
|
|
|
|
// testing multiple dynamic bindings in path with non-empty query params
|
|
|
|
|
const path3 = `/{{Text1.text ? 'users' : 'user'}}/{{"test"}}?a=hello&b=world`;
|
|
|
|
|
const output3 = `/{{Text1.text ? 'users' : 'user'}}/{{"test"}}`;
|
|
|
|
|
|
|
|
|
|
const result3 = extractApiUrlPath(path3);
|
|
|
|
|
expect(result3).toEqual(output3);
|
|
|
|
|
|
|
|
|
|
// testing normal strings and dynamic bindings in path with non-empty query params
|
|
|
|
|
const path4 = `/key/{{Text1.text}}?a=hello&b=world`;
|
|
|
|
|
const output4 = `/key/{{Text1.text}}`;
|
|
|
|
|
|
|
|
|
|
const result4 = extractApiUrlPath(path4);
|
|
|
|
|
expect(result4).toEqual(output4);
|
|
|
|
|
|
|
|
|
|
const path5 = "/{{Text1.text ?? 'user1'}}";
|
|
|
|
|
const output5 = "/{{Text1.text ?? 'user1'}}";
|
|
|
|
|
|
|
|
|
|
const result5 = extractApiUrlPath(path5);
|
|
|
|
|
expect(result5).toEqual(output5);
|
|
|
|
|
});
|
2019-12-23 12:12:58 +00:00
|
|
|
});
|