From a0d67cb88858afa95e0148754225ce3763da953a Mon Sep 17 00:00:00 2001 From: Anna No Date: Fri, 15 Apr 2022 14:19:01 +0700 Subject: [PATCH] Fix merge conflicts (#1409) Signed-off-by: Anna No --- .../src/components/editor/CardActions.svelte | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/plugins/board-resources/src/components/editor/CardActions.svelte b/plugins/board-resources/src/components/editor/CardActions.svelte index 687c554f52..c507794029 100644 --- a/plugins/board-resources/src/components/editor/CardActions.svelte +++ b/plugins/board-resources/src/components/editor/CardActions.svelte @@ -27,14 +27,13 @@ export let value: Card const client = getClient() - const suggestedActions: CardAction[] = [] - const addToCardActions: CardAction[] = [] - const automationActions: CardAction[] = [] - const actions: CardAction[] = [] - let actionGroups: { label: IntlString; actions: CardAction[] }[] = [] async function fetch() { + const suggestedActions: CardAction[] = [] + const addToCardActions: CardAction[] = [] + const automationActions: CardAction[] = [] + const actions: CardAction[] = [] const result = await getCardActions(client) for (const action of result) { let supported = true @@ -77,7 +76,11 @@ ] } - $: fetch() + fetch() + $: value.members && fetch() + $: value.isArchived && fetch() + $: !value.isArchived && fetch() + {#if value}