helpy4/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich synced 2025-11-07 17:27:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(web): prevent fetching asset info twice (#8486)

Browse source
This commit is contained in:
Michel Heusschen 2024-04-04 03:20:54 +02:00 • committed by GitHub
parent 0529076ed7
commit 66650f5944
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 47 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

24
web/src/lib/stores/asset-viewing.store.ts
View file

@ -7,24 +7,17 @@ function createAssetViewingStore() {
const preloadAssets = writable<AssetResponseDto[]>([]);
const viewState = writable<boolean>(false);
const setAssetId = async (id: string, preloadIds?: string[]) => {
const data = await getAssetInfo({ id, key: getKey() });
if (preloadIds) {
const preloadList = [];
for (const preloadId of preloadIds) {
if (preloadId) {
const preloadAsset = await getAssetInfo({ id: preloadId, key: getKey() });
preloadList.push(preloadAsset);
}
}
preloadAssets.set(preloadList);
}
viewingAssetStoreState.set(data);
const setAsset = (asset: AssetResponseDto, assetsToPreload: AssetResponseDto[] = []) => {
preloadAssets.set(assetsToPreload);
viewingAssetStoreState.set(asset);
viewState.set(true);
};
const setAssetId = async (id: string) => {
const asset = await getAssetInfo({ id, key: getKey() });
setAsset(asset);
};
const showAssetViewer = (show: boolean) => {
viewState.set(show);
};
@ -40,6 +33,7 @@ function createAssetViewingStore() {
subscribe: viewState.subscribe,
set: viewState.set,
},
setAsset,
setAssetId,
showAssetViewer,
};

16
web/src/lib/stores/asset.store.spec.ts
View file

@ -286,7 +286,7 @@ describe('AssetStore', () => {
});
});
describe('getPreviousAssetId', () => {
describe('getPreviousAsset', () => {
let assetStore: AssetStore;
const bucketAssets: Record<string, AssetResponseDto[]> = {
'2024-03-01T00:00:00.000Z': assetFactory.buildList(1),
@ -307,15 +307,15 @@ describe('AssetStore', () => {
});
it('returns null for invalid assetId', async () => {
expect(() => assetStore.getPreviousAssetId('invalid')).not.toThrow();
expect(await assetStore.getPreviousAssetId('invalid')).toBeNull();
expect(() => assetStore.getPreviousAsset('invalid')).not.toThrow();
expect(await assetStore.getPreviousAsset('invalid')).toBeNull();
});
it('returns previous assetId', async () => {
await assetStore.loadBucket('2024-01-01T00:00:00.000Z', BucketPosition.Visible);
const bucket = assetStore.getBucketByDate('2024-01-01T00:00:00.000Z');
expect(await assetStore.getPreviousAssetId(bucket!.assets[1].id)).toEqual(bucket!.assets[0].id);
expect(await assetStore.getPreviousAsset(bucket!.assets[1].id)).toEqual(bucket!.assets[0]);
});
it('returns previous assetId spanning multiple buckets', async () => {
@ -324,7 +324,7 @@ describe('AssetStore', () => {
const bucket = assetStore.getBucketByDate('2024-02-01T00:00:00.000Z');
const previousBucket = assetStore.getBucketByDate('2024-03-01T00:00:00.000Z');
expect(await assetStore.getPreviousAssetId(bucket!.assets[0].id)).toEqual(previousBucket!.assets[0].id);
expect(await assetStore.getPreviousAsset(bucket!.assets[0].id)).toEqual(previousBucket!.assets[0]);
});
it('loads previous bucket', async () => {
@ -333,7 +333,7 @@ describe('AssetStore', () => {
const loadBucketSpy = vi.spyOn(assetStore, 'loadBucket');
const bucket = assetStore.getBucketByDate('2024-02-01T00:00:00.000Z');
const previousBucket = assetStore.getBucketByDate('2024-03-01T00:00:00.000Z');
expect(await assetStore.getPreviousAssetId(bucket!.assets[0].id)).toEqual(previousBucket!.assets[0].id);
expect(await assetStore.getPreviousAsset(bucket!.assets[0].id)).toEqual(previousBucket!.assets[0]);
expect(loadBucketSpy).toBeCalledTimes(1);
});
@ -344,12 +344,12 @@ describe('AssetStore', () => {
const [assetOne, assetTwo, assetThree] = assetStore.assets;
assetStore.removeAssets([assetTwo.id]);
expect(await assetStore.getPreviousAssetId(assetThree.id)).toEqual(assetOne.id);
expect(await assetStore.getPreviousAsset(assetThree.id)).toEqual(assetOne);
});
it('returns null when no more assets', async () => {
await assetStore.loadBucket('2024-03-01T00:00:00.000Z', BucketPosition.Visible);
expect(await assetStore.getPreviousAssetId(assetStore.assets[0].id)).toBeNull();
expect(await assetStore.getPreviousAsset(assetStore.assets[0].id)).toBeNull();
});
});

12
web/src/lib/stores/assets.store.ts
View file

@ -451,7 +451,7 @@ export class AssetStore {
this.emit(true);
}
async getPreviousAssetId(assetId: string): Promise<string | null> {
async getPreviousAsset(assetId: string): Promise<AssetResponseDto | null> {
const info = this.getBucketInfoForAssetId(assetId);
if (!info) {
return null;
@ -460,7 +460,7 @@ export class AssetStore {
const { bucket, assetIndex, bucketIndex } = info;
if (assetIndex !== 0) {
return bucket.assets[assetIndex - 1].id;
return bucket.assets[assetIndex - 1];
}
if (bucketIndex === 0) {
@ -469,10 +469,10 @@ export class AssetStore {
const previousBucket = this.buckets[bucketIndex - 1];
await this.loadBucket(previousBucket.bucketDate, BucketPosition.Unknown);
return previousBucket.assets.at(-1)?.id || null;
return previousBucket.assets.at(-1) || null;
}
async getNextAssetId(assetId: string): Promise<string | null> {
async getNextAsset(assetId: string): Promise<AssetResponseDto | null> {
const info = this.getBucketInfoForAssetId(assetId);
if (!info) {
return null;
@ -481,7 +481,7 @@ export class AssetStore {
const { bucket, assetIndex, bucketIndex } = info;
if (assetIndex !== bucket.assets.length - 1) {
return bucket.assets[assetIndex + 1].id;
return bucket.assets[assetIndex + 1];
}
if (bucketIndex === this.buckets.length - 1) {
@ -490,7 +490,7 @@ export class AssetStore {
const nextBucket = this.buckets[bucketIndex + 1];
await this.loadBucket(nextBucket.bucketDate, BucketPosition.Unknown);
return nextBucket.assets[0]?.id || null;
return nextBucket.assets[0] || null;
}
triggerUpdate() {