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

Author: iziang

web/src/app/workspace/bots/[botId]/bot-delete.tsx

@@ -32,7 +32,7 @@ export const BotDelete = ({ children }: { children?: React.ReactNode }) => {
         botId: bot.id,
       });
       setDeleteVisible(false);
-      router.push('/bots');
+      router.push('/workspace/bots');
     }
   }, [bot?.id, router]);
 

web/src/app/workspace/bots/[botId]/bot-sharing.tsx

@@ -130,7 +130,9 @@ export const BotSharing = ({ children }: { children?: React.ReactNode }) => {
               options={departments as TreeSelectItem[]}
               values={selectedDepartents.filter((d) => d !== '*')}
               onValuesChange={(v) => setSelectedDepartents(v)}
-              className={cn('relative h-60 overflow-auto rounded-md border')}
+              className={cn(
+                'relative h-60 max-w-115 overflow-auto rounded-md border',
+              )}
             />
             {isSharedGlobal && (
               <div className="bg-accent/50 absolute top-0 left-0 h-full w-full" />

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

@@ -129,26 +129,27 @@ export const CollectionSharing = ({
           />
         </Label>
 
-        <div>
-          <div className="mb-2 flex h-4 flex-row items-center justify-between gap-2 text-sm">
-            <div>
-              {page_bot('shared_department')} (
-              {selectedDepartents.filter((d) => d !== '*').length})
-            </div>
+        <div className="mb-2 flex h-4 flex-row items-center justify-between gap-2 text-sm">
+          <div>
+            {page_bot('shared_department')} (
+            {selectedDepartents.filter((d) => d !== '*').length})
           </div>
+        </div>
 
-          <div className="relative h-60">
-            <TreeMultipleSelect
-              options={departments as TreeSelectItem[]}
-              values={selectedDepartents.filter((d) => d !== '*')}
-              onValuesChange={(v) => setSelectedDepartents(v)}
-              className={cn('relative h-60 overflow-auto rounded-md border')}
-            />
-            {isSharedGlobal && (
-              <div className="bg-accent/50 absolute top-0 left-0 h-full w-full" />
+        <div className="relative h-60">
+          <TreeMultipleSelect
+            options={departments as TreeSelectItem[]}
+            values={selectedDepartents.filter((d) => d !== '*')}
+            onValuesChange={(v) => setSelectedDepartents(v)}
+            className={cn(
+              'relative h-60 max-w-115 overflow-auto rounded-md border',
             )}
-          </div>
+          />
+          {isSharedGlobal && (
+            <div className="bg-accent/50 absolute top-0 left-0 h-full w-full" />
+          )}
         </div>
+
         <DialogFooter>
           <Button variant="outline" onClick={() => setSharingVisible(false)}>
             {common_action('cancel')}

web/src/app/workspace/collections/[collectionId]/collection-sharing.tsx

@@ -35,7 +35,7 @@ export default async function Page() {
     const res = await serverApi.defaultApi.collectionsGet({
       page: 1,
       pageSize: 100,
-      includeSubscribed: true,
+      includeSubscribed: false,
     });
     collections = res.data.items || [];
   } catch (err) {