immich-app/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-12-27 09:14:55 +03:00
Code Issues Packages Projects Releases 18 Wiki Activity

fix(web): show trash indicator (#12521)

Browse Source
This commit is contained in:
Jason Rasmussen
2024-09-09 16:03:17 -04:00
committed by GitHub
parent 8c3c3357fe
commit d39917a4db
14 changed files with 77 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/src/services/asset-media.service.spec.ts
View File

@@ -589,8 +589,20 @@ describe(AssetMediaService.name, () => {
}),
).resolves.toEqual({
results: [
{ id: '1', assetId: 'asset-1', action: AssetUploadAction.REJECT, reason: AssetRejectReason.DUPLICATE },
{ id: '2', assetId: 'asset-2', action: AssetUploadAction.REJECT, reason: AssetRejectReason.DUPLICATE },
{
id: '1',
assetId: 'asset-1',
action: AssetUploadAction.REJECT,
reason: AssetRejectReason.DUPLICATE,
isTrashed: false,
},
{
id: '2',
assetId: 'asset-2',
action: AssetUploadAction.REJECT,
reason: AssetRejectReason.DUPLICATE,
isTrashed: false,
},
],
});

11
server/src/services/asset-media.service.ts
View File

@@ -289,10 +289,10 @@ export class AssetMediaService {
async bulkUploadCheck(auth: AuthDto, dto: AssetBulkUploadCheckDto): Promise<AssetBulkUploadCheckResponseDto> {
const checksums: Buffer[] = dto.assets.map((asset) => fromChecksum(asset.checksum));
const results = await this.assetRepository.getByChecksums(auth.user.id, checksums);
const checksumMap: Record<string, string> = {};
const checksumMap: Record<string, { id: string; isTrashed: boolean }> = {};
for (const { id, checksum } of results) {
checksumMap[checksum.toString('hex')] = id;
for (const { id, deletedAt, checksum } of results) {
checksumMap[checksum.toString('hex')] = { id, isTrashed: !!deletedAt };
}
return {
@@ -301,14 +301,13 @@ export class AssetMediaService {
if (duplicate) {
return {
id,
assetId: duplicate,
action: AssetUploadAction.REJECT,
reason: AssetRejectReason.DUPLICATE,
assetId: duplicate.id,
isTrashed: duplicate.isTrashed,
};
}
// TODO mime-check
return {
id,
action: AssetUploadAction.ACCEPT,