immich-app/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-12-26 01:11:47 +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

1
server/src/dtos/asset-media-response.dto.ts
View File

@@ -26,6 +26,7 @@ export class AssetBulkUploadCheckResult {
action!: AssetUploadAction;
reason?: AssetRejectReason;
assetId?: string;
isTrashed?: boolean;
}
export class AssetBulkUploadCheckResponseDto {

1
server/src/queries/asset.repository.sql
View File

@@ -493,6 +493,7 @@ LIMIT
-- AssetRepository.getByChecksums
SELECT
"AssetEntity"."id" AS "AssetEntity_id",
"AssetEntity"."deletedAt" AS "AssetEntity_deletedAt",
"AssetEntity"."checksum" AS "AssetEntity_checksum"
FROM
"assets" "AssetEntity"

10
server/src/queries/metadata.repository.sql
View File

@@ -8,7 +8,7 @@ FROM
LEFT JOIN "assets" "asset" ON "asset"."id" = "exif"."assetId"
AND ("asset"."deletedAt" IS NULL)
WHERE
"asset"."ownerId" = $1
"asset"."ownerId" IN ($1)
-- MetadataRepository.getStates
SELECT DISTINCT
@@ -18,7 +18,7 @@ FROM
LEFT JOIN "assets" "asset" ON "asset"."id" = "exif"."assetId"
AND ("asset"."deletedAt" IS NULL)
WHERE
"asset"."ownerId" = $1
"asset"."ownerId" IN ($1)
AND "exif"."country" = $2
-- MetadataRepository.getCities
@@ -29,7 +29,7 @@ FROM
LEFT JOIN "assets" "asset" ON "asset"."id" = "exif"."assetId"
AND ("asset"."deletedAt" IS NULL)
WHERE
"asset"."ownerId" = $1
"asset"."ownerId" IN ($1)
AND "exif"."country" = $2
AND "exif"."state" = $3
@@ -41,7 +41,7 @@ FROM
LEFT JOIN "assets" "asset" ON "asset"."id" = "exif"."assetId"
AND ("asset"."deletedAt" IS NULL)
WHERE
"asset"."ownerId" = $1
"asset"."ownerId" IN ($1)
AND "exif"."model" = $2
-- MetadataRepository.getCameraModels
@@ -52,5 +52,5 @@ FROM
LEFT JOIN "assets" "asset" ON "asset"."id" = "exif"."assetId"
AND ("asset"."deletedAt" IS NULL)
WHERE
"asset"."ownerId" = $1
"asset"."ownerId" IN ($1)
AND "exif"."make" = $2

1
server/src/repositories/asset.repository.ts
View File

@@ -338,6 +338,7 @@ export class AssetRepository implements IAssetRepository {
select: {
id: true,
checksum: true,
deletedAt: true,
},
where: {
ownerId,

10
server/src/repositories/metadata.repository.ts
View File

@@ -55,7 +55,7 @@ export class MetadataRepository implements IMetadataRepository {
}
}
@GenerateSql({ params: [DummyValue.UUID] })
@GenerateSql({ params: [[DummyValue.UUID]] })
async getCountries(userIds: string[]): Promise<string[]> {
const results = await this.exifRepository
.createQueryBuilder('exif')
@@ -68,7 +68,7 @@ export class MetadataRepository implements IMetadataRepository {
return results.map(({ country }) => country).filter((item) => item !== '');
}
@GenerateSql({ params: [DummyValue.UUID, DummyValue.STRING] })
@GenerateSql({ params: [[DummyValue.UUID], DummyValue.STRING] })
async getStates(userIds: string[], country: string | undefined): Promise<string[]> {
const query = this.exifRepository
.createQueryBuilder('exif')
@@ -86,7 +86,7 @@ export class MetadataRepository implements IMetadataRepository {
return result.map(({ state }) => state).filter((item) => item !== '');
}
@GenerateSql({ params: [DummyValue.UUID, DummyValue.STRING, DummyValue.STRING] })
@GenerateSql({ params: [[DummyValue.UUID], DummyValue.STRING, DummyValue.STRING] })
async getCities(userIds: string[], country: string | undefined, state: string | undefined): Promise<string[]> {
const query = this.exifRepository
.createQueryBuilder('exif')
@@ -108,7 +108,7 @@ export class MetadataRepository implements IMetadataRepository {
return results.map(({ city }) => city).filter((item) => item !== '');
}
@GenerateSql({ params: [DummyValue.UUID, DummyValue.STRING] })
@GenerateSql({ params: [[DummyValue.UUID], DummyValue.STRING] })
async getCameraMakes(userIds: string[], model: string | undefined): Promise<string[]> {
const query = this.exifRepository
.createQueryBuilder('exif')
@@ -125,7 +125,7 @@ export class MetadataRepository implements IMetadataRepository {
return results.map(({ make }) => make).filter((item) => item !== '');
}
@GenerateSql({ params: [DummyValue.UUID, DummyValue.STRING] })
@GenerateSql({ params: [[DummyValue.UUID], DummyValue.STRING] })
async getCameraModels(userIds: string[], make: string | undefined): Promise<string[]> {
const query = this.exifRepository
.createQueryBuilder('exif')

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,