refac

Author: tjbck

backend/open_webui/routers/folders.py

@@ -210,7 +210,8 @@ async def get_shared_folders(
 async def get_folder_by_id(id: str, user=Depends(get_verified_user), db: AsyncSession = Depends(get_async_session)):
     folder = await Folders.get_folder_by_id_and_user_id(id, user.id, db=db)
     if folder:
-        return folder
+        grants = await AccessGrants.get_grants_by_resource('folder', id, db=db)
+        return {**folder.model_dump(), 'access_grants': [g.model_dump() for g in grants]}
 
     # Check shared access
     folder = await Folders.get_folder_by_id(id, db=db)

src/lib/components/chat/Placeholder.svelte

@@ -74,8 +74,14 @@
 
 	$: models = selectedModels.map((id) => $_models.find((m) => m.id === id));
 
-	// True when viewing a shared folder the current user doesn't own
-	$: folderReadOnly = $selectedFolder != null && $selectedFolder.user_id !== $user?.id;
+	// True when viewing a shared folder the current user doesn't own AND lacks write access
+	$: folderReadOnly =
+		$selectedFolder != null &&
+		$selectedFolder.user_id !== $user?.id &&
+		$selectedFolder.permission !== 'write';
+
+	// True when the current user does NOT own this folder (hide management menus)
+	$: folderNotOwned = $selectedFolder != null && $selectedFolder.user_id !== $user?.id;
 </script>
 
 <div class="m-auto w-full max-w-6xl px-2 @2xl:px-20 translate-y-6 py-24 text-center">
@@ -97,19 +103,19 @@
 		<div class="w-full flex flex-col justify-center items-center">
 			{#if $selectedFolder}
 				<FolderTitle
-				folder={$selectedFolder}
-				readOnly={folderReadOnly}
-				onUpdate={async (folder) => {
-					await chats.set(await getChatList(localStorage.token, $currentChatPage));
-					currentChatPage.set(1);
-				}}
-				onDelete={async () => {
-					await chats.set(await getChatList(localStorage.token, $currentChatPage));
-					currentChatPage.set(1);
+					folder={$selectedFolder}
+					readOnly={folderNotOwned}
+					onUpdate={async (folder) => {
+						await chats.set(await getChatList(localStorage.token, $currentChatPage));
+						currentChatPage.set(1);
+					}}
+					onDelete={async () => {
+						await chats.set(await getChatList(localStorage.token, $currentChatPage));
+						currentChatPage.set(1);
 
-					selectedFolder.set(null);
-				}}
-			/>
+						selectedFolder.set(null);
+					}}
+				/>
 			{:else}
 				<div class="flex flex-row justify-center gap-2.5 @sm:gap-3 w-fit px-5 max-w-xl">
 					<div class="flex shrink-0 justify-center">

src/lib/components/layout/Sidebar/ChatItem.svelte

@@ -529,6 +529,16 @@
 			on:focus={(e) => {}}
 			draggable="false"
 		>
+			{#if ownerUserId}
+				<Tooltip content={ownerName || 'Unknown'}>
+					<img
+						src="/api/v1/users/{ownerUserId}/profile/image"
+						alt=""
+						class="size-4 rounded-full shrink-0 object-cover mr-1.5"
+					/>
+				</Tooltip>
+			{/if}
+
 			<!-- Loading spinner for active chat (left side) -->
 			{#if $activeChatIds.has(id)}
 				<div class="shrink-0 self-center pr-2">
@@ -537,15 +547,6 @@
 			{/if}
 
 			<div class="flex self-center flex-1 w-full min-w-0">
-				{#if ownerUserId}
-					<Tooltip content={ownerName || 'Unknown'}>
-						<img
-							src="/api/v1/users/{ownerUserId}/profile/image"
-							alt=""
-							class="size-4 rounded-full shrink-0 object-cover mr-1.5"
-						/>
-					</Tooltip>
-				{/if}
 				{#if unread}
 					<div class="shrink-0 self-center pr-2.5 flex transition-opacity duration-300">
 						<div class="size-1.5 bg-sky-500 rounded-full" />

src/lib/components/layout/Sidebar/Folders/FolderShareModal.svelte

@@ -5,7 +5,7 @@
 	import Modal from '$lib/components/common/Modal.svelte';
 	import AccessControl from '$lib/components/workspace/common/AccessControl.svelte';
 	import XMark from '$lib/components/icons/XMark.svelte';
-	import { updateFolderAccessById } from '$lib/apis/folders';
+	import { getFolderById, updateFolderAccessById } from '$lib/apis/folders';
 	import { user } from '$lib/stores';
 
 	type AccessGrant = {
@@ -19,11 +19,28 @@
 	export let folder: any = null;
 
 	let accessGrants: AccessGrant[] = [];
+	let loading = false;
 
-	$: if (folder) {
-		accessGrants = folder.access_grants ?? [];
+	// Fetch fresh folder data (with access_grants) when modal opens
+	$: if (show && folder?.id) {
+		loadAccessGrants();
 	}
 
+	const loadAccessGrants = async () => {
+		loading = true;
+		try {
+			const freshFolder = await getFolderById(localStorage.token, folder.id);
+			if (freshFolder) {
+				accessGrants = freshFolder.access_grants ?? [];
+			}
+		} catch (e) {
+			console.error('Failed to load folder access grants', e);
+			accessGrants = folder?.access_grants ?? [];
+		} finally {
+			loading = false;
+		}
+	};
+
 	const handleAccessChange = async () => {
 		if (!folder) return;
 		try {

src/lib/components/layout/Sidebar/RecursiveFolder.svelte

@@ -549,7 +549,7 @@
 						});
 
 						if (folder) {
-							await selectedFolder.set(folder);
+							await selectedFolder.set({ ...folders[folderId], ...folder });
 						}
 
 						await goto('/');
@@ -703,8 +703,8 @@
 							createdAt={chat.created_at}
 							updatedAt={chat.updated_at}
 							lastReadAt={chat.last_read_at}
-							ownerName={chat.owner_name ?? null}
-							ownerUserId={chat.owner_name ? chat.user_id : null}
+							ownerName={folders[folderId]?.shared ? (chat.owner_name ?? null) : null}
+							ownerUserId={folders[folderId]?.shared && chat.owner_name ? chat.user_id : null}
 							readonly={chat.user_id !== $user?.id}
 							{shiftKey}
 							on:change={(e) => {