mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-09-06 08:01:35 +00:00
fix(ui): workers button on navbar require a single click only
This commit is contained in:
@@ -1,24 +1,11 @@
|
||||
<script lang="ts">
|
||||
import { melt, type MenubarBuilders } from '@melt-ui/svelte'
|
||||
|
||||
interface Props {
|
||||
createMenu: MenubarBuilders['createMenu']
|
||||
triggr?: import('svelte').Snippet<[any]>
|
||||
children?: import('svelte').Snippet<[any]>
|
||||
}
|
||||
|
||||
let { createMenu, triggr, children }: Props = $props()
|
||||
|
||||
const menu = createMenu()
|
||||
|
||||
const {
|
||||
elements: { trigger, item, menu: menuElement }
|
||||
} = menu
|
||||
let { children }: Props = $props()
|
||||
</script>
|
||||
|
||||
<div class="hover:z-50 flex w-full h-8">
|
||||
{@render triggr?.({ trigger })}
|
||||
<div use:melt={$menuElement}>
|
||||
{@render children?.({ item })}
|
||||
</div>
|
||||
{@render children?.({})}
|
||||
</div>
|
||||
|
||||
@@ -359,7 +359,7 @@
|
||||
}
|
||||
]
|
||||
: []),
|
||||
...($workspaceStore?.startsWith("wm-fork")
|
||||
...($workspaceStore?.startsWith('wm-fork')
|
||||
? [
|
||||
{
|
||||
label: 'Delete Forked Workspace',
|
||||
@@ -370,7 +370,7 @@
|
||||
faIcon: undefined
|
||||
}
|
||||
]
|
||||
: []),
|
||||
: [])
|
||||
],
|
||||
disabled: $userStore?.operator
|
||||
},
|
||||
@@ -573,11 +573,6 @@
|
||||
</Menu>
|
||||
{:else}
|
||||
<MenuSingleItem {createMenu}>
|
||||
{#snippet triggr({ trigger })}
|
||||
<div class="w-full">
|
||||
<MenuButton class="!text-2xs" {...menuLink} {isCollapsed} {trigger} />
|
||||
</div>
|
||||
{/snippet}
|
||||
{#snippet children({ item })}
|
||||
<MenuLink class="!text-2xs" {...menuLink} {isCollapsed} {item} />
|
||||
{/snippet}
|
||||
@@ -665,20 +660,20 @@
|
||||
</div>
|
||||
</ConfirmationModal>
|
||||
|
||||
{#if $workspaceStore?.startsWith("wm-fork-")}
|
||||
<ConfirmationModal
|
||||
open={deleteWorkspaceForkModal}
|
||||
title="Delete forked workspace"
|
||||
confirmationText="Remove"
|
||||
on:canceled={() => {
|
||||
deleteWorkspaceForkModal = false
|
||||
}}
|
||||
on:confirmed={() => {
|
||||
deleteFork()
|
||||
}}
|
||||
>
|
||||
<div class="flex flex-col w-full space-y-4">
|
||||
<span>Are you sure you want to delete this workspace fork? (deleting {$workspaceStore})</span>
|
||||
</div>
|
||||
</ConfirmationModal>
|
||||
{#if $workspaceStore?.startsWith('wm-fork-')}
|
||||
<ConfirmationModal
|
||||
open={deleteWorkspaceForkModal}
|
||||
title="Delete forked workspace"
|
||||
confirmationText="Remove"
|
||||
on:canceled={() => {
|
||||
deleteWorkspaceForkModal = false
|
||||
}}
|
||||
on:confirmed={() => {
|
||||
deleteFork()
|
||||
}}
|
||||
>
|
||||
<div class="flex flex-col w-full space-y-4">
|
||||
<span>Are you sure you want to delete this workspace fork? (deleting {$workspaceStore})</span>
|
||||
</div>
|
||||
</ConfirmationModal>
|
||||
{/if}
|
||||
|
||||
Reference in New Issue
Block a user