Refactor FieldSelector to not use BindableSlot (#11942)

packages/builder/src/components/automation/SetupPanel/RowSelector.svelte

@@ -3,6 +3,8 @@
   import { Select, Checkbox } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
   import RowSelectorTypes from "./RowSelectorTypes.svelte"
+  import DrawerBindableSlot from "../../common/bindings/DrawerBindableSlot.svelte"
+  import AutomationBindingPanel from "../../common/bindings/ServerBindingPanel.svelte"
 
   const dispatch = createEventDispatcher()
 
@@ -108,6 +110,20 @@
   <div class="schema-fields">
     {#each schemaFields as [field, schema]}
       {#if !schema.autocolumn && schema.type !== "attachment"}
+        <DrawerBindableSlot
+          fillWidth
+          title={value.title}
+          label={field}
+          panel={AutomationBindingPanel}
+          type={schema.type}
+          {schema}
+          value={value[field]}
+          on:change={e => onChange(e, field)}
+          {bindings}
+          allowJS={true}
+          updateOnChange={false}
+          drawerLeft="260px"
+        >
           <RowSelectorTypes
             {isTestModal}
             {field}
@@ -116,6 +132,7 @@
             {value}
             {onChange}
           />
+        </DrawerBindableSlot>
       {/if}
       {#if isUpdateRow && schema.type === "link"}
         <div class="checkbox-field">

packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte

@@ -8,7 +8,6 @@
   } from "@budibase/bbui"
   import LinkedRowSelector from "components/common/LinkedRowSelector.svelte"
   import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte"
-  import DrawerBindableSlot from "../../common/bindings/DrawerBindableSlot.svelte"
   import ModalBindableInput from "../../common/bindings/ModalBindableInput.svelte"
   import AutomationBindingPanel from "../../common/bindings/ServerBindingPanel.svelte"
   import Editor from "components/integration/QueryEditor.svelte"
@@ -31,34 +30,20 @@
   }
 </script>
 
-<DrawerBindableSlot
+{#if schemaHasOptions(schema) && schema.type !== "array"}
-  fillWidth
-  title={value.title}
-  label={field}
-  panel={AutomationBindingPanel}
-  type={schema.type}
-  {schema}
-  value={value[field]}
-  on:change={e => onChange(e, field)}
-  {bindings}
-  allowJS={true}
-  updateOnChange={false}
-  drawerLeft="260px"
->
-  {#if schemaHasOptions(schema) && schema.type !== "array"}
   <Select
     on:change={e => onChange(e, field)}
     label={field}
     value={value[field]}
     options={schema.constraints.inclusion}
   />
-  {:else if schema.type === "datetime"}
+{:else if schema.type === "datetime"}
   <DatePicker
     label={field}
     value={value[field]}
     on:change={e => onChange(e, field)}
   />
-  {:else if schema.type === "boolean"}
+{:else if schema.type === "boolean"}
   <Select
     on:change={e => onChange(e, field)}
     label={field}
@@ -68,20 +53,20 @@
       { label: "False", value: "false" },
     ]}
   />
-  {:else if schema.type === "array"}
+{:else if schema.type === "array"}
   <Multiselect
     bind:value={value[field]}
     label={field}
     options={schema.constraints.inclusion}
     on:change={e => onChange(e, field)}
   />
-  {:else if schema.type === "longform"}
+{:else if schema.type === "longform"}
   <TextArea
     label={field}
     bind:value={value[field]}
     on:change={e => onChange(e, field)}
   />
-  {:else if schema.type === "json"}
+{:else if schema.type === "json"}
   <span>
     <Label>{field}</Label>
     <Editor
@@ -95,13 +80,13 @@
       value={value[field]}
     />
   </span>
-  {:else if schema.type === "link"}
+{:else if schema.type === "link"}
   <LinkedRowSelector
     bind:linkedRows={value[field]}
     {schema}
     on:change={e => onChange(e, field)}
   />
-  {:else if schema.type === "string" || schema.type === "number"}
+{:else if schema.type === "string" || schema.type === "number"}
   <svelte:component
     this={isTestModal ? ModalBindableInput : DrawerBindableInput}
     panel={AutomationBindingPanel}
@@ -114,5 +99,4 @@
     allowJS={true}
     updateOnChange={false}
   />
-  {/if}
+{/if}
-</DrawerBindableSlot>