feat(web) Add search functionality to add photo to album modal (#1273)

This commit is contained in:
Krisjanis Lejejs 2023-01-09 22:24:07 +02:00 committed by GitHub
parent 10789503c1
commit e4e040f14b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 74 additions and 31 deletions

View File

@ -6,11 +6,26 @@
export let album: AlbumResponseDto; export let album: AlbumResponseDto;
export let variant: 'simple' | 'full' = 'full'; export let variant: 'simple' | 'full' = 'full';
export let searchQuery: string = '';
let albumNameArray: string[] = ['', '', ''];
// This part of the code is responsible for splitting album name into 3 parts where part 2 is the search query
// It is used to highlight the search query in the album name
$: {
let { albumName } = album;
let findIndex = albumName.toLowerCase().indexOf(searchQuery.toLowerCase());
let findLength = searchQuery.length;
albumNameArray = [
albumName.slice(0, findIndex),
albumName.slice(findIndex, findIndex + findLength),
albumName.slice(findIndex + findLength)
];
}
</script> </script>
<button <button
on:click={() => dispatcher('album')} on:click={() => dispatcher('album')}
class="flex gap-4 px-6 py-2 hover:bg-gray-200 dark:hover:bg-gray-700 transition-colors" class="w-full flex gap-4 px-6 py-2 hover:bg-gray-200 dark:hover:bg-gray-700 transition-colors"
> >
<div class="h-12 w-12"> <div class="h-12 w-12">
<img <img
@ -21,7 +36,7 @@
/> />
</div> </div>
<div class="h-12 flex flex-col items-start justify-center"> <div class="h-12 flex flex-col items-start justify-center">
<span>{album.albumName}</span> <span>{albumNameArray[0]}<b>{albumNameArray[1]}</b>{albumNameArray[2]}</span>
<span class="flex gap-1 text-sm"> <span class="flex gap-1 text-sm">
{#if variant === 'simple'} {#if variant === 'simple'}
<span <span

View File

@ -210,9 +210,11 @@
addToSharedAlbum = shared; addToSharedAlbum = shared;
}; };
const handleAddToNewAlbum = () => { const handleAddToNewAlbum = (event: CustomEvent) => {
isShowAlbumPicker = false; isShowAlbumPicker = false;
api.albumApi.createAlbum({ albumName: 'Untitled', assetIds: [asset.id] }).then((response) => {
const { albumName }: { albumName: string } = event.detail;
api.albumApi.createAlbum({ albumName, assetIds: [asset.id] }).then((response) => {
const album = response.data; const album = response.data;
goto('/albums/' + album.id); goto('/albums/' + album.id);
}); });

View File

@ -7,7 +7,9 @@
let albums: AlbumResponseDto[] = []; let albums: AlbumResponseDto[] = [];
let recentAlbums: AlbumResponseDto[] = []; let recentAlbums: AlbumResponseDto[] = [];
let filteredAlbums: AlbumResponseDto[] = [];
let loading = true; let loading = true;
let search = '';
const dispatch = createEventDispatcher(); const dispatch = createEventDispatcher();
@ -32,15 +34,25 @@
loading = false; loading = false;
}); });
$: {
if (search.length > 0 && albums.length > 0) {
filteredAlbums = albums.filter((album) => {
return album.albumName.toLowerCase().includes(search.toLowerCase());
});
} else {
filteredAlbums = albums;
}
}
const handleSelect = (album: AlbumResponseDto) => { const handleSelect = (album: AlbumResponseDto) => {
dispatch('album', { album }); dispatch('album', { album });
}; };
const handleNew = () => { const handleNew = () => {
if (shared) { if (shared) {
dispatch('newAlbum'); dispatch('newAlbum', { albumName: search.length > 0 ? search : 'Untitled' });
} else { } else {
dispatch('newSharedAlbum'); dispatch('newSharedAlbum', { albumName: search.length > 0 ? search : 'Untitled' });
} }
}; };
</script> </script>
@ -54,8 +66,7 @@
</span> </span>
</svelte:fragment> </svelte:fragment>
<div class=" max-h-[400px] overflow-y-auto immich-scrollba pb-10"> <div class="max-h-[400px] flex flex-col mb-2">
<div class="flex flex-col mb-2">
{#if loading} {#if loading}
{#each { length: 3 } as _} {#each { length: 3 } as _}
<div class="animate-pulse flex gap-4 px-6 py-2"> <div class="animate-pulse flex gap-4 px-6 py-2">
@ -70,19 +81,27 @@
</div> </div>
{/each} {/each}
{:else} {:else}
<!-- svelte-ignore a11y-autofocus -->
<input
class="px-6 py-2 text-2xl border-b-4 bg-immich-bg border-immich-bg focus:border-immich-primary dark:bg-immich-dark-gray dark:border-immich-dark-gray dark:focus:border-immich-dark-primary"
placeholder="Search"
autofocus
bind:value={search}
/>
<div class="overflow-y-auto immich-scrollbar">
<button <button
on:click={handleNew} on:click={handleNew}
class="flex gap-4 px-6 py-2 hover:bg-gray-200 dark:hover:bg-gray-700 transition-colors items-center" class="w-full flex gap-4 px-6 py-2 hover:bg-gray-200 dark:hover:bg-gray-700 transition-colors items-center"
> >
<div class="h-12 w-12 flex justify-center items-center"> <div class="h-12 w-12 flex justify-center items-center">
<Plus size="30" /> <Plus size="30" />
</div> </div>
<p class=""> <p class="">
New {#if shared}Shared {/if}Album New {#if shared}Shared {/if}Album {#if search.length > 0}<b>{search}</b>{/if}
</p> </p>
</button> </button>
{#if albums.length > 0} {#if filteredAlbums.length > 0}
{#if !shared} {#if !shared && search.length === 0}
<p class="text-xs px-5 py-3">RECENT</p> <p class="text-xs px-5 py-3">RECENT</p>
{#each recentAlbums as album (album.id)} {#each recentAlbums as album (album.id)}
<AlbumListItem variant="simple" {album} on:album={() => handleSelect(album)} /> <AlbumListItem variant="simple" {album} on:album={() => handleSelect(album)} />
@ -90,15 +109,21 @@
{/if} {/if}
{#if !shared} {#if !shared}
<p class="text-xs px-5 py-3">ALL ALBUMS</p> <p class="text-xs px-5 py-3">
{#if search.length === 0}ALL {/if}ALBUMS
</p>
{/if} {/if}
{#each albums as album (album.id)} {#each filteredAlbums as album (album.id)}
<AlbumListItem {album} on:album={() => handleSelect(album)} /> <AlbumListItem {album} searchQuery={search} on:album={() => handleSelect(album)} />
{/each} {/each}
{:else if albums.length > 0}
<p class="text-sm px-5 py-1">
It looks like you do not have any albums with this name yet.
</p>
{:else} {:else}
<p class="text-sm px-5 py-1">It looks like you do not have any albums yet.</p> <p class="text-sm px-5 py-1">It looks like you do not have any albums yet.</p>
{/if} {/if}
</div>
{/if} {/if}
</div> </div>
</div>
</BaseModal> </BaseModal>

View File

@ -79,11 +79,12 @@
addToSharedAlbum = shared; addToSharedAlbum = shared;
}; };
const handleAddToNewAlbum = () => { const handleAddToNewAlbum = (event: CustomEvent) => {
isShowAlbumPicker = false; isShowAlbumPicker = false;
const { albumName }: { albumName: string } = event.detail;
const assetIds = Array.from($selectedAssets).map((asset) => asset.id); const assetIds = Array.from($selectedAssets).map((asset) => asset.id);
api.albumApi.createAlbum({ albumName: 'Untitled', assetIds }).then((response) => { api.albumApi.createAlbum({ albumName, assetIds }).then((response) => {
const { id, albumName } = response.data; const { id, albumName } = response.data;
notificationController.show({ notificationController.show({