tsai
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Adding radio group of body types.

pull/3772/head
mike12345567 5 years ago
parent
a5e4d0bc95
commit
5bd2831bb6
5 changed files with 83 additions and 74 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      packages/bbui/src/Form/RadioGroup.svelte
  2. 16
      packages/builder/src/constants/index.js
  3. 13
      packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/_components/RestBodyInput.svelte
  4. 19
      packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/index.svelte
  5. 107
      packages/server/src/integrations/rest.ts

2
packages/bbui/src/Form/RadioGroup.svelte
View File

@ -9,6 +9,7 @@
export let labelPosition = "above"
export let error = null
export let options = []
export let direction = "vertical"
export let getOptionLabel = option => extractProperty(option, "label")
export let getOptionValue = option => extractProperty(option, "value")
@ -31,6 +32,7 @@
{disabled}
{value}
{options}
{direction}
{getOptionLabel}
{getOptionValue}
on:change={onChange}

16
packages/builder/src/constants/index.js
View File

@ -66,6 +66,22 @@ export const LAYOUT_NAMES = {
},
}
export const RawRestBodyTypes = {
NONE: "none",
FORM: "form",
ENCODED: "encoded",
JSON: "json",
TEXT: "text",
}
export const RestBodyTypes = [
{ name: "none", value: "none" },
{ name: "form-data", value: "form" },
{ name: "x-www-form-encoded", value: "encoded" },
{ name: "raw (JSON)", value: "json" },
{ name: "raw (Text)", value: "text" },
]
export const BUDIBASE_INTERNAL_DB = "bb_internal"
export const APP_NAME_REGEX = /^[\w\s]+$/

13
packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/_components/RestBodyInput.svelte
View File

@ -0,0 +1,13 @@
<script>
import { Body } from "@budibase/bbui"
import { RawRestBodyTypes } from "constants"
export let query
export let bodyType
</script>
{#if bodyType === RawRestBodyTypes.NONE}
<Body>The request does not have a body</Body>
{:else if bodyType === RawRestBodyTypes.FORM}
<Body>Form</Body>
{/if}

19
packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/index.svelte
View File

@ -11,12 +11,15 @@
Divider,
Button,
Heading,
RadioGroup,
} from "@budibase/bbui"
import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
import EditableLabel from "components/common/inputs/EditableLabel.svelte"
import CodeMirrorEditor from "components/common/CodeMirrorEditor.svelte"
import RestBodyInput from "../_components/RestBodyInput.svelte"
import { capitalise } from "helpers"
import { onMount } from "svelte"
import { RestBodyTypes as bodyTypes } from "constants"
let query
let breakQs = {}
@ -106,6 +109,9 @@
bannerCleared: false,
}
}
if (query && !query.fields.bodyType) {
query.fields.bodyType = "none"
}
})
</script>
@ -134,7 +140,7 @@
</div>
<Button cta disabled={!url} on:click={saveQuery}>Send</Button>
</div>
<Tabs selected="Params">
<Tabs selected="Params" noPadding>
<Tab title="Params">
<KeyValueBuilder bind:object={breakQs} name="param" headings />
</Tab>
@ -146,7 +152,16 @@
activity
/>
</Tab>
<Tab title="Body" />
<Tab title="Body">
<RadioGroup
bind:value={query.fields.bodyType}
options={bodyTypes}
direction="horizontal"
getOptionLabel={option => option.name}
getOptionValue={option => option.value}
/>
<RestBodyInput bind:bodyType={query.fields.bodyType} />
</Tab>
<Tab title="Transformer">
<Layout noPadding>
{#if !query.flags.bannerCleared}

107
packages/server/src/integrations/rest.ts
View File

@ -5,6 +5,36 @@ import {
} from "../definitions/datasource"
import { IntegrationBase } from "./base/IntegrationBase"
const BodyTypes = {
NONE: "none",
FORM_DATA: "form",
ENCODED: "encoded",
JSON: "json",
TEXT: "text",
}
const coreFields = {
path: {
type: DatasourceFieldTypes.STRING,
display: "URL",
},
queryString: {
type: DatasourceFieldTypes.STRING,
},
headers: {
type: DatasourceFieldTypes.OBJECT,
},
enabledHeaders: {
type: DatasourceFieldTypes.OBJECT,
},
requestBody: {
type: DatasourceFieldTypes.JSON,
},
bodyType: {
type: DatasourceFieldTypes.STRING,
},
}
module RestModule {
const fetch = require("node-fetch")
@ -38,97 +68,30 @@ module RestModule {
readable: true,
displayName: "POST",
type: QueryTypes.FIELDS,
fields: {
path: {
type: DatasourceFieldTypes.STRING,
display: "URL",
},
queryString: {
type: DatasourceFieldTypes.STRING,
},
headers: {
type: DatasourceFieldTypes.OBJECT,
},
requestBody: {
type: DatasourceFieldTypes.JSON,
},
},
fields: coreFields,
},
read: {
displayName: "GET",
readable: true,
type: QueryTypes.FIELDS,
fields: {
path: {
type: DatasourceFieldTypes.STRING,
display: "URL",
},
queryString: {
type: DatasourceFieldTypes.STRING,
},
headers: {
type: DatasourceFieldTypes.OBJECT,
},
},
fields: coreFields,
},
update: {
displayName: "PUT",
readable: true,
type: QueryTypes.FIELDS,
fields: {
path: {
type: DatasourceFieldTypes.STRING,
display: "URL",
},
queryString: {
type: DatasourceFieldTypes.STRING,
},
headers: {
type: DatasourceFieldTypes.OBJECT,
},
requestBody: {
type: DatasourceFieldTypes.JSON,
},
},
fields: coreFields,
},
patch: {
displayName: "PATCH",
readable: true,
type: QueryTypes.FIELDS,
fields: {
path: {
type: DatasourceFieldTypes.STRING,
display: "URL",
},
queryString: {
type: DatasourceFieldTypes.STRING,
},
headers: {
type: DatasourceFieldTypes.OBJECT,
},
requestBody: {
type: DatasourceFieldTypes.JSON,
},
},
fields: coreFields,
},
delete: {
displayName: "DELETE",
type: QueryTypes.FIELDS,
fields: {
path: {
type: DatasourceFieldTypes.STRING,
display: "URL",
},
queryString: {
type: DatasourceFieldTypes.STRING,
},
headers: {
type: DatasourceFieldTypes.OBJECT,
},
requestBody: {
type: DatasourceFieldTypes.JSON,
},
},
fields: coreFields,
},
},
}

Write Preview
Loading…
Cancel
Save