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

Merge branch 'develop' of github.com:Budibase/budibase into events/plugins

This commit is contained in:
mike12345567 2022-09-14 17:48:25 +01:00
parent 46c1590c83 f18a865d53
commit 274e34044e
27 changed files with 68 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/builder/cypress/support/commands.js
View File

@ -779,7 +779,7 @@ Cypress.Commands.add("navigateToAutogeneratedModal", () => {
Cypress.Commands.add("selectExternalDatasource", datasourceName => { Cypress.Commands.add("selectExternalDatasource", datasourceName => {
// Navigates to Data Section // Navigates to Data Section
cy.navigateToDataSection() cy.navigateToDataSection()
// Open Data Source modal // Open Datasource modal
cy.get(".nav").within(() => { cy.get(".nav").within(() => {
cy.get(".add-button").click() cy.get(".add-button").click()
}) })

2
packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte
View File

@ -79,7 +79,7 @@
</Body> </Body>
<div class="params"> <div class="params">
<Label small>Data Source</Label> <Label small>Datasource</Label>
<Select <Select
bind:value={parameters.providerId} bind:value={parameters.providerId}
options={providerOptions} options={providerOptions}

4
packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte
View File

@ -71,13 +71,13 @@
<div class="root"> <div class="root">
<Body size="S"> <Body size="S">
Choosing a Data Source will automatically use the data it provides, but it's Choosing a Datasource will automatically use the data it provides, but it's
optional.<br /> optional.<br />
You can always add or override fields manually. You can always add or override fields manually.
</Body> </Body>
<div class="params"> <div class="params">
<Label small>Data Source</Label> <Label small>Datasource</Label>
<Select <Select
bind:value={parameters.providerId} bind:value={parameters.providerId}
options={providerOptions} options={providerOptions}

12
packages/builder/src/pages/builder/portal/manage/plugins/_components/PluginRow.svelte
View File

@ -20,6 +20,8 @@
? plugin.schema.schema.icon || "Book" ? plugin.schema.schema.icon || "Book"
: plugin.schema.schema.icon || "Beaker" : plugin.schema.schema.icon || "Beaker"
$: friendlyName = plugin?.schema?.schema?.friendlyName
function pluginDeleted() { function pluginDeleted() {
if (detailsModal) { if (detailsModal) {
detailsModal.hide() detailsModal.hide()
@ -41,6 +43,9 @@
> >
{plugin.name} {plugin.name}
</Body> </Body>
<Body size="XS" color="var(--spectrum-global-color-gray-900)">
{friendlyName}
</Body>
</div> </div>
</div> </div>
</div> </div>
@ -65,6 +70,11 @@
<Input disabled value={plugin.name} /> <Input disabled value={plugin.name} />
</div> </div>
<div class="details-row">
<Label size="M">Friendly name</Label>
<Input disabled value={friendlyName} />
</div>
<div class="details-row"> <div class="details-row">
<Label size="M">Type</Label> <Label size="M">Type</Label>
<Input <Input
@ -127,7 +137,7 @@
.details-row { .details-row {
display: grid; display: grid;
grid-template-columns: 60px 1fr; grid-template-columns: 70px 1fr;
grid-gap: var(--spacing-l) var(--spacing-l); grid-gap: var(--spacing-l) var(--spacing-l);
align-items: center; align-items: center;
} }