From e36b7240c704ae8575f7416779e6e2546684bdc2 Mon Sep 17 00:00:00 2001 From: martabal <74269598+martabal@users.noreply.github.com> Date: Tue, 28 May 2024 00:42:52 +0200 Subject: [PATCH] fix: merge main --- mobile/openapi/README.md | 26 +++++++++++-------- mobile/openapi/lib/api.dart | 9 ++++--- mobile/openapi/lib/api_client.dart | 18 +++++++------ .../faces-page/person-side-panel.svelte | 3 +++ .../unassigned-faces-side-panel.svelte | 4 +++ 5 files changed, 37 insertions(+), 23 deletions(-) diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md index b2a760ab70..f22f0d0e73 100644 --- a/mobile/openapi/README.md +++ b/mobile/openapi/README.md @@ -214,15 +214,18 @@ Class | Method | HTTP request | Description *TrashApi* | [**restoreAssets**](doc//TrashApi.md#restoreassets) | **POST** /trash/restore/assets | *TrashApi* | [**restoreTrash**](doc//TrashApi.md#restoretrash) | **POST** /trash/restore | *UserApi* | [**createProfileImage**](doc//UserApi.md#createprofileimage) | **POST** /users/profile-image | -*UserApi* | [**createUser**](doc//UserApi.md#createuser) | **POST** /users | +*UserApi* | [**createUserAdmin**](doc//UserApi.md#createuseradmin) | **POST** /admin/users | *UserApi* | [**deleteProfileImage**](doc//UserApi.md#deleteprofileimage) | **DELETE** /users/profile-image | -*UserApi* | [**deleteUser**](doc//UserApi.md#deleteuser) | **DELETE** /users/{id} | -*UserApi* | [**getAllUsers**](doc//UserApi.md#getallusers) | **GET** /users | -*UserApi* | [**getMyUserInfo**](doc//UserApi.md#getmyuserinfo) | **GET** /users/me | +*UserApi* | [**deleteUserAdmin**](doc//UserApi.md#deleteuseradmin) | **DELETE** /admin/users/{id} | +*UserApi* | [**getMyUser**](doc//UserApi.md#getmyuser) | **GET** /users/me | *UserApi* | [**getProfileImage**](doc//UserApi.md#getprofileimage) | **GET** /users/{id}/profile-image | -*UserApi* | [**getUserById**](doc//UserApi.md#getuserbyid) | **GET** /users/{id} | -*UserApi* | [**restoreUser**](doc//UserApi.md#restoreuser) | **POST** /users/{id}/restore | -*UserApi* | [**updateUser**](doc//UserApi.md#updateuser) | **PUT** /users | +*UserApi* | [**getUser**](doc//UserApi.md#getuser) | **GET** /users/{id} | +*UserApi* | [**getUserAdmin**](doc//UserApi.md#getuseradmin) | **GET** /admin/users/{id} | +*UserApi* | [**restoreUserAdmin**](doc//UserApi.md#restoreuseradmin) | **POST** /admin/users/{id}/restore | +*UserApi* | [**searchUsers**](doc//UserApi.md#searchusers) | **GET** /users | +*UserApi* | [**searchUsersAdmin**](doc//UserApi.md#searchusersadmin) | **GET** /admin/users | +*UserApi* | [**updateMyUser**](doc//UserApi.md#updatemyuser) | **PUT** /users/me | +*UserApi* | [**updateUserAdmin**](doc//UserApi.md#updateuseradmin) | **PUT** /admin/users/{id} | ## Documentation For Models @@ -282,8 +285,6 @@ Class | Method | HTTP request | Description - [CreateLibraryDto](doc//CreateLibraryDto.md) - [CreateProfileImageResponseDto](doc//CreateProfileImageResponseDto.md) - [CreateTagDto](doc//CreateTagDto.md) - - [CreateUserDto](doc//CreateUserDto.md) - - [DeleteUserDto](doc//DeleteUserDto.md) - [DownloadArchiveInfo](doc//DownloadArchiveInfo.md) - [DownloadInfoDto](doc//DownloadInfoDto.md) - [DownloadResponseDto](doc//DownloadResponseDto.md) @@ -405,12 +406,15 @@ Class | Method | HTTP request | Description - [UpdatePartnerDto](doc//UpdatePartnerDto.md) - [UpdateStackParentDto](doc//UpdateStackParentDto.md) - [UpdateTagDto](doc//UpdateTagDto.md) - - [UpdateUserDto](doc//UpdateUserDto.md) - [UsageByUserDto](doc//UsageByUserDto.md) + - [UserAdminCreateDto](doc//UserAdminCreateDto.md) + - [UserAdminDeleteDto](doc//UserAdminDeleteDto.md) + - [UserAdminResponseDto](doc//UserAdminResponseDto.md) + - [UserAdminUpdateDto](doc//UserAdminUpdateDto.md) - [UserAvatarColor](doc//UserAvatarColor.md) - - [UserDto](doc//UserDto.md) - [UserResponseDto](doc//UserResponseDto.md) - [UserStatus](doc//UserStatus.md) + - [UserUpdateMeDto](doc//UserUpdateMeDto.md) - [ValidateAccessTokenResponseDto](doc//ValidateAccessTokenResponseDto.md) - [ValidateLibraryDto](doc//ValidateLibraryDto.md) - [ValidateLibraryImportPathResponseDto](doc//ValidateLibraryImportPathResponseDto.md) diff --git a/mobile/openapi/lib/api.dart b/mobile/openapi/lib/api.dart index 67d109d4cc..3f94de50f4 100644 --- a/mobile/openapi/lib/api.dart +++ b/mobile/openapi/lib/api.dart @@ -112,8 +112,6 @@ part 'model/create_album_dto.dart'; part 'model/create_library_dto.dart'; part 'model/create_profile_image_response_dto.dart'; part 'model/create_tag_dto.dart'; -part 'model/create_user_dto.dart'; -part 'model/delete_user_dto.dart'; part 'model/download_archive_info.dart'; part 'model/download_info_dto.dart'; part 'model/download_response_dto.dart'; @@ -235,12 +233,15 @@ part 'model/update_library_dto.dart'; part 'model/update_partner_dto.dart'; part 'model/update_stack_parent_dto.dart'; part 'model/update_tag_dto.dart'; -part 'model/update_user_dto.dart'; part 'model/usage_by_user_dto.dart'; +part 'model/user_admin_create_dto.dart'; +part 'model/user_admin_delete_dto.dart'; +part 'model/user_admin_response_dto.dart'; +part 'model/user_admin_update_dto.dart'; part 'model/user_avatar_color.dart'; -part 'model/user_dto.dart'; part 'model/user_response_dto.dart'; part 'model/user_status.dart'; +part 'model/user_update_me_dto.dart'; part 'model/validate_access_token_response_dto.dart'; part 'model/validate_library_dto.dart'; part 'model/validate_library_import_path_response_dto.dart'; diff --git a/mobile/openapi/lib/api_client.dart b/mobile/openapi/lib/api_client.dart index 06e64dde37..37adf7032c 100644 --- a/mobile/openapi/lib/api_client.dart +++ b/mobile/openapi/lib/api_client.dart @@ -292,10 +292,6 @@ class ApiClient { return CreateProfileImageResponseDto.fromJson(value); case 'CreateTagDto': return CreateTagDto.fromJson(value); - case 'CreateUserDto': - return CreateUserDto.fromJson(value); - case 'DeleteUserDto': - return DeleteUserDto.fromJson(value); case 'DownloadArchiveInfo': return DownloadArchiveInfo.fromJson(value); case 'DownloadInfoDto': @@ -538,18 +534,24 @@ class ApiClient { return UpdateStackParentDto.fromJson(value); case 'UpdateTagDto': return UpdateTagDto.fromJson(value); - case 'UpdateUserDto': - return UpdateUserDto.fromJson(value); case 'UsageByUserDto': return UsageByUserDto.fromJson(value); + case 'UserAdminCreateDto': + return UserAdminCreateDto.fromJson(value); + case 'UserAdminDeleteDto': + return UserAdminDeleteDto.fromJson(value); + case 'UserAdminResponseDto': + return UserAdminResponseDto.fromJson(value); + case 'UserAdminUpdateDto': + return UserAdminUpdateDto.fromJson(value); case 'UserAvatarColor': return UserAvatarColorTypeTransformer().decode(value); - case 'UserDto': - return UserDto.fromJson(value); case 'UserResponseDto': return UserResponseDto.fromJson(value); case 'UserStatus': return UserStatusTypeTransformer().decode(value); + case 'UserUpdateMeDto': + return UserUpdateMeDto.fromJson(value); case 'ValidateAccessTokenResponseDto': return ValidateAccessTokenResponseDto.fromJson(value); case 'ValidateLibraryDto': diff --git a/web/src/lib/components/faces-page/person-side-panel.svelte b/web/src/lib/components/faces-page/person-side-panel.svelte index f849d53ad5..c4ac2898e1 100644 --- a/web/src/lib/components/faces-page/person-side-panel.svelte +++ b/web/src/lib/components/faces-page/person-side-panel.svelte @@ -279,6 +279,7 @@
{#if peopleWithFaces.length > Object.keys(selectedFaceToRemove).length}