@budibase/frontend-core 3.38.5 → 3.39.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "3.38.5",
+  "version": "3.39.15",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
@@ -21,7 +21,7 @@
     "socket.io-client": "^4.7.5"
   },
   "devDependencies": {
-    "vitest": "^3.2.4"
+    "vitest": "^4.1.0"
   },
-  "gitHead": "5795ec6c95812463cba1d8cede8295f6c2b915cb"
+  "gitHead": "e409b00d4727dd9f3c5ba22401aa3d0d8c062cba"
 }

package/src/api/agents.ts

@@ -7,6 +7,7 @@ import {
   DisconnectAgentSharePointSiteResponse,
   DuplicateAgentResponse,
   FetchAgentKnowledgeResponse,
+  FetchAgentFileUrlResponse,
   FetchAgentKnowledgeSourceEntriesResponse,
   FetchAgentKnowledgeSourceOptionsResponse,
   FetchAgentsResponse,
@@ -79,6 +80,10 @@ export interface AgentEndpoints {
     agentId: string,
     fileId: string
   ) => Promise<{ deleted: true }>
+  fetchAgentFileUrl: (
+    agentId: string,
+    fileId: string
+  ) => Promise<FetchAgentFileUrlResponse>
   fetchAgentKnowledgeSourceOptions: (
     datasourceId: string,
     authConfigId: string
@@ -104,6 +109,7 @@ export interface AgentEndpoints {
     agentId: string,
     sourceId: string
   ) => Promise<SyncAgentKnowledgeSourcesResponse>
+  resetAgentKnowledgeBaseStore: (agentId: string) => Promise<void>
 }
 
 export const buildAgentEndpoints = (API: BaseAPIClient): AgentEndpoints => ({
@@ -249,6 +255,12 @@ export const buildAgentEndpoints = (API: BaseAPIClient): AgentEndpoints => ({
     })
   },
 
+  fetchAgentFileUrl: async (agentId: string, fileId: string) => {
+    return await API.get<FetchAgentFileUrlResponse>({
+      url: `/api/agent/${agentId}/files/${fileId}/url`,
+    })
+  },
+
   fetchAgentKnowledgeSourceOptions: async (
     datasourceId: string,
     authConfigId: string
@@ -302,4 +314,10 @@ export const buildAgentEndpoints = (API: BaseAPIClient): AgentEndpoints => ({
       url: `/api/agent/${agentId}/knowledge-sources/${encodeURIComponent(sourceId)}/sync`,
     })
   },
+
+  resetAgentKnowledgeBaseStore: async (agentId: string) => {
+    await API.post({
+      url: `/api/agent/${agentId}/knowledge/store/reset`,
+    })
+  },
 })

package/src/api/automations.ts

@@ -10,6 +10,8 @@ import {
   SearchAutomationLogsResponse,
   TestAutomationRequest,
   TestAutomationResponse,
+  TestEmailConnectionRequest,
+  TestEmailConnectionResponse,
   TestProgressState,
   TriggerAutomationRequest,
   TriggerAutomationResponse,
@@ -44,6 +46,9 @@ export interface AutomationEndpoints {
     data: TestAutomationRequest,
     options?: { async?: boolean }
   ) => Promise<TestAutomationResponse>
+  testEmailConnection: (
+    data: TestEmailConnectionRequest
+  ) => Promise<TestEmailConnectionResponse>
   getAutomationTestStatus: (automationId: string) => Promise<TestProgressState>
   getAutomationDefinitions: () => Promise<GetAutomationStepDefinitionsResponse>
   getAutomationLogs: (
@@ -91,6 +96,16 @@ export const buildAutomationEndpoints = (
     })
   },
 
+  testEmailConnection: async data => {
+    return await API.post<
+      TestEmailConnectionRequest,
+      TestEmailConnectionResponse
+    >({
+      url: "/api/automations/email/test-connection",
+      body: data,
+    })
+  },
+
   /**
    * Gets a list of all automations.
    */

package/src/api/chatApps.ts

@@ -10,6 +10,7 @@ import {
   FetchPublishedChatAppsResponse,
   UpdateChatAppRequest,
   AgentMessageMetadata,
+  FetchAgentFileUrlResponse,
 } from "@budibase/types"
 import { Header } from "@budibase/shared-core"
 import { BaseAPIClient } from "./types"
@@ -38,6 +39,11 @@ export interface ChatAppEndpoints {
   ) => Promise<FetchAgentHistoryResponse>
   fetchChatApp: (workspaceId?: string) => Promise<ChatApp | null>
   setChatAppAgent: (chatAppId: string, agentId: string) => Promise<ChatAppAgent>
+  fetchChatAppAgentFileUrl: (
+    chatAppId: string,
+    agentId: string,
+    fileId: string
+  ) => Promise<FetchAgentFileUrlResponse>
   createChatConversation: (
     chat: CreateChatConversationRequest,
     workspaceId?: string
@@ -181,6 +187,16 @@ export const buildChatAppEndpoints = (
     })
   },
 
+  fetchChatAppAgentFileUrl: async (
+    chatAppId: string,
+    agentId: string,
+    fileId: string
+  ) => {
+    return await API.get<FetchAgentFileUrlResponse>({
+      url: `/api/chatapps/${chatAppId}/agents/${agentId}/files/${fileId}/url`,
+    })
+  },
+
   createChatConversation: async (
     chat: CreateChatConversationRequest,
     workspaceId?: string

package/src/components/Chatbox/ChatConversationPanel.svelte

@@ -18,6 +18,7 @@
     name?: string
     icon?: string
     iconColor?: string
+    allowKnowledgeSourceDownload?: boolean
   }
 
   export let selectedAgentId: string | null = null
@@ -79,6 +80,10 @@
 
   $: readOnlyReason = getReadOnlyReason(agentAvailability)
 
+  $: allowKnowledgeSourceDownload =
+    enabledAgentList.find(agent => agent.agentId === selectedAgentId)
+      ?.allowKnowledgeSourceDownload !== false
+
   const selectAgent = (agentId: string) => {
     dispatch("agentSelected", { agentId })
   }
@@ -127,6 +132,7 @@
       {workspaceId}
       {conversationStarters}
       {initialPrompt}
+      {allowKnowledgeSourceDownload}
       readOnly={Boolean(readOnlyReason)}
       {readOnlyReason}
       onchatsaved={event => dispatch("chatSaved", event.detail)}

package/src/components/Chatbox/index.svelte

@@ -41,6 +41,7 @@
     isAgentPreviewChat?: boolean
     readOnly?: boolean
     readOnlyReason?: "disabled" | "deleted" | "offline"
+    allowKnowledgeSourceDownload?: boolean
   }
 
   let {
@@ -53,6 +54,7 @@
     isAgentPreviewChat = false,
     readOnly = false,
     readOnlyReason,
+    allowKnowledgeSourceDownload = true,
   }: Props = $props()
 
   let API = $state(
@@ -76,11 +78,51 @@
   let inputValue = $state("")
   let lastInitialPrompt = $state("")
   let isPreparingResponse = $state(false)
-
   const resetPendingResponse = () => {
     isPreparingResponse = false
   }
 
+  const openRagSource = async (
+    source: NonNullable<AgentMessageMetadata["ragSources"]>[number]
+  ) => {
+    if (!allowKnowledgeSourceDownload) {
+      notifications.error("Source downloads are disabled for this agent")
+      return
+    }
+    if (!source.fileId) {
+      return
+    }
+
+    try {
+      const resolvedUrl =
+        !isAgentPreviewChat && chat?.chatAppId && chat?.agentId
+          ? (
+              await API.fetchChatAppAgentFileUrl(
+                chat.chatAppId,
+                chat.agentId,
+                source.fileId
+              )
+            ).url
+          : chat?.agentId
+            ? (await API.fetchAgentFileUrl(chat.agentId, source.fileId)).url
+            : undefined
+      if (!resolvedUrl) {
+        notifications.error("Could not resolve source file URL")
+        return
+      }
+
+      const link = document.createElement("a")
+      link.href = resolvedUrl
+      link.download = source.filename || "source.pdf"
+      link.target = "_blank"
+      link.rel = "noopener noreferrer"
+      link.click()
+    } catch (error) {
+      console.error("Failed to resolve knowledge source URL", error)
+      notifications.error("Failed to download source file")
+    }
+  }
+
   const getReasoningText = (message: UIMessage<AgentMessageMetadata>) =>
     (message.parts ?? [])
       .filter(isReasoningUIPart)
@@ -112,7 +154,32 @@
       return true
     }
 
-    return Boolean(message.metadata?.ragSources?.length)
+    return Boolean(getVisibleRagSources(message).length)
+  }
+
+  const getVisibleRagSources = (message: UIMessage<AgentMessageMetadata>) => {
+    const ragSources = message.metadata?.ragSources || []
+    const uniqueByFileId = new Set<string>()
+    const visible: NonNullable<AgentMessageMetadata["ragSources"]> = []
+
+    for (const source of ragSources) {
+      const filename = source.filename?.trim()
+      if (!source.fileId || !filename) {
+        continue
+      }
+
+      if (uniqueByFileId.has(source.fileId)) {
+        continue
+      }
+
+      uniqueByFileId.add(source.fileId)
+      visible.push({
+        ...source,
+        filename,
+      })
+    }
+
+    return visible
   }
 
   const hasToolError = (message: UIMessage<AgentMessageMetadata>) =>
@@ -691,7 +758,7 @@
                 </div>
               {/if}
             {/each}
-            {#if message.metadata?.ragSources?.length}
+            {#if getVisibleRagSources(message).length}
               <div class="sources">
                 <div class="sources-header">
                   <span class="sources-icon">
@@ -704,11 +771,19 @@
                   <span class="sources-title">Sources</span>
                 </div>
                 <ul>
-                  {#each message.metadata.ragSources as source (source.sourceId)}
+                  {#each getVisibleRagSources(message) as source (source.fileId)}
                     <li class="source-item">
-                      <span class="source-name"
-                        >{source.filename || source.sourceId}</span
-                      >
+                      {#if allowKnowledgeSourceDownload}
+                        <button
+                          type="button"
+                          class="source-link"
+                          onclick={() => openRagSource(source)}
+                        >
+                          {source.filename}
+                        </button>
+                      {:else}
+                        <span class="source-name">{source.filename}</span>
+                      {/if}
                     </li>
                   {/each}
                 </ul>
@@ -1202,4 +1277,16 @@
   .source-name {
     font-weight: 400;
   }
+
+  .source-link {
+    border: none;
+    background: transparent;
+    padding: 0;
+    margin: 0;
+    font-weight: 400;
+    color: var(--spectrum-global-color-blue-700);
+    text-decoration: underline;
+    cursor: pointer;
+    text-align: left;
+  }
 </style>

package/src/components/CoreFilterBuilder.svelte

@@ -16,7 +16,6 @@
   import { QueryUtils, Constants } from "@budibase/frontend-core"
   import { getContext, createEventDispatcher } from "svelte"
   import FilterField from "./FilterField.svelte"
-  import ConditionField from "./ConditionField.svelte"
   import { utils } from "@budibase/shared-core"
 
   const dispatch = createEventDispatcher()
@@ -35,8 +34,12 @@
   export let behaviourFilters = false
   export let allowBindings = false
   export let allowOnEmpty = true
-  export let builderType = "filter"
   export let docsURL = "https://docs.budibase.com/docs/searchfilter-data"
+  export let prefix = "Show data which matches"
+  export let filterTypeLabel = "filter"
+  export let drawerTitle = null
+  export let bindingValueType = Constants.FilterValueType.BINDING
+  export let useConditionValueControls = false
 
   export let bindings
   export let panel
@@ -57,10 +60,6 @@
       schemaFields = [...schemaFields, { name: "_id", type: "string" }]
     }
   }
-  $: prefix =
-    builderType === "filter"
-      ? "Show data which matches"
-      : "Run branch when matching"
 
   // We still may need to migrate this even though the backend does it automatically now
   // for query definitions. This is because we might be editing saved filter definitions
@@ -111,17 +110,9 @@
   }
 
   const getValidOperatorsForType = filter => {
-    if (builderType === "condition") {
-      return [OperatorOptions.Equals, OperatorOptions.NotEquals]
-    }
-
-    if (!filter?.field && !filter?.name) {
-      return []
-    }
-
     return QueryUtils.getValidOperatorsForType(
-      filter,
-      filter.field || filter.name,
+      filter?.type ? filter : { ...filter, type: FieldType.STRING },
+      filter?.field || filter?.name,
       datasource
     )
   }
@@ -234,9 +225,6 @@
       } else if (addFilter) {
         targetGroup.filters.push({
           valueType: FilterValueType.VALUE,
-          ...(builderType === "condition"
-            ? { operator: OperatorOptions.Equals.value, type: FieldType.STRING }
-            : {}),
         })
       } else if (group) {
         editable.groups[groupIdx] = {
@@ -257,11 +245,6 @@
         filters: [
           {
             valueType: FilterValueType.VALUE,
-            ...(builderType === "condition"
-              ? {
-                  operator: OperatorOptions.Equals.value,
-                }
-              : {}),
           },
         ],
       })
@@ -307,7 +290,7 @@
               popoverAutoWidth
             />
           </span>
-          <span>of the following {builderType} groups:</span>
+          <span>of the following {filterTypeLabel} groups:</span>
         </div>
       {/if}
       {#if editableFilters?.groups?.length}
@@ -337,7 +320,7 @@
                       popoverAutoWidth
                     />
                   </span>
-                  <span>of the following {builderType}s are matched:</span>
+                  <span>of the following {filterTypeLabel}s are matched:</span>
                 </div>
                 <div class="group-actions">
                   <Icon
@@ -367,8 +350,22 @@
 
               <div class="filters">
                 {#each group.filters as filter, filterIdx}
-                  <div class="filter">
-                    {#if builderType === "filter"}
+                  <div
+                    class="filter"
+                    class:has-extra-column={!!$$slots["extra-column"]}
+                  >
+                    {#if $$slots["field-column"]}
+                      <slot
+                        name="field-column"
+                        {filter}
+                        {groupIdx}
+                        {filterIdx}
+                        onUpdate={f =>
+                          onFilterFieldUpdate(f, groupIdx, filterIdx)}
+                        {sanitizeOperator}
+                        {sanitizeValue}
+                      />
+                    {:else}
                       <Select
                         value={filter.field}
                         options={fieldOptions}
@@ -380,28 +377,10 @@
                         placeholder="Column"
                         popoverAutoWidth
                       />
-                    {:else}
-                      <ConditionField
-                        placeholder="Value"
-                        {filter}
-                        drawerTitle={"Edit Binding"}
-                        {bindings}
-                        {panel}
-                        {toReadable}
-                        {toRuntime}
-                        {evaluationContext}
-                        on:change={e => {
-                          const updated = {
-                            ...filter,
-                            field: e.detail.field,
-                          }
-                          onFilterFieldUpdate(updated, groupIdx, filterIdx)
-                        }}
-                      />
                     {/if}
                     <Select
-                      value={filter.operator}
-                      disabled={!filter.field && builderType === "filter"}
+                      value={filter.operator || OperatorOptions.Equals.value}
+                      disabled={!filter.field && !$$slots["field-column"]}
                       options={getValidOperatorsForType(filter)}
                       on:change={e => {
                         const updated = { ...filter, operator: e.detail }
@@ -411,33 +390,55 @@
                       placeholder={false}
                       popoverAutoWidth
                     />
-                    <FilterField
-                      placeholder="Value"
-                      disabled={!filter.field && builderType === "filter"}
-                      drawerTitle={builderType === "condition"
-                        ? "Edit binding"
-                        : null}
-                      {allowBindings}
-                      filter={{
-                        ...filter,
-                        ...(builderType === "condition"
-                          ? { type: FieldType.STRING }
-                          : {}),
-                      }}
-                      {schemaFields}
-                      {bindings}
-                      {panel}
-                      {toReadable}
-                      {toRuntime}
-                      {evaluationContext}
-                      on:change={e => {
-                        onFilterFieldUpdate(
-                          { ...filter, ...e.detail },
-                          groupIdx,
-                          filterIdx
-                        )
-                      }}
-                    />
+                    {#if $$slots["extra-column"]}
+                      <slot
+                        name="extra-column"
+                        {filter}
+                        {groupIdx}
+                        {filterIdx}
+                        onUpdate={f =>
+                          onFilterFieldUpdate(f, groupIdx, filterIdx)}
+                        {sanitizeOperator}
+                        {sanitizeValue}
+                      />
+                    {/if}
+                    {#if $$slots["value-column"]}
+                      <slot
+                        name="value-column"
+                        {filter}
+                        {groupIdx}
+                        {filterIdx}
+                        onUpdate={f =>
+                          onFilterFieldUpdate(f, groupIdx, filterIdx)}
+                        {sanitizeOperator}
+                        {sanitizeValue}
+                      />
+                    {:else}
+                      <FilterField
+                        placeholder="Value"
+                        disabled={!filter.field && !$$slots["field-column"]}
+                        {drawerTitle}
+                        {allowBindings}
+                        filter={{
+                          ...filter,
+                        }}
+                        {schemaFields}
+                        {bindings}
+                        {panel}
+                        {toReadable}
+                        {toRuntime}
+                        {evaluationContext}
+                        {bindingValueType}
+                        {useConditionValueControls}
+                        on:change={e => {
+                          onFilterFieldUpdate(
+                            { ...filter, ...e.detail },
+                            groupIdx,
+                            filterIdx
+                          )
+                        }}
+                      />
+                    {/if}
 
                     <ActionButton
                       size="M"
@@ -478,7 +479,7 @@
                   popoverAutoWidth
                 />
               </span>
-              <span>when all {builderType}s are empty</span>
+              <span>when all {filterTypeLabel}s are empty</span>
             </div>
           {/if}
           <div class="add-group">
@@ -492,7 +493,7 @@
                 })
               }}
             >
-              Add {builderType} group
+              Add {filterTypeLabel} group
             </Button>
             {#if docsURL}
               <a href={docsURL} target="_blank">
@@ -563,7 +564,13 @@
   .filter {
     display: grid;
     gap: var(--spacing-l);
-    grid-template-columns: minmax(150px, 1fr) 170px minmax(200px, 1fr) 40px 40px;
+    grid-template-columns: minmax(150px, 1fr) 170px minmax(200px, 1fr) 40px;
+  }
+
+  .filter.has-extra-column {
+    grid-template-columns:
+      minmax(150px, 1fr) 170px 120px minmax(200px, 1fr)
+      40px;
   }
 
   .filters-footer {

package/src/components/FilterField.svelte

@@ -7,6 +7,7 @@
     Icon,
     Drawer,
     Button,
+    Select,
   } from "@budibase/bbui"
 
   import FilterUsers from "./FilterUsers.svelte"
@@ -25,6 +26,8 @@
   export let toReadable
   export let toRuntime
   export let evaluationContext = {}
+  export let bindingValueType = Constants.FilterValueType.BINDING
+  export let useConditionValueControls = false
 
   const dispatch = createEventDispatcher()
   const { OperatorOptions, FilterValueType } = Constants
@@ -60,7 +63,7 @@
   const onConfirmBinding = () => {
     dispatch("change", {
       value: toRuntime ? toRuntime(bindings, drawerValue) : drawerValue,
-      valueType: drawerValue ? FilterValueType.BINDING : FilterValueType.VALUE,
+      valueType: drawerValue ? bindingValueType : FilterValueType.VALUE,
     })
   }
 
@@ -177,7 +180,14 @@
         />
       {:else}
         <div>
-          {#if [FieldType.STRING, FieldType.LONGFORM, FieldType.NUMBER, FieldType.BIGINT, FieldType.FORMULA, FieldType.AI, FieldType.BARCODEQR].includes(filter.type)}
+          {#if filter.type === FieldType.NUMBER && useConditionValueControls}
+            <Input
+              type="number"
+              disabled={filter.noValue}
+              value={readableValue}
+              on:change={onChange}
+            />
+          {:else if [FieldType.STRING, FieldType.LONGFORM, FieldType.NUMBER, FieldType.BIGINT, FieldType.FORMULA, FieldType.AI, FieldType.BARCODEQR].includes(filter.type)}
             <Input
               disabled={filter.noValue}
               value={readableValue}
@@ -200,6 +210,18 @@
               wrapText
               on:change={onChange}
             />
+          {:else if filter.type === FieldType.BOOLEAN && useConditionValueControls}
+            <Select
+              placeholder={false}
+              disabled={filter.noValue}
+              options={[
+                { label: "True", value: "true" },
+                { label: "False", value: "false" },
+              ]}
+              value={readableValue}
+              popoverAutoWidth
+              on:change={onChange}
+            />
           {:else if filter.type === FieldType.BOOLEAN}
             <Combobox
               disabled={filter.noValue}

package/src/components/grid/stores/conditions.test.ts

@@ -0,0 +1,26 @@
+import { describe, expect, it, vi } from "vitest"
+import type { UICondition } from "@budibase/types"
+
+vi.mock("../../../utils", () => ({
+  derivedMemo: (value: unknown) => value,
+  QueryUtils: {},
+}))
+
+import { getEnabledConditions } from "./conditions"
+
+describe("grid condition evaluation helpers", () => {
+  it("filters disabled conditions", () => {
+    const conditions = [
+      { disabled: true },
+      { disabled: false },
+      { disabled: true },
+    ] as UICondition[]
+
+    expect(getEnabledConditions(conditions)).toEqual([{ disabled: false }])
+  })
+
+  it("returns an empty array when no conditions are supplied", () => {
+    expect(getEnabledConditions(undefined)).toEqual([])
+    expect(getEnabledConditions([])).toEqual([])
+  })
+})

package/src/components/grid/stores/conditions.ts

@@ -26,6 +26,13 @@ export const createStores = (): ConditionStore => {
   }
 }
 
+export const getEnabledConditions = (conditions: UICondition[] | undefined) => {
+  if (!conditions?.length) {
+    return []
+  }
+  return conditions.filter(condition => !condition.disabled)
+}
+
 export const deriveStores = (context: StoreContext): ConditionDerivedStore => {
   const { columns, props } = context
 
@@ -77,15 +84,20 @@ export const deriveStores = (context: StoreContext): ConditionDerivedStore => {
 export const initialise = (context: StoreContext) => {
   const { metadata, conditions, rows } = context
 
-  // Recompute all metadata if conditions change
-  conditions.subscribe($conditions => {
+  const recomputeAllMetadata = () => {
     let newMetadata: Record<string, any> = {}
+    const $conditions = get(conditions)
     if ($conditions?.length) {
       for (let row of get(rows)) {
         newMetadata[row._id] = evaluateConditions(row, $conditions, context)
       }
     }
     metadata.set(newMetadata)
+  }
+
+  // Recompute all metadata if conditions change
+  conditions.subscribe(() => {
+    recomputeAllMetadata()
   })
 
   // Recompute metadata for specific rows when they change
@@ -196,6 +208,8 @@ const evaluateConditions = (
     }
   }
 
+  allConditions = getEnabledConditions(allConditions)
+
   // Pre-process button conditions to set default visibility for show conditions
   const buttonShowConditions = new Set()
   for (let condition of allConditions) {

package/src/fetch/QueryFetch.ts

@@ -7,9 +7,10 @@ export default class QueryFetch extends BaseDataFetch<QueryDatasource, Query> {
   async determineFeatureFlags() {
     const definition = await this.getDefinition()
     const supportsPagination =
-      !!definition?.fields?.pagination?.type &&
-      !!definition?.fields?.pagination?.location &&
-      !!definition?.fields?.pagination?.pageParam
+      (!!definition?.fields?.pagination?.type &&
+        !!definition?.fields?.pagination?.location &&
+        !!definition?.fields?.pagination?.pageParam) ||
+      !!definition?.fields?.pagination?.enabled
     return { supportsPagination }
   }
 
@@ -41,7 +42,7 @@ export default class QueryFetch extends BaseDataFetch<QueryDatasource, Query> {
     const { datasource, limit, paginate } = this.options
     const { supportsPagination } = this.features
     const { cursor, definition } = get(this.store)
-    const type = definition?.fields?.pagination?.type
+    const paginationType = definition?.fields?.pagination?.type
 
     // Set the default query params
     const parameters = Helpers.cloneDeep(datasource.queryParams || {})
@@ -54,7 +55,11 @@ export default class QueryFetch extends BaseDataFetch<QueryDatasource, Query> {
     // Add pagination to query if supported
     const queryPayload: ExecuteQueryRequest = { parameters }
     if (paginate && supportsPagination) {
-      const requestCursor = type === "page" ? parseInt(cursor || "1") : cursor
+      // For SQL queries (pagination.enabled), use page-based pagination
+      // For REST queries, use the configured type (page or cursor)
+      const isPageBased =
+        paginationType === "page" || definition?.fields?.pagination?.enabled
+      const requestCursor = isPageBased ? parseInt(cursor || "1") : cursor
       queryPayload.pagination = { page: requestCursor, limit }
     }
 
@@ -67,7 +72,10 @@ export default class QueryFetch extends BaseDataFetch<QueryDatasource, Query> {
       let nextCursor = null
       let hasNextPage = false
       if (paginate && supportsPagination) {
-        if (type === "page") {
+        const isPageBased =
+          paginationType === "page" || definition?.fields?.pagination?.enabled
+
+        if (isPageBased) {
           // For "page number" pagination, increment the existing page number
           nextCursor = queryPayload.pagination!.page! + 1
           hasNextPage = data?.length === limit && limit > 0

package/src/components/ConditionField.svelte

@@ -1,175 +0,0 @@
-<script>
-  import { Input, Icon, Drawer, Button } from "@budibase/bbui"
-  import { isJSBinding } from "@budibase/string-templates"
-  import { createEventDispatcher } from "svelte"
-
-  export let filter
-  export let disabled = false
-  export let bindings = []
-  export let panel
-  export let drawerTitle
-  export let toReadable
-  export let toRuntime
-  export let evaluationContext = {}
-
-  const dispatch = createEventDispatcher()
-
-  let bindingDrawer
-  let fieldValue
-
-  $: fieldValue = filter?.field
-  $: readableValue = toReadable ? toReadable(bindings, fieldValue) : fieldValue
-  $: drawerValue = toDrawerValue(fieldValue)
-  $: isJS = isJSBinding(fieldValue)
-
-  const drawerOnChange = e => {
-    drawerValue = e.detail
-  }
-
-  const onChange = e => {
-    fieldValue = e.detail
-    dispatch("change", {
-      field: toRuntime ? toRuntime(bindings, fieldValue) : fieldValue,
-    })
-  }
-
-  const onConfirmBinding = () => {
-    dispatch("change", {
-      field: toRuntime ? toRuntime(bindings, drawerValue) : drawerValue,
-    })
-  }
-
-  /**
-   * Converts arrays into strings. The CodeEditor expects a string or encoded JS
-   *
-   * @param{string} fieldValue
-   */
-  const toDrawerValue = fieldValue => {
-    return Array.isArray(fieldValue) ? fieldValue.join(",") : readableValue
-  }
-</script>
-
-<div>
-  <Drawer
-    on:drawerHide
-    on:drawerShow
-    bind:this={bindingDrawer}
-    title={drawerTitle || ""}
-    forceModal
-  >
-    <Button
-      cta
-      slot="buttons"
-      on:click={() => {
-        onConfirmBinding()
-        bindingDrawer.hide()
-      }}
-    >
-      Confirm
-    </Button>
-    <svelte:component
-      this={panel}
-      slot="body"
-      value={drawerValue}
-      allowJS
-      allowHelpers
-      allowHBS
-      on:change={drawerOnChange}
-      {bindings}
-      context={evaluationContext}
-    />
-  </Drawer>
-
-  <div class="field-wrap" class:bindings={true}>
-    <div class="field">
-      <Input
-        disabled={filter.noValue}
-        readonly={isJS}
-        value={isJS ? "(JavaScript function)" : readableValue}
-        on:change={onChange}
-      />
-    </div>
-
-    <div class="binding-control">
-      {#if !disabled}
-        <!-- svelte-ignore a11y-click-events-have-key-events -->
-        <!-- svelte-ignore a11y-no-static-element-interactions -->
-        <div
-          class="icon binding"
-          on:click={() => {
-            bindingDrawer.show()
-          }}
-        >
-          <Icon size="S" weight="fill" name="lightning" />
-        </div>
-      {/if}
-    </div>
-  </div>
-</div>
-
-<style>
-  .field-wrap {
-    display: flex;
-  }
-  .field {
-    flex: 1;
-  }
-
-  .field-wrap.bindings .field :global(.spectrum-Form-itemField),
-  .field-wrap.bindings .field :global(input),
-  .field-wrap.bindings .field :global(.spectrum-Picker) {
-    border-top-right-radius: 0px;
-    border-bottom-right-radius: 0px;
-  }
-
-  .field-wrap.bindings
-    .field
-    :global(.spectrum-InputGroup.spectrum-Datepicker) {
-    min-width: unset;
-    border-radius: 0px;
-  }
-
-  .field-wrap.bindings
-    .field
-    :global(
-      .spectrum-InputGroup.spectrum-Datepicker
-        .spectrum-Textfield-input.spectrum-InputGroup-input
-    ) {
-    width: 100%;
-  }
-
-  .binding-control .icon {
-    border: 1px solid
-      var(
-        --spectrum-textfield-m-border-color,
-        var(--spectrum-alias-border-color)
-      );
-    border-left: 0px;
-    border-top-right-radius: 4px;
-    border-bottom-right-radius: 4px;
-    justify-content: center;
-    align-items: center;
-    display: flex;
-    flex-direction: row;
-    box-sizing: border-box;
-    width: 31px;
-    color: var(--spectrum-alias-text-color);
-    background-color: var(--spectrum-global-color-gray-75);
-    transition:
-      background-color var(--spectrum-global-animation-duration-100, 130ms),
-      box-shadow var(--spectrum-global-animation-duration-100, 130ms),
-      border-color var(--spectrum-global-animation-duration-100, 130ms);
-    height: calc(var(--spectrum-alias-item-height-m));
-  }
-
-  .binding-control .icon:hover {
-    cursor: pointer;
-    background-color: var(--spectrum-global-color-gray-50);
-    border-color: var(--spectrum-alias-border-color-hover);
-    color: var(--spectrum-alias-text-color-hover);
-  }
-
-  .binding-control .icon.binding:hover {
-    color: var(--yellow);
-  }
-</style>