some reactive changes
This commit is contained in:
@@ -139,7 +139,7 @@
|
||||
$: inputCat = computeInputCat(type, format, itemsType?.type, enum_, contentEncoding)
|
||||
</script>
|
||||
|
||||
<div class="flex flex-col w-full">
|
||||
<div class="flex flex-col w-full mb-2">
|
||||
<div>
|
||||
{#if displayHeader}
|
||||
<FieldHeader {label} {required} {type} {contentEncoding} {format} {itemsType} />
|
||||
@@ -183,13 +183,18 @@
|
||||
{/if}
|
||||
|
||||
<div class="grid grid-cols-2">
|
||||
<div class="text-sm italic pb-1">
|
||||
{description}
|
||||
</div>
|
||||
<div class="text-right text-xs {error === '' ? 'text-white' : 'font-bold text-red-600'}">
|
||||
{error === '' ? '...' : error}
|
||||
</div>
|
||||
{#if description || error}
|
||||
<div class="text-sm italic pb-1">
|
||||
{description}
|
||||
</div>
|
||||
<div class="text-right text-xs {error === '' ? 'text-white' : 'font-bold text-red-600'}">
|
||||
{error === '' ? '...' : error}
|
||||
</div>
|
||||
{:else}
|
||||
<div class="mt-1" />
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<div class="flex space-x-1">
|
||||
{#if inputCat == 'number'}
|
||||
<input
|
||||
|
||||
@@ -224,7 +224,7 @@
|
||||
<div class={`relative h-screen w-1/3 ${previewOpen ? '' : 'hidden'}`}>
|
||||
<div class="absolute top-0 h-full">
|
||||
{#if $flowStore && step === 1}
|
||||
<div class="fixed border-l-2 right-0 h-screen w-1/3">
|
||||
<div class="fixed border-l-2 right-0 h-screen w-1/2 sm:w-1/3">
|
||||
<FlowPreviewContent
|
||||
bind:args={scheduleArgs}
|
||||
on:close={() => (previewOpen = !previewOpen)}
|
||||
|
||||
@@ -90,7 +90,7 @@
|
||||
</script>
|
||||
|
||||
{#if arg != undefined}
|
||||
<div class="flex justify-between items-center">
|
||||
<div class="flex justify-between items-center mb-2">
|
||||
<div class="flex items-center">
|
||||
<FieldHeader
|
||||
label={argName}
|
||||
|
||||
@@ -58,8 +58,8 @@
|
||||
$: value && valueToPath()
|
||||
</script>
|
||||
|
||||
<div class="flex flex-row w-full gap-2">
|
||||
<div class="shrink w-40">
|
||||
<div class="flex flex-row w-full flex-wrap gap-x-2">
|
||||
<div class="shrink">
|
||||
<RadioButton
|
||||
options={[
|
||||
[`Resource (${resourceTypeName})`, 'resource'],
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
{#each options as [label, val]}
|
||||
<label
|
||||
class:item-button-selected={val == value}
|
||||
class="item-button text-center text-sm h-full p-2 grow"
|
||||
class="item-button text-center text-sm h-full p-2 grow whitespace-nowrap"
|
||||
>
|
||||
<input
|
||||
type="radio"
|
||||
@@ -26,7 +26,9 @@
|
||||
on:click={() => dispatch('change', val)}
|
||||
/>
|
||||
<p>
|
||||
{#if typeof label !== 'string'}{label.title} <Tooltip>{label.desc}</Tooltip>
|
||||
{#if typeof label !== 'string'}
|
||||
{label.title}
|
||||
<Tooltip>{label.desc}</Tooltip>
|
||||
{:else}{label}{/if}
|
||||
</p>
|
||||
</label>
|
||||
|
||||
@@ -138,7 +138,7 @@
|
||||
</script>
|
||||
|
||||
<div class="flex flex-col">
|
||||
<div class="flex justify-between">
|
||||
<div class="flex justify-between gap-x-2">
|
||||
<Button
|
||||
on:click={() => {
|
||||
modalProperty = Object.assign({}, DEFAULT_PROPERTY)
|
||||
|
||||
@@ -166,12 +166,13 @@
|
||||
right: 'enabled'
|
||||
}}
|
||||
/>
|
||||
<div class="p-2 mt-2 rounded" class:bg-gray-300={!scheduleEnabled}>
|
||||
<div class="p-2 my-2 rounded" class:bg-gray-300={!scheduleEnabled}>
|
||||
{#if !scheduleEnabled}
|
||||
<span class="font-black">No next scheduled run when disabled</span>
|
||||
{/if}
|
||||
<CronInput bind:schedule={scheduleCron} />
|
||||
</div>
|
||||
|
||||
<SchemaForm schema={$flowStore.schema} bind:args={scheduleArgs} />
|
||||
</CollapseLink>
|
||||
{/if}
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
sendUserToast(`Invitation to ${workspace_id} accepted as ${username}`)
|
||||
usersWorkspaceStore.set(await WorkspaceService.listUserWorkspaces())
|
||||
workspaceStore.set(workspace_id)
|
||||
goto('/scripts')
|
||||
goto($page.url.searchParams.get('rd') ?? '/scripts')
|
||||
}
|
||||
|
||||
async function validateName(username: string): Promise<void> {
|
||||
|
||||
@@ -9,6 +9,8 @@
|
||||
import { usersWorkspaceStore, workspaceStore } from '$lib/stores'
|
||||
import CenteredModal from '$lib/components/CenteredModal.svelte'
|
||||
|
||||
const rd = $page.url.searchParams.get('rd')
|
||||
|
||||
let id = ''
|
||||
let name = ''
|
||||
let username = ''
|
||||
@@ -53,7 +55,7 @@
|
||||
sendUserToast(`Successfully created workspace id: ${id}`)
|
||||
usersWorkspaceStore.set(await WorkspaceService.listUserWorkspaces())
|
||||
workspaceStore.set(id)
|
||||
goto('/')
|
||||
goto(rd ?? '/')
|
||||
}
|
||||
|
||||
function handleKeyUp(event: KeyboardEvent) {
|
||||
|
||||
@@ -49,11 +49,7 @@
|
||||
|
||||
function redirectUser() {
|
||||
if ($workspaceStore) {
|
||||
if (rd) {
|
||||
goto(decodeURI(rd))
|
||||
} else {
|
||||
goto('/')
|
||||
}
|
||||
goto(rd ?? '/')
|
||||
} else {
|
||||
goto('/user/workspaces')
|
||||
}
|
||||
|
||||
@@ -17,7 +17,9 @@
|
||||
|
||||
onMount(async () => {
|
||||
const rd = localStorage.getItem('rd')
|
||||
localStorage.removeItem('rd')
|
||||
if (rd) {
|
||||
localStorage.removeItem('rd')
|
||||
}
|
||||
if (error) {
|
||||
sendUserToast(`Error trying to login with ${clientName} ${error}`, true)
|
||||
goto('/user/login')
|
||||
@@ -31,11 +33,7 @@
|
||||
}
|
||||
if ($workspaceStore) {
|
||||
$userStore = await getUserExt($workspaceStore)
|
||||
if (rd) {
|
||||
goto(rd)
|
||||
} else {
|
||||
goto('/')
|
||||
}
|
||||
goto(rd ?? '/')
|
||||
} else {
|
||||
if (rd) {
|
||||
goto('/user/workspaces?rd=' + encodeURIComponent(rd))
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
let invites: WorkspaceInvite[] = []
|
||||
let list_all_as_super_admin: boolean = false
|
||||
let workspaces: { id: string; name: string; username: string }[] = []
|
||||
const rd = $page.url.searchParams.get('rd')
|
||||
|
||||
async function loadInvites() {
|
||||
try {
|
||||
@@ -98,7 +99,7 @@
|
||||
"
|
||||
on:click={() => {
|
||||
workspaceStore.set(workspace.id)
|
||||
goto($page.url.searchParams.get('rd') ?? '/scripts')
|
||||
goto(rd ?? '/scripts')
|
||||
}}
|
||||
><span class="font-mono">{workspace.id}</span> - {workspace.name} as
|
||||
<span class="font-mono">{workspace.username}</span>
|
||||
@@ -106,7 +107,11 @@
|
||||
</label>
|
||||
{/each}
|
||||
<div class="flex flex-row-reverse pt-4">
|
||||
<a href="/user/create_workspace" class="primary-button">Create a new workspace → </a>
|
||||
<a
|
||||
href="/user/create_workspace{rd ? `?rd=${encodeURIComponent(rd)}` : ''}"
|
||||
class="primary-button"
|
||||
>Create a new workspace →
|
||||
</a>
|
||||
</div>
|
||||
<h2 class="my-2">Invitations</h2>
|
||||
<p class="text-xs mb-2 italic text-gray-500">Join a workspace</p>
|
||||
@@ -140,7 +145,11 @@
|
||||
{/if}
|
||||
</span>
|
||||
<span>
|
||||
<a href="/user/accept_invite?workspace={encodeURIComponent(invite.workspace_id)}">
|
||||
<a
|
||||
href="/user/accept_invite?workspace={encodeURIComponent(invite.workspace_id)}{rd
|
||||
? `&rd=${encodeURIComponent(rd)}`
|
||||
: ''}"
|
||||
>
|
||||
accept
|
||||
</a>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user