mirror of
				https://github.com/immich-app/immich.git
				synced 2025-11-04 03:39:37 -05:00 
			
		
		
		
	fix(web): navigate to album from search (#5241)
This commit is contained in:
		
							parent
							
								
									106bae4a31
								
							
						
					
					
						commit
						309ba7d67e
					
				@ -7,6 +7,7 @@
 | 
			
		||||
  import { flip } from 'svelte/animate';
 | 
			
		||||
  import { getThumbnailSize } from '$lib/utils/thumbnail-util';
 | 
			
		||||
  import { assetViewingStore } from '$lib/stores/asset-viewing.store';
 | 
			
		||||
  import { onDestroy } from 'svelte';
 | 
			
		||||
 | 
			
		||||
  export let assets: AssetResponseDto[];
 | 
			
		||||
  export let selectedAssets: Set<AssetResponseDto> = new Set();
 | 
			
		||||
@ -80,6 +81,10 @@
 | 
			
		||||
    $showAssetViewer = false;
 | 
			
		||||
    history.pushState(null, '', `${$page.url.pathname}`);
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  onDestroy(() => {
 | 
			
		||||
    $showAssetViewer = false;
 | 
			
		||||
  });
 | 
			
		||||
</script>
 | 
			
		||||
 | 
			
		||||
{#if assets.length > 0}
 | 
			
		||||
 | 
			
		||||
@ -121,7 +121,7 @@
 | 
			
		||||
  afterNavigate(({ from }) => {
 | 
			
		||||
    assetViewingStore.showAssetViewer(false);
 | 
			
		||||
 | 
			
		||||
    let url: string | undefined = from?.url.pathname;
 | 
			
		||||
    let url: string | undefined = from?.url?.pathname;
 | 
			
		||||
 | 
			
		||||
    if (from?.route.id === '/(user)/search') {
 | 
			
		||||
      url = from.url.href;
 | 
			
		||||
 | 
			
		||||
@ -70,7 +70,7 @@
 | 
			
		||||
 | 
			
		||||
  afterNavigate(({ from }) => {
 | 
			
		||||
    // Prevent setting previousRoute to the current page.
 | 
			
		||||
    if (from && from.route.id !== $page.route.id) {
 | 
			
		||||
    if (from?.url && from.route.id !== $page.route.id) {
 | 
			
		||||
      previousRoute = from.url.href;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
@ -145,7 +145,7 @@
 | 
			
		||||
      </section>
 | 
			
		||||
    {/if}
 | 
			
		||||
    <section id="search-content" class="relative bg-immich-bg dark:bg-immich-dark-bg">
 | 
			
		||||
      {#if data.results?.assets?.items.length > 0}
 | 
			
		||||
      {#if searchResultAssets.length > 0}
 | 
			
		||||
        <div class="pl-4">
 | 
			
		||||
          <GalleryViewer assets={searchResultAssets} bind:selectedAssets showArchiveIcon={true} />
 | 
			
		||||
        </div>
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user