refac
This commit is contained in:
1 parent
76854d1424
commit
084d040e22
5 files changed
+43
-18
No files matched your search
@@ -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)):
|
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)
|
folder = await Folders.get_folder_by_id_and_user_id(id, user.id, db=db)
|
||||||
if folder:
|
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
|
# Check shared access
|
||||||
folder = await Folders.get_folder_by_id(id, db=db)
|
folder = await Folders.get_folder_by_id(id, db=db)
|
||||||
|
|||||||
@@ -74,8 +74,14 @@
|
|||||||
|
|
||||||
$: models = selectedModels.map((id) => $_models.find((m) => m.id === id));
|
$: models = selectedModels.map((id) => $_models.find((m) => m.id === id));
|
||||||
|
|
||||||
// True when viewing a shared folder the current user doesn't own
|
// True when viewing a shared folder the current user doesn't own AND lacks write access
|
||||||
$: folderReadOnly = $selectedFolder != null && $selectedFolder.user_id !== $user?.id;
|
$: 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>
|
</script>
|
||||||
|
|
||||||
<div class="m-auto w-full max-w-6xl px-2 @2xl:px-20 translate-y-6 py-24 text-center">
|
<div class="m-auto w-full max-w-6xl px-2 @2xl:px-20 translate-y-6 py-24 text-center">
|
||||||
@@ -98,7 +104,7 @@
|
|||||||
{#if $selectedFolder}
|
{#if $selectedFolder}
|
||||||
<FolderTitle
|
<FolderTitle
|
||||||
folder={$selectedFolder}
|
folder={$selectedFolder}
|
||||||
readOnly={folderReadOnly}
|
readOnly={folderNotOwned}
|
||||||
onUpdate={async (folder) => {
|
onUpdate={async (folder) => {
|
||||||
await chats.set(await getChatList(localStorage.token, $currentChatPage));
|
await chats.set(await getChatList(localStorage.token, $currentChatPage));
|
||||||
currentChatPage.set(1);
|
currentChatPage.set(1);
|
||||||
|
|||||||
@@ -529,14 +529,6 @@
|
|||||||
on:focus={(e) => {}}
|
on:focus={(e) => {}}
|
||||||
draggable="false"
|
draggable="false"
|
||||||
>
|
>
|
||||||
<!-- Loading spinner for active chat (left side) -->
|
|
||||||
{#if $activeChatIds.has(id)}
|
|
||||||
<div class="shrink-0 self-center pr-2">
|
|
||||||
<Spinner className="size-3" />
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
<div class="flex self-center flex-1 w-full min-w-0">
|
|
||||||
{#if ownerUserId}
|
{#if ownerUserId}
|
||||||
<Tooltip content={ownerName || 'Unknown'}>
|
<Tooltip content={ownerName || 'Unknown'}>
|
||||||
<img
|
<img
|
||||||
@@ -546,6 +538,15 @@
|
|||||||
/>
|
/>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
|
<!-- Loading spinner for active chat (left side) -->
|
||||||
|
{#if $activeChatIds.has(id)}
|
||||||
|
<div class="shrink-0 self-center pr-2">
|
||||||
|
<Spinner className="size-3" />
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<div class="flex self-center flex-1 w-full min-w-0">
|
||||||
{#if unread}
|
{#if unread}
|
||||||
<div class="shrink-0 self-center pr-2.5 flex transition-opacity duration-300">
|
<div class="shrink-0 self-center pr-2.5 flex transition-opacity duration-300">
|
||||||
<div class="size-1.5 bg-sky-500 rounded-full" />
|
<div class="size-1.5 bg-sky-500 rounded-full" />
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
import Modal from '$lib/components/common/Modal.svelte';
|
import Modal from '$lib/components/common/Modal.svelte';
|
||||||
import AccessControl from '$lib/components/workspace/common/AccessControl.svelte';
|
import AccessControl from '$lib/components/workspace/common/AccessControl.svelte';
|
||||||
import XMark from '$lib/components/icons/XMark.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';
|
import { user } from '$lib/stores';
|
||||||
|
|
||||||
type AccessGrant = {
|
type AccessGrant = {
|
||||||
@@ -19,11 +19,28 @@
|
|||||||
export let folder: any = null;
|
export let folder: any = null;
|
||||||
|
|
||||||
let accessGrants: AccessGrant[] = [];
|
let accessGrants: AccessGrant[] = [];
|
||||||
|
let loading = false;
|
||||||
|
|
||||||
$: if (folder) {
|
// Fetch fresh folder data (with access_grants) when modal opens
|
||||||
accessGrants = folder.access_grants ?? [];
|
$: 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 () => {
|
const handleAccessChange = async () => {
|
||||||
if (!folder) return;
|
if (!folder) return;
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -549,7 +549,7 @@
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (folder) {
|
if (folder) {
|
||||||
await selectedFolder.set(folder);
|
await selectedFolder.set({ ...folders[folderId], ...folder });
|
||||||
}
|
}
|
||||||
|
|
||||||
await goto('/');
|
await goto('/');
|
||||||
@@ -703,8 +703,8 @@
|
|||||||
createdAt={chat.created_at}
|
createdAt={chat.created_at}
|
||||||
updatedAt={chat.updated_at}
|
updatedAt={chat.updated_at}
|
||||||
lastReadAt={chat.last_read_at}
|
lastReadAt={chat.last_read_at}
|
||||||
ownerName={chat.owner_name ?? null}
|
ownerName={folders[folderId]?.shared ? (chat.owner_name ?? null) : null}
|
||||||
ownerUserId={chat.owner_name ? chat.user_id : null}
|
ownerUserId={folders[folderId]?.shared && chat.owner_name ? chat.user_id : null}
|
||||||
readonly={chat.user_id !== $user?.id}
|
readonly={chat.user_id !== $user?.id}
|
||||||
{shiftKey}
|
{shiftKey}
|
||||||
on:change={(e) => {
|
on:change={(e) => {
|
||||||
|
|||||||
Reference in new issue
Block a user