self-hosted/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2024-11-24 08:52:28 +02:00
Code Issues Releases Activity

fix(web): new feature photo (#9443)

Browse Source 
* fix: new feature photo

* fix: use updatedAt
This commit is contained in:
martin 2024-06-28 02:16:26 +02:00 committed by GitHub
parent 325aa1d392
commit 37b5d92110
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
18 changed files with 47 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
mobile/openapi/lib/model/person_response_dto.dart generated
View File

Binary file not shown.

BIN
mobile/openapi/lib/model/person_with_faces_response_dto.dart generated
View File

Binary file not shown.

10
open-api/immich-openapi-specs.json
View File

@ -9345,6 +9345,11 @@
},
"thumbnailPath": {
"type": "string"
},
"updatedAt": {
"description": "This property was added in v1.107.0",
"format": "date-time",
"type": "string"
}
},
"required": [
@ -9414,6 +9419,11 @@
},
"thumbnailPath": {
"type": "string"
},
"updatedAt": {
"description": "This property was added in v1.107.0",
"format": "date-time",
"type": "string"
}
},
"required": [

4
open-api/typescript-sdk/src/fetch-client.ts
View File

@ -158,6 +158,8 @@ export type PersonWithFacesResponseDto = {
isHidden: boolean;
name: string;
thumbnailPath: string;
/** This property was added in v1.107.0 */
updatedAt?: string;
};
export type SmartInfoResponseDto = {
objects?: string[] | null;
@ -432,6 +434,8 @@ export type PersonResponseDto = {
isHidden: boolean;
name: string;
thumbnailPath: string;
/** This property was added in v1.107.0 */
updatedAt?: string;
};
export type AssetFaceResponseDto = {
boundingBoxX1: number;

4
server/src/dtos/person.dto.ts
View File

@ -1,6 +1,7 @@
import { ApiProperty } from '@nestjs/swagger';
import { Type } from 'class-transformer';
import { IsArray, IsNotEmpty, IsString, MaxDate, ValidateNested } from 'class-validator';
import { PropertyLifecycle } from 'src/decorators';
import { AuthDto } from 'src/dtos/auth.dto';
import { AssetFaceEntity } from 'src/entities/asset-face.entity';
import { PersonEntity } from 'src/entities/person.entity';
@ -71,6 +72,8 @@ export class PersonResponseDto {
birthDate!: Date | null;
thumbnailPath!: string;
isHidden!: boolean;
@PropertyLifecycle({ addedAt: 'v1.107.0' })
updatedAt?: Date;
}
export class PersonWithFacesResponseDto extends PersonResponseDto {
@ -138,6 +141,7 @@ export function mapPerson(person: PersonEntity): PersonResponseDto {
birthDate: person.birthDate,
thumbnailPath: person.thumbnailPath,
isHidden: person.isHidden,
updatedAt: person.updatedAt,
};
}

4
server/src/services/person.service.spec.ts
View File

@ -42,6 +42,7 @@ const responseDto: PersonResponseDto = {
birthDate: null,
thumbnailPath: '/path/to/thumbnail.jpg',
isHidden: false,
updatedAt: expect.any(Date),
};
const statistics = { assets: 3 };
@ -126,6 +127,7 @@ describe(PersonService.name, () => {
birthDate: null,
thumbnailPath: '/path/to/thumbnail.jpg',
isHidden: true,
updatedAt: expect.any(Date),
},
],
});
@ -255,6 +257,7 @@ describe(PersonService.name, () => {
birthDate: new Date('1976-06-30'),
thumbnailPath: '/path/to/thumbnail.jpg',
isHidden: false,
updatedAt: expect.any(Date),
});
expect(personMock.update).toHaveBeenCalledWith({ id: 'person-1', birthDate: new Date('1976-06-30') });
expect(jobMock.queue).not.toHaveBeenCalled();
@ -407,6 +410,7 @@ describe(PersonService.name, () => {
id: personStub.noName.id,
name: personStub.noName.name,
thumbnailPath: personStub.noName.thumbnailPath,
updatedAt: expect.any(Date),
});
expect(jobMock.queue).not.toHaveBeenCalledWith();

2
web/src/lib/components/asset-viewer/detail-panel.svelte
View File

@ -213,7 +213,7 @@
<ImageThumbnail
curve
shadow
url={getPeopleThumbnailUrl(person.id)}
url={getPeopleThumbnailUrl(person)}
altText={person.name}
title={person.name}
widthStyle="90px"

2
web/src/lib/components/faces-page/assign-face-side-panel.svelte
View File

@ -108,7 +108,7 @@
<ImageThumbnail
curve
shadow
url={getPeopleThumbnailUrl(person.id)}
url={getPeopleThumbnailUrl(person)}
altText={getPersonNameWithHiddenValue(person.name, person.isHidden)}
title={getPersonNameWithHiddenValue(person.name, person.isHidden)}
widthStyle="90px"

2
web/src/lib/components/faces-page/face-thumbnail.svelte
View File

@ -36,7 +36,7 @@
class:dark:border-immich-dark-primary={border}
class:border-immich-primary={border}
>
<ImageThumbnail {circle} url={getPeopleThumbnailUrl(person.id)} altText={person.name} widthStyle="100%" shadow />
<ImageThumbnail {circle} url={getPeopleThumbnailUrl(person)} altText={person.name} widthStyle="100%" shadow />
</div>
<div

6
web/src/lib/components/faces-page/merge-suggestion-modal.svelte
View File

@ -38,7 +38,7 @@
<ImageThumbnail
circle
shadow
url={getPeopleThumbnailUrl(personMerge1.id)}
url={getPeopleThumbnailUrl(personMerge1)}
altText={personMerge1.name}
widthStyle="100%"
/>
@ -65,7 +65,7 @@
border={potentialMergePeople.length > 0}
circle
shadow
url={getPeopleThumbnailUrl(personMerge2.id)}
url={getPeopleThumbnailUrl(personMerge2)}
altText={personMerge2.name}
widthStyle="100%"
/>
@ -84,7 +84,7 @@
border={true}
circle
shadow
url={getPeopleThumbnailUrl(person.id)}
url={getPeopleThumbnailUrl(person)}
altText={person.name}
widthStyle="100%"
on:click={() => changePersonToMerge(person)}

2
web/src/lib/components/faces-page/people-card.svelte
View File

@ -50,7 +50,7 @@
<ImageThumbnail
shadow
{preload}
url={getPeopleThumbnailUrl(person.id)}
url={getPeopleThumbnailUrl(person)}
altText={person.name}
title={person.name}
widthStyle="100%"

4
web/src/lib/components/faces-page/person-side-panel.svelte
View File

@ -234,7 +234,7 @@
<ImageThumbnail
curve
shadow
url={getPeopleThumbnailUrl(selectedPersonToReassign[face.id].id)}
url={getPeopleThumbnailUrl(selectedPersonToReassign[face.id])}
altText={selectedPersonToReassign[face.id].name}
title={getPersonNameWithHiddenValue(
selectedPersonToReassign[face.id].name,
@ -248,7 +248,7 @@
<ImageThumbnail
curve
shadow
url={getPeopleThumbnailUrl(face.person.id)}
url={getPeopleThumbnailUrl(face.person)}
altText={face.person.name}
title={getPersonNameWithHiddenValue(face.person.name, face.person.isHidden)}
widthStyle={thumbnailWidth}

8
web/src/lib/components/shared-components/search-bar/search-people-section.svelte
View File

@ -71,13 +71,7 @@
: 'border-transparent'}"
on:click={() => togglePersonSelection(person.id)}
>
<ImageThumbnail
circle
shadow
url={getPeopleThumbnailUrl(person.id)}
altText={person.name}
widthStyle="100%"
/>
<ImageThumbnail circle shadow url={getPeopleThumbnailUrl(person)} altText={person.name} widthStyle="100%" />
<p class="mt-2 line-clamp-2 text-sm font-medium dark:text-white">{person.name}</p>
</button>
{/each}

1
web/src/lib/i18n/en.json
View File

@ -621,6 +621,7 @@
"unable_to_save_settings": "Unable to save settings",
"unable_to_scan_libraries": "Unable to scan libraries",
"unable_to_scan_library": "Unable to scan library",
"unable_to_set_feature_photo": "Unable to set feature photo",
"unable_to_set_profile_picture": "Unable to set profile picture",
"unable_to_submit_job": "Unable to submit job",
"unable_to_trash_asset": "Unable to trash asset",

4
web/src/lib/utils.ts
View File

@ -17,6 +17,7 @@ import {
startOAuth,
unlinkOAuthAccount,
type AssetResponseDto,
type PersonResponseDto,
type SharedLinkResponseDto,
} from '@immich/sdk';
import { mdiCogRefreshOutline, mdiDatabaseRefreshOutline, mdiImageRefreshOutline } from '@mdi/js';
@ -205,7 +206,8 @@ export const getAssetPlaybackUrl = (options: string | { id: string; checksum?: s
export const getProfileImageUrl = (userId: string) => createUrl(getUserProfileImagePath(userId));
export const getPeopleThumbnailUrl = (personId: string) => createUrl(getPeopleThumbnailPath(personId));
export const getPeopleThumbnailUrl = (person: PersonResponseDto, updatedAt?: string) =>
createUrl(getPeopleThumbnailPath(person.id), { updatedAt: updatedAt ?? person.updatedAt });
export const getAssetJobName = derived(t, ($t) => {
return (job: AssetJobName) => {

2
web/src/routes/(user)/explore/+page.svelte
View File

@ -61,7 +61,7 @@
<ImageThumbnail
circle
shadow
url={getPeopleThumbnailUrl(person.id)}
url={getPeopleThumbnailUrl(person)}
altText={person.name}
widthStyle="100%"
/>

2
web/src/routes/(user)/people/+page.svelte
View File

@ -508,7 +508,7 @@
preload={searchName !== '' || index < 20}
bind:hidden={person.isHidden}
shadow
url={getPeopleThumbnailUrl(person.id)}
url={getPeopleThumbnailUrl(person)}
altText={person.name}
widthStyle="100%"
bind:eyeColor={eyeColorMap[person.id]}

15
web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte
View File

@ -91,7 +91,7 @@
let refreshAssetGrid = false;
let personName = '';
$: thumbnailData = getPeopleThumbnailUrl(data.person.id);
$: thumbnailData = getPeopleThumbnailUrl(data.person);
let name: string = data.person.name;
let suggestedPeople: PersonResponseDto[] = [];
@ -121,7 +121,7 @@
return websocketEvents.on('on_person_thumbnail', (personId: string) => {
if (data.person.id === personId) {
thumbnailData = getPeopleThumbnailUrl(data.person.id) + `?now=${Date.now()}`;
thumbnailData = getPeopleThumbnailUrl(data.person, Date.now().toString());
}
});
});
@ -206,10 +206,13 @@
if (viewMode !== ViewMode.SELECT_PERSON) {
return;
}
try {
await updatePerson({ id: data.person.id, personUpdateDto: { featureFaceAssetId: asset.id } });
notificationController.show({ message: $t('feature_photo_updated'), type: NotificationType.Info });
} catch (error) {
handleError(error, $t('errors.unable_to_set_feature_photo'));
}
await updatePerson({ id: data.person.id, personUpdateDto: { featureFaceAssetId: asset.id } });
notificationController.show({ message: $t('feature_photo_updated'), type: NotificationType.Info });
assetInteractionStore.clearMultiselect();
viewMode = ViewMode.VIEW_ASSETS;
@ -525,7 +528,7 @@
<ImageThumbnail
circle
shadow
url={getPeopleThumbnailUrl(person.id)}
url={getPeopleThumbnailUrl(person)}
altText={person.name}
widthStyle="2rem"
heightStyle="2rem"