mirror of
				https://github.com/immich-app/immich.git
				synced 2025-11-03 19:29:32 -05:00 
			
		
		
		
	fix(web): update assets after delete (#9151)
* upadte assets after delete * fix lint/format * handle archive action * chore: cleanup --------- Co-authored-by: Jason Rasmussen <jrasm91@gmail.com>
This commit is contained in:
		
							parent
							
								
									ef09fc4157
								
							
						
					
					
						commit
						b7d0bc16bb
					
				@ -67,23 +67,25 @@
 | 
				
			|||||||
    {/if}
 | 
					    {/if}
 | 
				
			||||||
    <div class="inline-block" bind:offsetWidth={innerWidth}>
 | 
					    <div class="inline-block" bind:offsetWidth={innerWidth}>
 | 
				
			||||||
      {#each $memoryStore as memory, index (memory.yearsAgo)}
 | 
					      {#each $memoryStore as memory, index (memory.yearsAgo)}
 | 
				
			||||||
        <button
 | 
					        {#if memory.assets.length > 0}
 | 
				
			||||||
          class="memory-card relative mr-8 inline-block aspect-video h-[215px] rounded-xl"
 | 
					          <button
 | 
				
			||||||
          on:click={() => goto(`${AppRoute.MEMORY}?${QueryParameter.MEMORY_INDEX}=${index}`)}
 | 
					            class="memory-card relative mr-8 inline-block aspect-video h-[215px] rounded-xl"
 | 
				
			||||||
        >
 | 
					            on:click={() => goto(`${AppRoute.MEMORY}?${QueryParameter.MEMORY_INDEX}=${index}`)}
 | 
				
			||||||
          <img
 | 
					          >
 | 
				
			||||||
            class="h-full w-full rounded-xl object-cover"
 | 
					            <img
 | 
				
			||||||
            src={getAssetThumbnailUrl(memory.assets[0].id, ThumbnailFormat.Webp)}
 | 
					              class="h-full w-full rounded-xl object-cover"
 | 
				
			||||||
            alt={`Memory Lane ${getAltText(memory.assets[0])}`}
 | 
					              src={getAssetThumbnailUrl(memory.assets[0].id, ThumbnailFormat.Webp)}
 | 
				
			||||||
            draggable="false"
 | 
					              alt={`Memory Lane ${getAltText(memory.assets[0])}`}
 | 
				
			||||||
          />
 | 
					              draggable="false"
 | 
				
			||||||
          <p class="absolute bottom-2 left-4 z-10 text-lg text-white">
 | 
					            />
 | 
				
			||||||
            {memoryLaneTitle(memory.yearsAgo)}
 | 
					            <p class="absolute bottom-2 left-4 z-10 text-lg text-white">
 | 
				
			||||||
          </p>
 | 
					              {memoryLaneTitle(memory.yearsAgo)}
 | 
				
			||||||
          <div
 | 
					            </p>
 | 
				
			||||||
            class="absolute left-0 top-0 z-0 h-full w-full rounded-xl bg-gradient-to-t from-black/40 via-transparent to-transparent transition-all hover:bg-black/20"
 | 
					            <div
 | 
				
			||||||
          />
 | 
					              class="absolute left-0 top-0 z-0 h-full w-full rounded-xl bg-gradient-to-t from-black/40 via-transparent to-transparent transition-all hover:bg-black/20"
 | 
				
			||||||
        </button>
 | 
					            />
 | 
				
			||||||
 | 
					          </button>
 | 
				
			||||||
 | 
					        {/if}
 | 
				
			||||||
      {/each}
 | 
					      {/each}
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
  </section>
 | 
					  </section>
 | 
				
			||||||
 | 
				
			|||||||
@ -11,6 +11,8 @@
 | 
				
			|||||||
  import { getAssetRatio } from '$lib/utils/asset-utils';
 | 
					  import { getAssetRatio } from '$lib/utils/asset-utils';
 | 
				
			||||||
  import { calculateWidth } from '$lib/utils/timeline-util';
 | 
					  import { calculateWidth } from '$lib/utils/timeline-util';
 | 
				
			||||||
  import { navigate } from '$lib/utils/navigation';
 | 
					  import { navigate } from '$lib/utils/navigation';
 | 
				
			||||||
 | 
					  import { AppRoute, AssetAction } from '$lib/constants';
 | 
				
			||||||
 | 
					  import { goto } from '$app/navigation';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  const dispatch = createEventDispatcher<{ intersected: { container: HTMLDivElement; position: BucketPosition } }>();
 | 
					  const dispatch = createEventDispatcher<{ intersected: { container: HTMLDivElement; position: BucketPosition } }>();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -20,7 +22,7 @@
 | 
				
			|||||||
  export let showArchiveIcon = false;
 | 
					  export let showArchiveIcon = false;
 | 
				
			||||||
  export let viewport: Viewport;
 | 
					  export let viewport: Viewport;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  let { isViewing: showAssetViewer, asset: viewingAsset, setAsset } = assetViewingStore;
 | 
					  let { isViewing: isViewerOpen, asset: viewingAsset, setAsset } = assetViewingStore;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  let currentViewAssetIndex = 0;
 | 
					  let currentViewAssetIndex = 0;
 | 
				
			||||||
  $: isMultiSelectionMode = selectedAssets.size > 0;
 | 
					  $: isMultiSelectionMode = selectedAssets.size > 0;
 | 
				
			||||||
@ -43,7 +45,7 @@
 | 
				
			|||||||
    selectedAssets = temporary;
 | 
					    selectedAssets = temporary;
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  const navigateAssetForward = async () => {
 | 
					  const handleNext = async () => {
 | 
				
			||||||
    try {
 | 
					    try {
 | 
				
			||||||
      if (currentViewAssetIndex < assets.length - 1) {
 | 
					      if (currentViewAssetIndex < assets.length - 1) {
 | 
				
			||||||
        setAsset(assets[++currentViewAssetIndex]);
 | 
					        setAsset(assets[++currentViewAssetIndex]);
 | 
				
			||||||
@ -54,7 +56,7 @@
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  const navigateAssetBackward = async () => {
 | 
					  const handlePrevious = async () => {
 | 
				
			||||||
    try {
 | 
					    try {
 | 
				
			||||||
      if (currentViewAssetIndex > 0) {
 | 
					      if (currentViewAssetIndex > 0) {
 | 
				
			||||||
        setAsset(assets[--currentViewAssetIndex]);
 | 
					        setAsset(assets[--currentViewAssetIndex]);
 | 
				
			||||||
@ -65,8 +67,30 @@
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  const handleAction = async (action: AssetAction, asset: AssetResponseDto) => {
 | 
				
			||||||
 | 
					    switch (action) {
 | 
				
			||||||
 | 
					      case AssetAction.ARCHIVE:
 | 
				
			||||||
 | 
					      case AssetAction.DELETE:
 | 
				
			||||||
 | 
					      case AssetAction.TRASH: {
 | 
				
			||||||
 | 
					        assets.splice(
 | 
				
			||||||
 | 
					          assets.findIndex((a) => a.id === asset.id),
 | 
				
			||||||
 | 
					          1,
 | 
				
			||||||
 | 
					        );
 | 
				
			||||||
 | 
					        assets = assets;
 | 
				
			||||||
 | 
					        if (assets.length === 0) {
 | 
				
			||||||
 | 
					          await goto(AppRoute.PHOTOS);
 | 
				
			||||||
 | 
					        } else if (currentViewAssetIndex === assets.length) {
 | 
				
			||||||
 | 
					          await handlePrevious();
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					          setAsset(assets[currentViewAssetIndex]);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  onDestroy(() => {
 | 
					  onDestroy(() => {
 | 
				
			||||||
    $showAssetViewer = false;
 | 
					    $isViewerOpen = false;
 | 
				
			||||||
  });
 | 
					  });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  $: geometry = (() => {
 | 
					  $: geometry = (() => {
 | 
				
			||||||
@ -114,8 +138,13 @@
 | 
				
			|||||||
{/if}
 | 
					{/if}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<!-- Overlay Asset Viewer -->
 | 
					<!-- Overlay Asset Viewer -->
 | 
				
			||||||
{#if $showAssetViewer}
 | 
					{#if $isViewerOpen}
 | 
				
			||||||
  <Portal target="body">
 | 
					  <Portal target="body">
 | 
				
			||||||
    <AssetViewer asset={$viewingAsset} on:previous={navigateAssetBackward} on:next={navigateAssetForward} />
 | 
					    <AssetViewer
 | 
				
			||||||
 | 
					      asset={$viewingAsset}
 | 
				
			||||||
 | 
					      on:action={({ detail: action }) => handleAction(action.type, action.asset)}
 | 
				
			||||||
 | 
					      on:previous={handlePrevious}
 | 
				
			||||||
 | 
					      on:next={handleNext}
 | 
				
			||||||
 | 
					    />
 | 
				
			||||||
  </Portal>
 | 
					  </Portal>
 | 
				
			||||||
{/if}
 | 
					{/if}
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user