Merge branch 'master' into BUDI-9127/oauth2-settings
This commit is contained in:
Adria Navarro
GitHub
commit
513c37e916
|
|
@ -89,7 +89,7 @@
|
||||||
/* Selection is only meant for standalone list items (non stacked) so we just set a fixed border radius */
|
/* Selection is only meant for standalone list items (non stacked) so we just set a fixed border radius */
|
||||||
.list-item.selected {
|
.list-item.selected {
|
||||||
background-color: var(--spectrum-global-color-blue-100);
|
background-color: var(--spectrum-global-color-blue-100);
|
||||||
border-color: var(--spectrum-global-color-blue-100);
|
border: none;
|
||||||
}
|
}
|
||||||
.list-item.selected:after {
|
.list-item.selected:after {
|
||||||
content: "";
|
content: "";
|
||||||
|
|
@ -100,7 +100,7 @@
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
top: 0;
|
top: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
border-radius: 4px;
|
border-radius: inherit;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
opacity: 0.5;
|
opacity: 0.5;
|
||||||
|
|
|
||||||
|
|
@ -50,6 +50,7 @@
|
||||||
toBindingsArray,
|
toBindingsArray,
|
||||||
} from "@/dataBinding"
|
} from "@/dataBinding"
|
||||||
import ConnectedQueryScreens from "./ConnectedQueryScreens.svelte"
|
import ConnectedQueryScreens from "./ConnectedQueryScreens.svelte"
|
||||||
|
import AuthPicker from "./rest/AuthPicker.svelte"
|
||||||
|
|
||||||
export let queryId
|
export let queryId
|
||||||
|
|
||||||
|
|
@ -680,15 +681,12 @@
|
||||||
<div class="auth-container">
|
<div class="auth-container">
|
||||||
<div />
|
<div />
|
||||||
<!-- spacer -->
|
<!-- spacer -->
|
||||||
<div class="auth-select">
|
|
||||||
<Select
|
<AuthPicker
|
||||||
label="Auth"
|
bind:authConfigId={query.fields.authConfigId}
|
||||||
labelPosition="left"
|
{authConfigs}
|
||||||
placeholder="None"
|
datasourceId={datasource._id}
|
||||||
bind:value={query.fields.authConfigId}
|
/>
|
||||||
options={authConfigs}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</Tabs>
|
</Tabs>
|
||||||
</Layout>
|
</Layout>
|
||||||
|
|
@ -891,10 +889,6 @@
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
}
|
}
|
||||||
|
|
||||||
.auth-select {
|
|
||||||
width: 200px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pagination {
|
.pagination {
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: 1fr 1fr;
|
grid-template-columns: 1fr 1fr;
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,71 @@
|
||||||
|
<script lang="ts">
|
||||||
|
import {
|
||||||
|
ActionButton,
|
||||||
|
Body,
|
||||||
|
Button,
|
||||||
|
List,
|
||||||
|
ListItem,
|
||||||
|
PopoverAlignment,
|
||||||
|
} from "@budibase/bbui"
|
||||||
|
import { goto } from "@roxi/routify"
|
||||||
|
import { appStore } from "@/stores/builder"
|
||||||
|
import DetailPopover from "@/components/common/DetailPopover.svelte"
|
||||||
|
|
||||||
|
export let authConfigId: string | undefined
|
||||||
|
export let authConfigs: { label: string; value: string }[]
|
||||||
|
export let datasourceId: string
|
||||||
|
|
||||||
|
let popover: DetailPopover
|
||||||
|
|
||||||
|
$: authConfig = authConfigs.find(c => c.value === authConfigId)
|
||||||
|
|
||||||
|
function addBasicConfiguration() {
|
||||||
|
$goto(
|
||||||
|
`/builder/app/${$appStore.appId}/data/datasource/${datasourceId}?&tab=Authentication`
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function selectConfiguration(id: string) {
|
||||||
|
if (authConfigId === id) {
|
||||||
|
authConfigId = undefined
|
||||||
|
} else {
|
||||||
|
authConfigId = id
|
||||||
|
}
|
||||||
|
popover.hide()
|
||||||
|
}
|
||||||
|
|
||||||
|
$: title = !authConfig ? "Authentication" : `Auth: ${authConfig.label}`
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<DetailPopover bind:this={popover} {title} align={PopoverAlignment.Right}>
|
||||||
|
<div slot="anchor">
|
||||||
|
<ActionButton icon="LockClosed" quiet selected>
|
||||||
|
{#if !authConfig}
|
||||||
|
Authentication
|
||||||
|
{:else}
|
||||||
|
Auth: {authConfig.label}
|
||||||
|
{/if}
|
||||||
|
</ActionButton>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<Body size="S" color="var(--spectrum-global-color-gray-700)">
|
||||||
|
Basic & Bearer Authentication
|
||||||
|
</Body>
|
||||||
|
|
||||||
|
{#if authConfigs.length}
|
||||||
|
<List>
|
||||||
|
{#each authConfigs as config}
|
||||||
|
<ListItem
|
||||||
|
title={config.label}
|
||||||
|
on:click={() => selectConfiguration(config.value)}
|
||||||
|
selected={config.value === authConfigId}
|
||||||
|
/>
|
||||||
|
{/each}
|
||||||
|
</List>
|
||||||
|
{/if}
|
||||||
|
<div>
|
||||||
|
<Button secondary icon="Add" on:click={addBasicConfiguration}
|
||||||
|
>Add config</Button
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
</DetailPopover>
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
<script>
|
<script>
|
||||||
|
import { params } from "@roxi/routify"
|
||||||
import { Tabs, Tab, Heading, Body, Layout } from "@budibase/bbui"
|
import { Tabs, Tab, Heading, Body, Layout } from "@budibase/bbui"
|
||||||
import { datasources, integrations } from "@/stores/builder"
|
import { datasources, integrations } from "@/stores/builder"
|
||||||
import ICONS from "@/components/backend/DatasourceNavigator/icons"
|
import ICONS from "@/components/backend/DatasourceNavigator/icons"
|
||||||
|
|
@ -15,7 +16,7 @@
|
||||||
import { admin } from "@/stores/portal"
|
import { admin } from "@/stores/portal"
|
||||||
import { IntegrationTypes } from "@/constants/backend"
|
import { IntegrationTypes } from "@/constants/backend"
|
||||||
|
|
||||||
let selectedPanel = null
|
let selectedPanel = $params.tab ?? null
|
||||||
let panelOptions = []
|
let panelOptions = []
|
||||||
|
|
||||||
$: datasource = $datasources.selected
|
$: datasource = $datasources.selected
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue