refac
This commit is contained in:
1 parent
90bb94abf9
commit
4e03d89414
1 file changed
+27
-5
@@ -339,6 +339,14 @@
|
|||||||
})
|
})
|
||||||
).filter((item) => includeHidden || !(item.model?.info?.meta?.hidden ?? false));
|
).filter((item) => includeHidden || !(item.model?.info?.meta?.hidden ?? false));
|
||||||
|
|
||||||
|
$: showPullModelButton = !!(
|
||||||
|
!selectionOnly &&
|
||||||
|
!(searchValue.trim() in $MODEL_DOWNLOAD_POOL) &&
|
||||||
|
searchValue &&
|
||||||
|
ollamaVersion &&
|
||||||
|
$user?.role === 'admin'
|
||||||
|
);
|
||||||
|
|
||||||
$: if (
|
$: if (
|
||||||
selectedTag !== undefined ||
|
selectedTag !== undefined ||
|
||||||
selectedConnectionType !== undefined ||
|
selectedConnectionType !== undefined ||
|
||||||
@@ -804,12 +812,19 @@
|
|||||||
autocomplete="off"
|
autocomplete="off"
|
||||||
aria-label={$i18n.t('Search In Models')}
|
aria-label={$i18n.t('Search In Models')}
|
||||||
on:keydown={(e) => {
|
on:keydown={(e) => {
|
||||||
if (e.code === 'Enter' && filteredItems.length > 0) {
|
if (e.code === 'Enter') {
|
||||||
selectItem(filteredItems[selectedModelIdx], selectedModelIdx);
|
if (showPullModelButton && selectedModelIdx === filteredItems.length) {
|
||||||
|
pullModelHandler();
|
||||||
|
} else if (filteredItems[selectedModelIdx]) {
|
||||||
|
selectItem(filteredItems[selectedModelIdx], selectedModelIdx);
|
||||||
|
}
|
||||||
return; // dont need to scroll on selection
|
return; // dont need to scroll on selection
|
||||||
} else if (e.code === 'ArrowDown') {
|
} else if (e.code === 'ArrowDown') {
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
selectedModelIdx = Math.min(selectedModelIdx + 1, filteredItems.length - 1);
|
selectedModelIdx = Math.min(
|
||||||
|
selectedModelIdx + 1,
|
||||||
|
Math.max(filteredItems.length - 1 + (showPullModelButton ? 1 : 0), 0)
|
||||||
|
);
|
||||||
} else if (e.code === 'ArrowUp') {
|
} else if (e.code === 'ArrowUp') {
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
selectedModelIdx = Math.max(selectedModelIdx - 1, 0);
|
selectedModelIdx = Math.max(selectedModelIdx - 1, 0);
|
||||||
@@ -932,7 +947,7 @@
|
|||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
{#if !selectionOnly && !(searchValue.trim() in $MODEL_DOWNLOAD_POOL) && searchValue && ollamaVersion && $user?.role === 'admin'}
|
{#if showPullModelButton}
|
||||||
<Tooltip
|
<Tooltip
|
||||||
content={$i18n.t(`Pull "{{searchValue}}" from Ollama.com`, {
|
content={$i18n.t(`Pull "{{searchValue}}" from Ollama.com`, {
|
||||||
searchValue: searchValue
|
searchValue: searchValue
|
||||||
@@ -940,7 +955,14 @@
|
|||||||
placement="top-start"
|
placement="top-start"
|
||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
class="focus-ring flex h-[1.6875rem] w-full cursor-pointer select-none items-center rounded-xl px-2 text-[0.8125rem] font-normal text-gray-700 outline-hidden transition-colors duration-75 hover:bg-gray-50/40 dark:text-gray-100 dark:hover:bg-gray-800/40"
|
type="button"
|
||||||
|
role="option"
|
||||||
|
aria-selected={selectedModelIdx === filteredItems.length}
|
||||||
|
data-arrow-selected={selectedModelIdx === filteredItems.length}
|
||||||
|
class="focus-ring flex h-[1.6875rem] w-full cursor-pointer select-none items-center rounded-xl px-2 text-[0.8125rem] font-normal text-gray-700 outline-hidden transition-colors duration-75 hover:bg-gray-50/40 dark:text-gray-100 dark:hover:bg-gray-800/40 {selectedModelIdx ===
|
||||||
|
filteredItems.length
|
||||||
|
? 'bg-gray-50/70 dark:bg-gray-800/60'
|
||||||
|
: ''}"
|
||||||
on:click={() => {
|
on:click={() => {
|
||||||
pullModelHandler();
|
pullModelHandler();
|
||||||
}}
|
}}
|
||||||
|
|||||||
Reference in new issue
Block a user