feat(web): show partners assets on the main timeline (immich-app#4933)

MiguelAraCo · Nov 11, 2023 · 3576759 · 3576759
1 parent 3b11854
commit 3576759
Show file tree

Hide file tree

Showing 59 changed files with 1,929 additions and 172 deletions.
diff --git a/cli/src/api/open-api/api.ts b/cli/src/api/open-api/api.ts
diff --git a/mobile/lib/modules/login/providers/authentication.provider.dart b/mobile/lib/modules/login/providers/authentication.provider.dart
@@ -187,12 +187,15 @@ class AuthenticationNotifier extends StateNotifier<AuthenticationState> {
       if (userResponseDto != null) {
         Store.put(StoreKey.deviceId, deviceId);
         Store.put(StoreKey.deviceIdHash, fastHash(deviceId));
-        Store.put(StoreKey.currentUser, User.fromDto(userResponseDto));
+        Store.put(
+          StoreKey.currentUser,
+          User.fromUserDto(userResponseDto),
+        );
         Store.put(StoreKey.serverUrl, serverUrl);
         Store.put(StoreKey.accessToken, accessToken);
 
         shouldChangePassword = userResponseDto.shouldChangePassword;
-        user = User.fromDto(userResponseDto);
+        user = User.fromUserDto(userResponseDto);
 
         retResult = true;
       } else {

diff --git a/mobile/lib/modules/partner/services/partner.service.dart b/mobile/lib/modules/partner/services/partner.service.dart
@@ -36,7 +36,7 @@ class PartnerService {
       final userDtos =
           await _apiService.partnerApi.getPartners(direction._value);
       if (userDtos != null) {
-        return userDtos.map((u) => User.fromDto(u)).toList();
+        return userDtos.map((u) => User.fromPartnerDto(u)).toList();
       }
     } catch (e) {
       _log.warning("failed to get partners for direction $direction:\n$e");

diff --git a/mobile/lib/routing/tab_navigation_observer.dart b/mobile/lib/routing/tab_navigation_observer.dart
@@ -63,7 +63,10 @@ class TabNavigationObserver extends AutoRouterObserver {
           return;
         }
 
-        Store.put(StoreKey.currentUser, User.fromDto(userResponseDto));
+        Store.put(
+          StoreKey.currentUser,
+          User.fromUserDto(userResponseDto),
+        );
         ref.read(serverInfoProvider.notifier).getServerVersion();
       } catch (e) {
         debugPrint("Error refreshing user info $e");

diff --git a/mobile/lib/shared/models/user.dart b/mobile/lib/shared/models/user.dart
@@ -18,11 +18,12 @@ class User {
     this.isPartnerSharedWith = false,
     this.profileImagePath = '',
     this.memoryEnabled = true,
+    this.inTimeline = false,
   });
 
   Id get isarId => fastHash(id);
 
-  User.fromDto(UserResponseDto dto)
+  User.fromUserDto(UserResponseDto dto)
       : id = dto.id,
         updatedAt = dto.updatedAt,
         email = dto.email,
@@ -34,6 +35,19 @@ class User {
         isAdmin = dto.isAdmin,
         memoryEnabled = dto.memoriesEnabled;
 
+  User.fromPartnerDto(PartnerResponseDto dto)
+      : id = dto.id,
+        updatedAt = dto.updatedAt,
+        email = dto.email,
+        firstName = dto.firstName,
+        lastName = dto.lastName,
+        isPartnerSharedBy = false,
+        isPartnerSharedWith = false,
+        profileImagePath = dto.profileImagePath,
+        isAdmin = dto.isAdmin,
+        memoryEnabled = dto.memoriesEnabled,
+        inTimeline = dto.inTimeline;
+
   @Index(unique: true, replace: false, type: IndexType.hash)
   String id;
   DateTime updatedAt;
@@ -45,6 +59,8 @@ class User {
   bool isAdmin;
   String profileImagePath;
   bool? memoryEnabled;
+  bool? inTimeline;
+
   @Backlink(to: 'owner')
   final IsarLinks<Album> albums = IsarLinks<Album>();
   @Backlink(to: 'sharedUsers')
@@ -62,7 +78,8 @@ class User {
         isPartnerSharedWith == other.isPartnerSharedWith &&
         profileImagePath == other.profileImagePath &&
         isAdmin == other.isAdmin &&
-        memoryEnabled == other.memoryEnabled;
+        memoryEnabled == other.memoryEnabled &&
+        inTimeline == other.inTimeline;
   }
 
   @override
@@ -77,5 +94,6 @@ class User {
       isPartnerSharedWith.hashCode ^
       profileImagePath.hashCode ^
       isAdmin.hashCode ^
-      memoryEnabled.hashCode;
+      memoryEnabled.hashCode ^
+      inTimeline.hashCode;
 }
diff --git a/mobile/lib/shared/models/user.g.dart b/mobile/lib/shared/models/user.g.dart
diff --git a/mobile/lib/shared/services/user.service.dart b/mobile/lib/shared/services/user.service.dart
@@ -40,7 +40,7 @@ class UserService {
   Future<List<User>?> _getAllUsers({required bool isAll}) async {
     try {
       final dto = await _apiService.userApi.getAllUsers(isAll);
-      return dto?.map(User.fromDto).toList();
+      return dto?.map(User.fromUserDto).toList();
     } catch (e) {
       _log.warning("Failed get all users:\n$e");
       return null;

diff --git a/mobile/openapi/.openapi-generator/FILES b/mobile/openapi/.openapi-generator/FILES
diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md