mirror of
				https://github.com/KevinMidboe/immich.git
				synced 2025-10-29 17:40:28 +00:00 
			
		
		
		
	fix(mobile): make user.memoryEnable optional (#3680)
* chore(server): avoid breaking changes * generate api * mobile app
This commit is contained in:
		
							
								
								
									
										2
									
								
								cli/src/api/open-api/api.ts
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										2
									
								
								cli/src/api/open-api/api.ts
									
									
									
										generated
									
									
									
								
							| @@ -3159,7 +3159,7 @@ export interface UserResponseDto { | ||||
|      * @type {boolean} | ||||
|      * @memberof UserResponseDto | ||||
|      */ | ||||
|     'memoriesEnabled': boolean; | ||||
|     'memoriesEnabled'?: boolean; | ||||
|     /** | ||||
|      *  | ||||
|      * @type {string} | ||||
|   | ||||
| @@ -342,10 +342,11 @@ class HomePage extends HookConsumerWidget { | ||||
|                           listener: selectionListener, | ||||
|                           selectionActive: selectionEnabledHook.value, | ||||
|                           onRefresh: refreshAssets, | ||||
|                           topWidget: | ||||
|                               (currentUser != null && currentUser.memoryEnabled) | ||||
|                                   ? const MemoryLane() | ||||
|                                   : const SizedBox(), | ||||
|                           topWidget: (currentUser != null && | ||||
|                                   currentUser.memoryEnabled != null && | ||||
|                                   currentUser.memoryEnabled!) | ||||
|                               ? const MemoryLane() | ||||
|                               : const SizedBox(), | ||||
|                         ), | ||||
|                   error: (error, _) => Center(child: Text(error.toString())), | ||||
|                   loading: buildLoadingIndicator, | ||||
|   | ||||
| @@ -44,7 +44,7 @@ class User { | ||||
|   bool isPartnerSharedWith; | ||||
|   bool isAdmin; | ||||
|   String profileImagePath; | ||||
|   bool memoryEnabled; | ||||
|   bool? memoryEnabled; | ||||
|   @Backlink(to: 'owner') | ||||
|   final IsarLinks<Album> albums = IsarLinks<Album>(); | ||||
|   @Backlink(to: 'sharedUsers') | ||||
|   | ||||
							
								
								
									
										2
									
								
								mobile/openapi/doc/UserResponseDto.md
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										2
									
								
								mobile/openapi/doc/UserResponseDto.md
									
									
									
										generated
									
									
									
								
							| @@ -16,7 +16,7 @@ Name | Type | Description | Notes | ||||
| **id** | **String** |  |  | ||||
| **isAdmin** | **bool** |  |  | ||||
| **lastName** | **String** |  |  | ||||
| **memoriesEnabled** | **bool** |  |  | ||||
| **memoriesEnabled** | **bool** |  | [optional]  | ||||
| **oauthId** | **String** |  |  | ||||
| **profileImagePath** | **String** |  |  | ||||
| **shouldChangePassword** | **bool** |  |  | ||||
|   | ||||
							
								
								
									
										19
									
								
								mobile/openapi/lib/model/user_response_dto.dart
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										19
									
								
								mobile/openapi/lib/model/user_response_dto.dart
									
									
									
										generated
									
									
									
								
							| @@ -21,7 +21,7 @@ class UserResponseDto { | ||||
|     required this.id, | ||||
|     required this.isAdmin, | ||||
|     required this.lastName, | ||||
|     required this.memoriesEnabled, | ||||
|     this.memoriesEnabled, | ||||
|     required this.oauthId, | ||||
|     required this.profileImagePath, | ||||
|     required this.shouldChangePassword, | ||||
| @@ -45,7 +45,13 @@ class UserResponseDto { | ||||
| 
 | ||||
|   String lastName; | ||||
| 
 | ||||
|   bool memoriesEnabled; | ||||
|   /// | ||||
|   /// Please note: This property should have been non-nullable! Since the specification file | ||||
|   /// does not include a default value (using the "default:" property), however, the generated | ||||
|   /// source code must fall back to having a nullable type. | ||||
|   /// Consider adding a "default:" property in the specification file to hide this note. | ||||
|   /// | ||||
|   bool? memoriesEnabled; | ||||
| 
 | ||||
|   String oauthId; | ||||
| 
 | ||||
| @@ -85,7 +91,7 @@ class UserResponseDto { | ||||
|     (id.hashCode) + | ||||
|     (isAdmin.hashCode) + | ||||
|     (lastName.hashCode) + | ||||
|     (memoriesEnabled.hashCode) + | ||||
|     (memoriesEnabled == null ? 0 : memoriesEnabled!.hashCode) + | ||||
|     (oauthId.hashCode) + | ||||
|     (profileImagePath.hashCode) + | ||||
|     (shouldChangePassword.hashCode) + | ||||
| @@ -113,7 +119,11 @@ class UserResponseDto { | ||||
|       json[r'id'] = this.id; | ||||
|       json[r'isAdmin'] = this.isAdmin; | ||||
|       json[r'lastName'] = this.lastName; | ||||
|     if (this.memoriesEnabled != null) { | ||||
|       json[r'memoriesEnabled'] = this.memoriesEnabled; | ||||
|     } else { | ||||
|     //  json[r'memoriesEnabled'] = null; | ||||
|     } | ||||
|       json[r'oauthId'] = this.oauthId; | ||||
|       json[r'profileImagePath'] = this.profileImagePath; | ||||
|       json[r'shouldChangePassword'] = this.shouldChangePassword; | ||||
| @@ -142,7 +152,7 @@ class UserResponseDto { | ||||
|         id: mapValueOfType<String>(json, r'id')!, | ||||
|         isAdmin: mapValueOfType<bool>(json, r'isAdmin')!, | ||||
|         lastName: mapValueOfType<String>(json, r'lastName')!, | ||||
|         memoriesEnabled: mapValueOfType<bool>(json, r'memoriesEnabled')!, | ||||
|         memoriesEnabled: mapValueOfType<bool>(json, r'memoriesEnabled'), | ||||
|         oauthId: mapValueOfType<String>(json, r'oauthId')!, | ||||
|         profileImagePath: mapValueOfType<String>(json, r'profileImagePath')!, | ||||
|         shouldChangePassword: mapValueOfType<bool>(json, r'shouldChangePassword')!, | ||||
| @@ -203,7 +213,6 @@ class UserResponseDto { | ||||
|     'id', | ||||
|     'isAdmin', | ||||
|     'lastName', | ||||
|     'memoriesEnabled', | ||||
|     'oauthId', | ||||
|     'profileImagePath', | ||||
|     'shouldChangePassword', | ||||
|   | ||||
| @@ -7152,8 +7152,7 @@ | ||||
|           "createdAt", | ||||
|           "deletedAt", | ||||
|           "updatedAt", | ||||
|           "oauthId", | ||||
|           "memoriesEnabled" | ||||
|           "oauthId" | ||||
|         ], | ||||
|         "type": "object" | ||||
|       }, | ||||
|   | ||||
| @@ -14,7 +14,7 @@ export class UserResponseDto { | ||||
|   deletedAt!: Date | null; | ||||
|   updatedAt!: Date; | ||||
|   oauthId!: string; | ||||
|   memoriesEnabled!: boolean; | ||||
|   memoriesEnabled?: boolean; | ||||
| } | ||||
|  | ||||
| export function mapUser(entity: UserEntity): UserResponseDto { | ||||
|   | ||||
							
								
								
									
										2
									
								
								web/src/api/open-api/api.ts
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										2
									
								
								web/src/api/open-api/api.ts
									
									
									
										generated
									
									
									
								
							| @@ -3159,7 +3159,7 @@ export interface UserResponseDto { | ||||
|      * @type {boolean} | ||||
|      * @memberof UserResponseDto | ||||
|      */ | ||||
|     'memoriesEnabled': boolean; | ||||
|     'memoriesEnabled'?: boolean; | ||||
|     /** | ||||
|      *  | ||||
|      * @type {string} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user