diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte index 8760272043..d4027ee90a 100644 --- a/packages/builder/src/components/common/bindings/BindingPanel.svelte +++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte @@ -27,7 +27,6 @@ } from "../CodeEditor" import BindingSidePanel from "./BindingSidePanel.svelte" import EvaluationSidePanel from "./EvaluationSidePanel.svelte" - import SnippetSidePanel from "./SnippetSidePanel.svelte" import { BindingHelpers } from "./utils" import { capitalise } from "@/helpers" import { Utils, JsonFormatter } from "@budibase/frontend-core" @@ -74,22 +73,15 @@ const enum SidePanel { Bindings = "Bindings", Evaluation = "Evaluation", - Snippets = "Snippets", } const SidePanelIcons: Record = { Bindings: "FlashOn", Evaluation: "Play", - Snippets: "Code", } $: useSnippets = allowSnippets && !$licensing.isFreePlan $: editorModeOptions = getModeOptions(allowHBS, allowJS) - $: sidePanelOptions = getSidePanelOptions( - bindings, - context, - allowSnippets, - mode - ) + $: sidePanelOptions = getSidePanelOptions(bindings, context) $: enrichedBindings = enrichBindings(bindings, context, snippets) $: usingJS = mode === BindingMode.JavaScript $: editorMode = @@ -148,12 +140,7 @@ return options } - const getSidePanelOptions = ( - bindings: EnrichedBinding[], - context: any, - useSnippets: boolean, - mode: BindingMode | null - ) => { + const getSidePanelOptions = (bindings: EnrichedBinding[], context: any) => { let options = [] if (bindings?.length) { options.push(SidePanel.Bindings) @@ -161,9 +148,6 @@ if (context && Object.keys(context).length > 0) { options.push(SidePanel.Evaluation) } - if (useSnippets && mode === BindingMode.JavaScript) { - options.push(SidePanel.Snippets) - } return options } @@ -446,8 +430,6 @@ {evaluating} expression={editorValue ? editorValue : ""} /> - {:else if sidePanel === SidePanel.Snippets} - {/if} diff --git a/packages/builder/src/components/common/bindings/SnippetSidePanel.svelte b/packages/builder/src/components/common/bindings/SnippetSidePanel.svelte deleted file mode 100644 index 95f40005c0..0000000000 --- a/packages/builder/src/components/common/bindings/SnippetSidePanel.svelte +++ /dev/null @@ -1,278 +0,0 @@ - - - - -
- -
- {#if enableSnippets} - {#if searching} -
- -
- - {:else} -
Snippets
- - - {/if} - {:else} -
- Snippets - - Premium - -
- {/if} -
-
- {#if enableSnippets && filteredSnippets?.length} - {#each filteredSnippets as snippet} -
showSnippet(snippet, e.target)} - on:mouseleave={hidePopover} - on:click={() => addSnippet(snippet)} - > - {snippet.name} - editSnippet(e, snippet)} - /> -
- {/each} - {:else} -
- - Snippets let you create reusable JS functions and values that can - all be managed in one place - - {#if enableSnippets} - - {:else} - - {/if} -
- {/if} -
-
-
- - -
- {#key hoveredSnippet} - - {/key} -
-
- - - - diff --git a/packages/builder/src/components/common/bindings/index.js b/packages/builder/src/components/common/bindings/index.js index a2d4479959..5a9c6f661b 100644 --- a/packages/builder/src/components/common/bindings/index.js +++ b/packages/builder/src/components/common/bindings/index.js @@ -8,5 +8,3 @@ export { default as DrawerBindableSlot } from "./DrawerBindableSlot.svelte" export { default as EvaluationSidePanel } from "./EvaluationSidePanel.svelte" export { default as ModalBindableInput } from "./ModalBindableInput.svelte" export { default as ServerBindingPanel } from "./ServerBindingPanel.svelte" -export { default as SnippetDrawer } from "./SnippetDrawer.svelte" -export { default as SnippetSidePanel } from "./SnippetSidePanel.svelte" diff --git a/packages/builder/src/components/common/bindings/snippets/SidePanelContent.svelte b/packages/builder/src/components/common/bindings/snippets/SidePanelContent.svelte index b83d9323b7..7ddecf23c7 100644 --- a/packages/builder/src/components/common/bindings/snippets/SidePanelContent.svelte +++ b/packages/builder/src/components/common/bindings/snippets/SidePanelContent.svelte @@ -2,7 +2,7 @@ import { Icon, Popover, Body, Button } from "@budibase/bbui" import CodeEditor from "@/components/common/CodeEditor/CodeEditor.svelte" import { EditorModes } from "@/components/common/CodeEditor" - import SnippetDrawer from "../SnippetDrawer.svelte" + import SnippetDrawer from "./SnippetDrawer.svelte" import { licensing } from "@/stores/portal" import UpgradeButton from "@/pages/builder/portal/_components/UpgradeButton.svelte" import type { Snippet } from "@budibase/types" diff --git a/packages/builder/src/components/common/bindings/snippets/SidePanelHeader.svelte b/packages/builder/src/components/common/bindings/snippets/SidePanelHeader.svelte index b62282299b..e278e5a72b 100644 --- a/packages/builder/src/components/common/bindings/snippets/SidePanelHeader.svelte +++ b/packages/builder/src/components/common/bindings/snippets/SidePanelHeader.svelte @@ -1,7 +1,7 @@