mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-10-16 08:03:02 +00:00
* feat: offer known Google scopes as checkboxes in the oauth connect dialog Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Kv72vdCDggCZEjJSmNCwnX * fix: keep custom oauth scope rows apart from checked options while typing Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Kv72vdCDggCZEjJSmNCwnX * fix: drop the rust scope_options field and render checkboxes from the ticked set Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Kv72vdCDggCZEjJSmNCwnX * fix: keep ticked oauth scope options independent of free-text rows Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Kv72vdCDggCZEjJSmNCwnX * fix: toggle oauth scope checkboxes from component state, not the reverted input Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Kv72vdCDggCZEjJSmNCwnX * fix: keep the legacy gforms default scope so pre-migration accounts still refresh Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Kv72vdCDggCZEjJSmNCwnX --------- Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
115 lines
3.1 KiB
Svelte
115 lines
3.1 KiB
Svelte
<script lang="ts">
|
|
import { Button } from './common'
|
|
import TextInput from './text_input/TextInput.svelte'
|
|
import Checkbox from './common/checkbox/Checkbox.svelte'
|
|
import { Minus, Plus } from 'lucide-svelte'
|
|
|
|
interface Props {
|
|
scopes?: string[]
|
|
/** Scopes the provider is known to accept, offered as checkboxes. Anything
|
|
* not in this list stays editable as free text below them. */
|
|
options?: string[]
|
|
}
|
|
|
|
let { scopes = $bindable(), options = [] }: Props = $props()
|
|
|
|
// Ticked options and free-text rows are kept apart from `scopes` (the only
|
|
// value the parent binds) so a row can pass through an option's exact value
|
|
// while typing (`…/calendar` on the way to `…/calendar.acls`) without ticking
|
|
// or unticking anything. `lastWritten` tells a parent-side reset apart from
|
|
// the echo of our own write.
|
|
let ticked: string[] = $state([])
|
|
let custom: string[] = $state([])
|
|
let lastWritten: string | undefined = undefined
|
|
|
|
$effect.pre(() => {
|
|
if (!scopes) {
|
|
scopes = []
|
|
}
|
|
const json = JSON.stringify([scopes, options])
|
|
if (json != lastWritten) {
|
|
lastWritten = json
|
|
ticked = scopes.filter((v) => options.includes(v))
|
|
custom = scopes.filter((v) => !options.includes(v))
|
|
}
|
|
})
|
|
|
|
function write(nextTicked: string[], rows: string[]) {
|
|
ticked = nextTicked
|
|
custom = rows
|
|
scopes = [...nextTicked.filter((o) => !rows.includes(o)), ...rows]
|
|
lastWritten = JSON.stringify([scopes, options])
|
|
}
|
|
|
|
// Ticking an option absorbs a free-text row holding the same value. The
|
|
// target state comes from `ticked`, not the DOM: `Checkbox` re-asserts its
|
|
// `checked` prop on every click, so the input already reads the old value
|
|
// again by the time `change` fires.
|
|
function toggle(option: string, on: boolean) {
|
|
const rest = ticked.filter((o) => o != option)
|
|
write(on ? [...rest, option] : rest, on ? custom.filter((r) => r != option) : custom)
|
|
}
|
|
|
|
function setRow(i: number, value: string) {
|
|
const rows = [...custom]
|
|
rows[i] = value
|
|
write(ticked, rows)
|
|
}
|
|
</script>
|
|
|
|
{#if options.length > 0}
|
|
<div class="flex flex-col gap-1 mb-2">
|
|
{#each options as option (option)}
|
|
<label class="flex items-center gap-2 text-xs">
|
|
<Checkbox
|
|
checked={ticked.includes(option)}
|
|
onChange={() => toggle(option, !ticked.includes(option))}
|
|
/>
|
|
<span class="font-mono break-all">{option}</span>
|
|
</label>
|
|
{/each}
|
|
</div>
|
|
<span class="text-xs text-secondary">Custom scopes</span>
|
|
{/if}
|
|
|
|
{#each custom as v, i (i)}
|
|
<div class="flex flex-row max-w-md mb-2">
|
|
<TextInput
|
|
value={v}
|
|
size="sm"
|
|
inputProps={{ oninput: (e) => setRow(i, e.currentTarget.value) }}
|
|
/>
|
|
<Button
|
|
variant="default"
|
|
unifiedSize="sm"
|
|
btnClasses="mx-6"
|
|
onclick={() => {
|
|
write(
|
|
ticked,
|
|
custom.filter((_, j) => j != i)
|
|
)
|
|
}}
|
|
startIcon={{ icon: Minus }}
|
|
iconOnly
|
|
/>
|
|
</div>
|
|
{/each}
|
|
|
|
<div class="flex items-center mt-1">
|
|
<Button
|
|
variant="default"
|
|
unifiedSize="sm"
|
|
startIcon={{ icon: Plus }}
|
|
onclick={() => {
|
|
write(ticked, [...custom, ''])
|
|
}}
|
|
>
|
|
Add item
|
|
</Button>
|
|
{#if custom.length > 0}
|
|
<span class="ml-2 text-xs text-primary font-normal">
|
|
({custom.length} item{custom.length > 1 ? 's' : ''})
|
|
</span>
|
|
{/if}
|
|
</div>
|