@budibase/frontend-core 3.31.2 → 3.31.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "3.31.2",
+  "version": "3.31.4",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
@@ -24,5 +24,5 @@
   "devDependencies": {
     "vitest": "^3.2.4"
   },
-  "gitHead": "e43a157f7b7baa20d67d05b35fd94b2b205acb2b"
+  "gitHead": "7d5a486a8c245870743408abb7d03a33e19c8679"
 }

package/src/api/chatApps.ts

@@ -23,14 +23,19 @@ export interface ChatAppEndpoints {
   ) => Promise<AsyncIterable<UIMessage<AgentMessageMetadata>>>
   deleteChatConversation: (
     chatConversationId: string,
-    chatAppId: string
+    chatAppId: string,
+    agentId?: string
   ) => Promise<void>
   fetchChatConversation: (
     chatAppId: string,
-    chatConversationId: string
+    chatConversationId: string,
+    agentId?: string
   ) => Promise<ChatConversation>
   fetchChatAppAgents: (chatAppId: string) => Promise<FetchChatAppAgentsResponse>
-  fetchChatHistory: (chatAppId: string) => Promise<FetchAgentHistoryResponse>
+  fetchChatHistory: (
+    chatAppId: string,
+    agentId?: string
+  ) => Promise<FetchAgentHistoryResponse>
   fetchChatApp: (workspaceId?: string) => Promise<ChatApp | null>
   setChatAppAgent: (chatAppId: string, agentId: string) => Promise<ChatAppAgent>
   createChatConversation: (
@@ -53,6 +58,15 @@ const throwOnErrorChunk = () =>
     },
   })
 
+const withAgentIdQuery = (url: string, agentId?: string) => {
+  if (!agentId) {
+    return url
+  }
+
+  const query = new URLSearchParams({ agentId })
+  return `${url}?${query.toString()}`
+}
+
 export const buildChatAppEndpoints = (
   API: BaseAPIClient
 ): ChatAppEndpoints => ({
@@ -102,19 +116,27 @@ export const buildChatAppEndpoints = (
 
   deleteChatConversation: async (
     chatConversationId: string,
-    chatAppId: string
+    chatAppId: string,
+    agentId?: string
   ) => {
     return await API.delete({
-      url: `/api/chatapps/${chatAppId}/conversations/${chatConversationId}`,
+      url: withAgentIdQuery(
+        `/api/chatapps/${chatAppId}/conversations/${chatConversationId}`,
+        agentId
+      ),
     })
   },
 
   fetchChatConversation: async (
     chatAppId: string,
-    chatConversationId: string
+    chatConversationId: string,
+    agentId?: string
   ) => {
     return await API.get({
-      url: `/api/chatapps/${chatAppId}/conversations/${chatConversationId}`,
+      url: withAgentIdQuery(
+        `/api/chatapps/${chatAppId}/conversations/${chatConversationId}`,
+        agentId
+      ),
     })
   },
 
@@ -124,9 +146,12 @@ export const buildChatAppEndpoints = (
     })
   },
 
-  fetchChatHistory: async (chatAppId: string) => {
+  fetchChatHistory: async (chatAppId: string, agentId?: string) => {
     return await API.get({
-      url: `/api/chatapps/${chatAppId}/conversations`,
+      url: withAgentIdQuery(
+        `/api/chatapps/${chatAppId}/conversations`,
+        agentId
+      ),
     })
   },
 

package/src/api/groups.ts

@@ -39,6 +39,7 @@ type GetGroupUsersRequest = {
   id: string
   bookmark?: string
   emailSearch?: string
+  pageSize?: number
 }
 
 export const buildGroupsEndpoints = (API: BaseAPIClient): GroupEndpoints => {
@@ -101,13 +102,16 @@ export const buildGroupsEndpoints = (API: BaseAPIClient): GroupEndpoints => {
     /**
      * Gets a group users by the group id
      */
-    getGroupUsers: async ({ id, bookmark, emailSearch }) => {
+    getGroupUsers: async ({ id, bookmark, emailSearch, pageSize }) => {
       let url = `/api/global/groups/${id}/users?`
       if (bookmark) {
         url += `bookmark=${bookmark}&`
       }
       if (emailSearch) {
-        url += `emailSearch=${emailSearch}`
+        url += `emailSearch=${emailSearch}&`
+      }
+      if (pageSize != null) {
+        url += `pageSize=${pageSize}`
       }
       return await API.get({
         url,

package/src/components/Chatbox/ChatConversationPanel.svelte

@@ -4,6 +4,13 @@
   import type { ChatConversation, DraftChatConversation } from "@budibase/types"
   import Chatbox from "./index.svelte"
 
+  type AgentAvailability =
+    | "no_selection"
+    | "deleted"
+    | "offline"
+    | "disabled"
+    | "ready"
+
   type ChatConversationLike = ChatConversation | DraftChatConversation
 
   type EnabledAgentListItem = {
@@ -17,11 +24,11 @@
   export let selectedAgentName: string = ""
   export let enabledAgentList: EnabledAgentListItem[] = []
   export let conversationStarters: { prompt: string }[] = []
-  export let isAgentKnown: boolean = true
-  export let isAgentLive: boolean = true
+  export let agentAvailability: AgentAvailability = "ready"
 
   export let chat: ChatConversationLike
   export let loading: boolean = false
+  export let suppressAgentPicker: boolean = false
   export let deletingChat: boolean = false
   export let workspaceId: string
   export let initialPrompt: string = ""
@@ -59,40 +66,22 @@
   $: visibleAgentList = enabledAgentList.slice(0, 3)
   $: hasEnabledAgents = enabledAgentList.length > 0
 
-  const getAgentStatus = (
-    agentId: string | null,
-    agents: EnabledAgentListItem[],
-    agentKnown: boolean,
-    agentLive: boolean
-  ): {
-    isAgentEnabled: boolean
-    readOnlyReason: "disabled" | "deleted" | "offline" | undefined
-  } => {
-    if (!agentId) {
-      return { isAgentEnabled: false, readOnlyReason: undefined }
-    }
-
-    if (!agentKnown) {
-      return { isAgentEnabled: false, readOnlyReason: "deleted" }
-    }
-
-    if (!agentLive) {
-      return { isAgentEnabled: false, readOnlyReason: "offline" }
-    }
-
-    const isAgentEnabled = agents.some(agent => agent.agentId === agentId)
-    return {
-      isAgentEnabled,
-      readOnlyReason: isAgentEnabled ? undefined : "disabled",
+  const getReadOnlyReason = (
+    availability: AgentAvailability
+  ): "disabled" | "deleted" | "offline" | undefined => {
+    switch (availability) {
+      case "deleted":
+        return "deleted"
+      case "offline":
+        return "offline"
+      case "disabled":
+        return "disabled"
+      default:
+        return undefined
     }
   }
 
-  $: ({ readOnlyReason } = getAgentStatus(
-    selectedAgentId,
-    enabledAgentList,
-    isAgentKnown,
-    isAgentLive
-  ))
+  $: readOnlyReason = getReadOnlyReason(agentAvailability)
 
   const deleteChat = () => {
     dispatch("deleteChat")
@@ -136,7 +125,7 @@
     <div class="chat-header">
       <div class="chat-header-agent">
         <Body size="S">
-          {selectedAgentName || "Unknown agent"}
+          {selectedAgentName || (loading ? "" : "Unknown agent")}
         </Body>
       </div>
 
@@ -169,7 +158,7 @@
       {readOnlyReason}
       onchatsaved={event => dispatch("chatSaved", event.detail)}
     />
-  {:else}
+  {:else if !suppressAgentPicker}
     <div class="chat-empty">
       <div class="chat-empty-greeting">
         <Body size="XL" weight="600" serif>

package/src/components/Chatbox/ChatNavigationPanel.svelte

@@ -18,6 +18,7 @@
   export let enabledAgentList: EnabledAgentListItem[] = []
   export let conversationHistory: ConversationListItem[] = []
   export let selectedConversationId: string | undefined
+  export let hideAgents = false
 
   $: defaultAgent =
     enabledAgentList.find(agent => agent.isDefault) || enabledAgentList[0]
@@ -52,26 +53,28 @@
       </div>
     {/if}
 
-    <div class="list-section">
-      <div class="list-title">Agents</div>
-      {#if enabledAgentList.length}
-        {#each enabledAgentList as agent (agent.agentId)}
-          <button
-            class="list-item list-item-button"
-            on:click={() => selectAgent(agent.agentId)}
-          >
-            <span class="list-item-icon">
-              <Icon name={agent.icon || "robot"} size="S" />
-            </span>
-            {agent.name}
-          </button>
-        {/each}
-      {:else}
-        <Body size="XS" color="var(--spectrum-global-color-gray-500)">
-          No agents
-        </Body>
-      {/if}
-    </div>
+    {#if !hideAgents}
+      <div class="list-section">
+        <div class="list-title">Agents</div>
+        {#if enabledAgentList.length}
+          {#each enabledAgentList as agent (agent.agentId)}
+            <button
+              class="list-item list-item-button"
+              on:click={() => selectAgent(agent.agentId)}
+            >
+              <span class="list-item-icon">
+                <Icon name={agent.icon || "robot"} size="S" />
+              </span>
+              {agent.name}
+            </button>
+          {/each}
+        {:else}
+          <Body size="XS" color="var(--spectrum-global-color-gray-500)">
+            No agents
+          </Body>
+        {/if}
+      </div>
+    {/if}
 
     <div class="list-section">
       <div class="list-title">Recent Chats</div>

package/src/components/Chatbox/index.svelte

@@ -191,7 +191,10 @@
     onFinish: async () => {
       if (persistConversation && !chat._id && chat.chatAppId) {
         try {
-          const history = await API.fetchChatHistory(chat.chatAppId)
+          const history = await API.fetchChatHistory(
+            chat.chatAppId,
+            chat.agentId
+          )
           const msgs = chatInstance.messages
           const lastMessageId = msgs[msgs.length - 1]?.id
           const savedConversation =

package/src/fetch/GroupUserFetch.ts

@@ -41,6 +41,7 @@ export default class GroupUserFetch extends BaseDataFetch<
   }
 
   async getData() {
+    const { limit } = this.options
     const { query, cursor } = get(this.store)
 
     try {
@@ -48,6 +49,7 @@ export default class GroupUserFetch extends BaseDataFetch<
         id: query.groupId,
         emailSearch: query.emailSearch,
         bookmark: cursor ?? undefined,
+        pageSize: limit,
       })
 
       return {