Skip to content

Commit df7ec4d

Browse files
michelheusschenyosit
authored andcommitted
fix: show tags when viewing stacked assets (immich-app#14199)
fix: refresh tags when viewing stacked assets
1 parent 4957170 commit df7ec4d

File tree

4 files changed

+85
-1
lines changed

4 files changed

+85
-1
lines changed

Diff for: e2e/src/utils.ts

+17
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
PersonCreateDto,
1212
SharedLinkCreateDto,
1313
UserAdminCreateDto,
14+
UserPreferencesUpdateDto,
1415
ValidateLibraryDto,
1516
checkExistingAssets,
1617
createAlbum,
@@ -19,6 +20,7 @@ import {
1920
createPartner,
2021
createPerson,
2122
createSharedLink,
23+
createStack,
2224
createUserAdmin,
2325
deleteAssets,
2426
getAllJobsStatus,
@@ -28,10 +30,13 @@ import {
2830
searchMetadata,
2931
setBaseUrl,
3032
signUpAdmin,
33+
tagAssets,
3134
updateAdminOnboarding,
3235
updateAlbumUser,
3336
updateAssets,
3437
updateConfig,
38+
updateMyPreferences,
39+
upsertTags,
3540
validate,
3641
} from '@immich/sdk';
3742
import { BrowserContext } from '@playwright/test';
@@ -444,6 +449,18 @@ export const utils = {
444449

445450
createPartner: (accessToken: string, id: string) => createPartner({ id }, { headers: asBearerAuth(accessToken) }),
446451

452+
updateMyPreferences: (accessToken: string, userPreferencesUpdateDto: UserPreferencesUpdateDto) =>
453+
updateMyPreferences({ userPreferencesUpdateDto }, { headers: asBearerAuth(accessToken) }),
454+
455+
createStack: (accessToken: string, assetIds: string[]) =>
456+
createStack({ stackCreateDto: { assetIds } }, { headers: asBearerAuth(accessToken) }),
457+
458+
upsertTags: (accessToken: string, tags: string[]) =>
459+
upsertTags({ tagUpsertDto: { tags } }, { headers: asBearerAuth(accessToken) }),
460+
461+
tagAssets: (accessToken: string, tagId: string, assetIds: string[]) =>
462+
tagAssets({ id: tagId, bulkIdsDto: { ids: assetIds } }, { headers: asBearerAuth(accessToken) }),
463+
447464
setAuthCookies: async (context: BrowserContext, accessToken: string, domain = '127.0.0.1') =>
448465
await context.addCookies([
449466
{

Diff for: e2e/src/web/specs/asset-viewer/stack.e2e-spec.ts

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
import { AssetMediaResponseDto, LoginResponseDto } from '@immich/sdk';
2+
import { expect, Page, test } from '@playwright/test';
3+
import { utils } from 'src/utils';
4+
5+
async function ensureDetailPanelVisible(page: Page) {
6+
await page.waitForSelector('#immich-asset-viewer');
7+
8+
const isVisible = await page.locator('#detail-panel').isVisible();
9+
if (!isVisible) {
10+
await page.keyboard.press('i');
11+
await page.waitForSelector('#detail-panel');
12+
}
13+
}
14+
15+
test.describe('Asset Viewer stack', () => {
16+
let admin: LoginResponseDto;
17+
let assetOne: AssetMediaResponseDto;
18+
let assetTwo: AssetMediaResponseDto;
19+
20+
test.beforeAll(async () => {
21+
utils.initSdk();
22+
await utils.resetDatabase();
23+
admin = await utils.adminSetup();
24+
await utils.updateMyPreferences(admin.accessToken, { tags: { enabled: true } });
25+
26+
assetOne = await utils.createAsset(admin.accessToken);
27+
assetTwo = await utils.createAsset(admin.accessToken);
28+
await utils.createStack(admin.accessToken, [assetOne.id, assetTwo.id]);
29+
30+
const tags = await utils.upsertTags(admin.accessToken, ['test/1', 'test/2']);
31+
const tagOne = tags.find((tag) => tag.value === 'test/1')!;
32+
const tagTwo = tags.find((tag) => tag.value === 'test/2')!;
33+
await utils.tagAssets(admin.accessToken, tagOne.id, [assetOne.id]);
34+
await utils.tagAssets(admin.accessToken, tagTwo.id, [assetTwo.id]);
35+
});
36+
37+
test('stack slideshow is visible', async ({ page, context }) => {
38+
await utils.setAuthCookies(context, admin.accessToken);
39+
await page.goto(`/photos/${assetOne.id}`);
40+
41+
const stackAssets = page.locator('#stack-slideshow [data-asset]');
42+
await expect(stackAssets.first()).toBeVisible();
43+
await expect(stackAssets.nth(1)).toBeVisible();
44+
});
45+
46+
test('tags of primary asset are visible', async ({ page, context }) => {
47+
await utils.setAuthCookies(context, admin.accessToken);
48+
await page.goto(`/photos/${assetOne.id}`);
49+
await ensureDetailPanelVisible(page);
50+
51+
const tags = page.getByTestId('detail-panel-tags').getByRole('link');
52+
await expect(tags.first()).toHaveText('test/1');
53+
});
54+
55+
test('tags of second asset are visible', async ({ page, context }) => {
56+
await utils.setAuthCookies(context, admin.accessToken);
57+
await page.goto(`/photos/${assetOne.id}`);
58+
await ensureDetailPanelVisible(page);
59+
60+
const stackAssets = page.locator('#stack-slideshow [data-asset]');
61+
await stackAssets.nth(1).click();
62+
63+
const tags = page.getByTestId('detail-panel-tags').getByRole('link');
64+
await expect(tags.first()).toHaveText('test/2');
65+
});
66+
});

Diff for: server/src/repositories/stack.repository.ts

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ export class StackRepository implements IStackRepository {
127127
relations: {
128128
assets: {
129129
exifInfo: true,
130+
tags: true,
130131
},
131132
},
132133
order: {

Diff for: web/src/lib/components/asset-viewer/detail-panel-tags.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<div class="flex h-10 w-full items-center justify-between text-sm">
4747
<h2>{$t('tags').toUpperCase()}</h2>
4848
</div>
49-
<section class="flex flex-wrap pt-2 gap-1">
49+
<section class="flex flex-wrap pt-2 gap-1" data-testid="detail-panel-tags">
5050
{#each tags as tag (tag.id)}
5151
<div class="flex group transition-all">
5252
<a

0 commit comments

Comments
 (0)