Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
chenpangpang
open-webui
Commits
62dc486c
"git@developer.sourcefind.cn:OpenDAS/nni.git" did not exist on "cd98c48fdedd7a6ce01a58f096a960de6f85946e"
Commit
62dc486c
authored
Aug 01, 2024
by
Aryan Kothari
Browse files
add: add paginated scroll handler
parent
d1196162
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
70 additions
and
7 deletions
+70
-7
src/lib/components/layout/Sidebar.svelte
src/lib/components/layout/Sidebar.svelte
+70
-7
No files found.
src/lib/components/layout/Sidebar.svelte
View file @
62dc486c
...
@@ -11,7 +11,10 @@
...
@@ -11,7 +11,10 @@
showSidebar,
showSidebar,
mobile,
mobile,
showArchivedChats,
showArchivedChats,
pinnedChats
pinnedChats,
pageSkip,
pageLimit,
scrollPaginationEnabled
} from '$lib/stores';
} from '$lib/stores';
import { onMount, getContext, tick } from 'svelte';
import { onMount, getContext, tick } from 'svelte';
...
@@ -49,6 +52,12 @@
...
@@ -49,6 +52,12 @@
let showDropdown = false;
let showDropdown = false;
let filteredChatList = [];
let filteredChatList = [];
let paginationScrollThreashold = 0.6;
let nextPageLoading = false;
let tagView = false;
let chatPagniationComplete = false;
pageLimit.set(20);
$: filteredChatList = $chats.filter((chat) => {
$: filteredChatList = $chats.filter((chat) => {
if (search === '') {
if (search === '') {
...
@@ -84,7 +93,7 @@
...
@@ -84,7 +93,7 @@
showSidebar.set(window.innerWidth > BREAKPOINT);
showSidebar.set(window.innerWidth > BREAKPOINT);
await pinnedChats.set(await getChatListByTagName(localStorage.token, 'pinned'));
await pinnedChats.set(await getChatListByTagName(localStorage.token, 'pinned'));
await chats.set(await getChatList(localStorage.token));
await chats.set(await getChatList(localStorage.token
, $pageSkip, $pageLimit
));
let touchstart;
let touchstart;
let touchend;
let touchend;
...
@@ -185,7 +194,9 @@
...
@@ -185,7 +194,9 @@
await tick();
await tick();
goto('/');
goto('/');
}
}
await chats.set(await getChatList(localStorage.token));
await chats.set(
await getChatList(localStorage.token, 0, $pageSkip * $pageLimit || $pageLimit)
);
await pinnedChats.set(await getChatListByTagName(localStorage.token, 'pinned'));
await pinnedChats.set(await getChatListByTagName(localStorage.token, 'pinned'));
}
}
};
};
...
@@ -235,6 +246,9 @@
...
@@ -235,6 +246,9 @@
? ''
? ''
: 'invisible'}"
: 'invisible'}"
>
>
<h1 class="text-red-400 text-bold text-xl">
Chats loaded: {$chats.length}
</h1>
<div class="px-2.5 flex justify-between space-x-1 text-gray-600 dark:text-gray-400">
<div class="px-2.5 flex justify-between space-x-1 text-gray-600 dark:text-gray-400">
<a
<a
id="sidebar-new-chat-button"
id="sidebar-new-chat-button"
...
@@ -410,7 +424,15 @@
...
@@ -410,7 +424,15 @@
class="w-full rounded-r-xl py-1.5 pl-2.5 pr-4 text-sm bg-transparent dark:text-gray-300 outline-none"
class="w-full rounded-r-xl py-1.5 pl-2.5 pr-4 text-sm bg-transparent dark:text-gray-300 outline-none"
placeholder={$i18n.t('Search')}
placeholder={$i18n.t('Search')}
bind:value={search}
bind:value={search}
on:focus={() => {
on:focus={async () => {
// loading all chats. disable pagination on scrol.
scrollPaginationEnabled.set(false);
// subsequent queries will calculate page size to rehydrate the ui.
// since every chat is already loaded, the calculation should now load all chats.
pageSkip.set(0);
pageLimit.set(-1);
await chats.set(await getChatList(localStorage.token)); // when searching, load all chats
enrichChatsWithContent($chats);
enrichChatsWithContent($chats);
}}
}}
/>
/>
...
@@ -422,7 +444,13 @@
...
@@ -422,7 +444,13 @@
<button
<button
class="px-2.5 text-xs font-medium bg-gray-50 dark:bg-gray-900 dark:hover:bg-gray-800 transition rounded-full"
class="px-2.5 text-xs font-medium bg-gray-50 dark:bg-gray-900 dark:hover:bg-gray-800 transition rounded-full"
on:click={async () => {
on:click={async () => {
await chats.set(await getChatList(localStorage.token));
scrollPaginationEnabled.set(false);
pageSkip.set(0);
pageLimit.set(-1);
await chats.set(
await getChatList(localStorage.token, $pageSkip * $pageLimit, $pageLimit)
);
}}
}}
>
>
{$i18n.t('all')}
{$i18n.t('all')}
...
@@ -433,9 +461,18 @@
...
@@ -433,9 +461,18 @@
on:click={async () => {
on:click={async () => {
let chatIds = await getChatListByTagName(localStorage.token, tag.name);
let chatIds = await getChatListByTagName(localStorage.token, tag.name);
if (chatIds.length === 0) {
if (chatIds.length === 0) {
// no chats found in the tag
await tags.set(await getAllChatTags(localStorage.token));
await tags.set(await getAllChatTags(localStorage.token));
chatIds = await getChatList(localStorage.token);
scrollPaginationEnabled.set(false);
pageSkip.set(0);
pageLimit.set(-1);
chatIds = await getChatList(
localStorage.token,
$pageSkip * $pageLimit,
$pageLimit
);
}
}
tagView = true;
await chats.set(chatIds);
await chats.set(chatIds);
}}
}}
>
>
...
@@ -477,7 +514,33 @@
...
@@ -477,7 +514,33 @@
</div>
</div>
{/if}
{/if}
<div class="pl-2 my-2 flex-1 flex flex-col space-y-1 overflow-y-auto scrollbar-hidden">
<div
class="pl-2 my-2 flex-1 flex flex-col space-y-1 overflow-y-auto scrollbar-hidden"
on:scroll={async (e) => {
if (!$scrollPaginationEnabled) return;
if (tagView) return;
if (nextPageLoading) return;
if (chatPagniationComplete) return;
const maxScroll = e.target.scrollHeight - e.target.clientHeight;
const currentPos = e.target.scrollTop;
const ratio = currentPos / maxScroll;
if (ratio >= paginationScrollThreashold) {
nextPageLoading = true;
pageSkip.set($pageSkip + 1);
// extend existing chats
const nextPageChats = await getChatList(
localStorage.token,
$pageSkip * $pageLimit,
$pageLimit
);
// once the bottom of the list has been reached (no results) there is no need to continue querying
chatPagniationComplete = nextPageChats.length === 0;
await chats.set([...$chats, ...nextPageChats]);
nextPageLoading = false;
}
}}
>
{#each filteredChatList as chat, idx}
{#each filteredChatList as chat, idx}
{#if idx === 0 || (idx > 0 && chat.time_range !== filteredChatList[idx - 1].time_range)}
{#if idx === 0 || (idx > 0 && chat.time_range !== filteredChatList[idx - 1].time_range)}
<div
<div
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment