c-l/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2024-12-29 15:11:58 +00:00
Code Releases Activity

fix(web): hide detail panel for shared links with hidden metadata (#9700)

Browse source
This commit is contained in:
Michel Heusschen 2024-05-23 18:39:06 +02:00 committed by GitHub
parent e7aa50425c
commit 8bfa6769a5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 49 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
e2e/src/web/specs/asset-viewer/detail-panel.e2e-spec.ts Normal file
View file

@ -0,0 +1,46 @@
import { AssetFileUploadResponseDto, LoginResponseDto, SharedLinkType } from '@immich/sdk';
import { expect, test } from '@playwright/test';
import { utils } from 'src/utils';
test.describe('Detail Panel', () => {
let admin: LoginResponseDto;
let asset: AssetFileUploadResponseDto;
test.beforeAll(async () => {
utils.initSdk();
await utils.resetDatabase();
admin = await utils.adminSetup();
asset = await utils.createAsset(admin.accessToken);
});
test('can be opened for shared links', async ({ page }) => {
const sharedLink = await utils.createSharedLink(admin.accessToken, {
type: SharedLinkType.Individual,
assetIds: [asset.id],
});
await page.goto(`/share/${sharedLink.key}/photos/${asset.id}`);
await page.waitForSelector('#immich-asset-viewer');
await expect(page.getByRole('button', { name: 'Info' })).toBeVisible();
await page.keyboard.press('i');
await expect(page.locator('#detail-panel')).toBeVisible();
await page.keyboard.press('i');
await expect(page.locator('#detail-panel')).toHaveCount(0);
});
test('cannot be opened for shared links with hidden metadata', async ({ page }) => {
const sharedLink = await utils.createSharedLink(admin.accessToken, {
type: SharedLinkType.Individual,
assetIds: [asset.id],
showMetadata: false,
});
await page.goto(`/share/${sharedLink.key}/photos/${asset.id}`);
await page.waitForSelector('#immich-asset-viewer');
await expect(page.getByRole('button', { name: 'Info' })).toHaveCount(0);
await page.keyboard.press('i');
await expect(page.locator('#detail-panel')).toHaveCount(0);
await page.keyboard.press('i');
await expect(page.locator('#detail-panel')).toHaveCount(0);
});
});

6
web/src/lib/components/asset-viewer/asset-viewer.svelte
View file

@ -88,7 +88,7 @@
let isShowProfileImageCrop = false; let isShowProfileImageCrop = false;
let sharedLink = getSharedLink(); let sharedLink = getSharedLink();
let shouldShowDownloadButton = sharedLink ? sharedLink.allowDownload : !asset.isOffline; let shouldShowDownloadButton = sharedLink ? sharedLink.allowDownload : !asset.isOffline;
let shouldShowDetailButton = asset.hasMetadata; let enableDetailPanel = asset.hasMetadata;
let shouldShowShareModal = !asset.isTrashed; let shouldShowShareModal = !asset.isTrashed;
let canCopyImagesToClipboard: boolean; let canCopyImagesToClipboard: boolean;
let slideshowStateUnsubscribe: () => void; let slideshowStateUnsubscribe: () => void;
@ -574,7 +574,7 @@
showZoomButton={asset.type === AssetTypeEnum.Image} showZoomButton={asset.type === AssetTypeEnum.Image}
showMotionPlayButton={!!asset.livePhotoVideoId} showMotionPlayButton={!!asset.livePhotoVideoId}
showDownloadButton={shouldShowDownloadButton} showDownloadButton={shouldShowDownloadButton}
showDetailButton={shouldShowDetailButton} showDetailButton={enableDetailPanel}
showSlideshow={!!assetStore} showSlideshow={!!assetStore}
hasStackChildren={$stackAssetsStore.length > 0} hasStackChildren={$stackAssetsStore.length > 0}
showShareButton={shouldShowShareModal} showShareButton={shouldShowShareModal}
@ -701,7 +701,7 @@
</div> </div>
{/if} {/if}
{#if $slideshowState === SlideshowState.None && $isShowDetail} {#if enableDetailPanel && $slideshowState === SlideshowState.None && $isShowDetail}
<div <div
transition:fly={{ duration: 150 }} transition:fly={{ duration: 150 }}
id="detail-panel" id="detail-panel"