Merge remote-tracking branch 'origin/dev' into dev

kenneth-bro · Sep 20, 2024 · 09352b7 · 09352b7
2 parents f8dd645 + b68ab24
commit 09352b7
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/web/app/components/app/configuration/features/chat-group/citation/index.tsx b/web/app/components/app/configuration/features/chat-group/citation/index.tsx
@@ -36,7 +36,7 @@ const Citation: FC = () => {
     if (item.enabled) {
       tools.push({
         name: item.provider_name,
-        value: item.provider_id,
+        value: item.tool_label,
       })
     }
   })
@@ -55,7 +55,7 @@ const Citation: FC = () => {
       id,
       data_type,
       match_column,
-      show_column,
+      show_column: show_column?.split(','),
       to_link,
       src_column,
       name,

diff --git a/web/app/components/app/configuration/features/chat-group/citation/modal.tsx b/web/app/components/app/configuration/features/chat-group/citation/modal.tsx
@@ -36,7 +36,7 @@ const CitationModal: FC<Props> = (props) => {
     dataType: data_type || '',
     srcColumn: src_column || '',
     matchColumn: match_column || '',
-    showColumn: show_column || '',
+    showColumn: show_column?.join(',') || '',
     toLink: to_link || '',
     isEdit: Boolean(id)
   })

diff --git a/web/app/components/base/features/feature-panel/citation/index.tsx b/web/app/components/base/features/feature-panel/citation/index.tsx
@@ -59,7 +59,7 @@ const Citation: FC = () => {
       id,
       data_type,
       match_column,
-      show_column,
+      show_column: show_column?.split(','),
       to_link,
       src_column,
       name,

diff --git a/web/app/components/base/features/types.ts b/web/app/components/base/features/types.ts
@@ -25,7 +25,7 @@ export type ResourcesItem = {
   data_type?: string
   src_column?: string
   match_column?: string
-  show_column?: string
+  show_column?: string[]
   to_link?: string
   name?: string
 }

diff --git a/web/context/modal-context.tsx b/web/context/modal-context.tsx
@@ -52,7 +52,7 @@ export type CitationForm = {
   data_type?: string
   src_column?: string
   match_column?: string
-  show_column?: string
+  show_column?: string[]
   to_link?: string
   tools?: { name: string; value: string }[]
   name?: string

diff --git a/web/models/debug.ts b/web/models/debug.ts
@@ -117,7 +117,7 @@ export type ResourcesItem = {
   data_type?: string
   src_column?: string
   match_column?: string
-  show_column?: string
+  show_column?: string[]
   to_link?: string
   name?: string
 }