Merge branch 'support/anybase' of ssh://github.com/apecloud/ApeRAG into support/anybase

Author: iziang

web/src/app/workspace/bots/bot-form.tsx

@@ -170,18 +170,22 @@ export const BotForm = ({
   });
 
   const loadData = useCallback(async () => {
-    const [modeRes, collectionsRes] = await Promise.all([
-      apiClient.defaultApi.availableModelsPost({
-        tagFilterRequest: {
-          tag_filters: [{ operation: 'AND', tags: ['enable_for_agent'] }],
-        },
-      }),
-      apiClient.defaultApi.collectionsGet({
-        pageSize: 100,
-        page: 1,
-        includeSubscribed: true,
-      }),
-    ]);
+    const [modeRes, collectionsRes, marketplaceCollectionsRes] =
+      await Promise.all([
+        apiClient.defaultApi.availableModelsPost({
+          tagFilterRequest: {
+            tag_filters: [{ operation: 'AND', tags: ['enable_for_agent'] }],
+          },
+        }),
+        apiClient.defaultApi.collectionsGet({
+          pageSize: 100,
+          page: 1,
+        }),
+        apiClient.defaultApi.marketplaceCollectionsGet({
+          pageSize: 100,
+          page: 1,
+        }),
+      ]);
 
     const completion = modeRes.data.items?.map((m) => {
       return {
@@ -191,7 +195,14 @@ export const BotForm = ({
       };
     });
 
-    setCollections(collectionsRes.data.items || []);
+    const collections = collectionsRes.data.items || [];
+    const marketplaceCollections = marketplaceCollectionsRes.data.items || [];
+    const uniqCollections = _.uniqBy(
+      collections.concat(marketplaceCollections),
+      (item) => item.id,
+    );
+
+    setCollections(uniqCollections);
     setCompletionModels(completion || []);
   }, []);
 

web/src/app/workspace/collections/collection-list.tsx

@@ -2,9 +2,11 @@
 
 import { CollectionView } from '@/api';
 import { FormatDate } from '@/components/format-date';
+import { Badge } from '@/components/ui/badge';
 import { Button } from '@/components/ui/button';
 import {
   Card,
+  CardAction,
   CardDescription,
   CardFooter,
   CardHeader,
@@ -63,17 +65,18 @@ export const CollectionList = ({
               return (
                 <Link
                   key={collection.id}
-                  href={
-                    collection.subscription_id
-                      ? `/marketplace/collections/${collection.id}/documents`
-                      : `/workspace/collections/${collection.id}/documents`
-                  }
+                  href={`/workspace/collections/${collection.id}/documents`}
                 >
                   <Card className="hover:bg-accent/30 cursor-pointer gap-2 rounded-md">
                     <CardHeader className="px-4">
                       <CardTitle className="h-5 truncate">
                         {collection.title}
                       </CardTitle>
+                      <CardAction>
+                        {collection.is_published && (
+                          <Badge>{page_collections('public')}</Badge>
+                        )}
+                      </CardAction>
                     </CardHeader>
                     <CardDescription className="mb-4 truncate px-4">
                       {collection.description ||