From 7e2c956dbf33020a65684045392b4837600dee41 Mon Sep 17 00:00:00 2001 From: Sigurd Meldgaard Date: Thu, 27 Feb 2025 13:15:57 +0000 Subject: [PATCH 1/3] List uploaders in action package-info --- app/lib/admin/actions/package_info.dart | 9 +++++++++ app/test/admin/package_actions_test.dart | 1 + 2 files changed, 10 insertions(+) diff --git a/app/lib/admin/actions/package_info.dart b/app/lib/admin/actions/package_info.dart index 8b855260a7..5323f8c5fb 100644 --- a/app/lib/admin/actions/package_info.dart +++ b/app/lib/admin/actions/package_info.dart @@ -4,6 +4,8 @@ import 'package:pub_dev/package/backend.dart'; +import '../../account/backend.dart'; +import '../../account/models.dart'; import 'actions.dart'; final packageInfo = AdminAction( @@ -27,11 +29,18 @@ Loads and displays the package information. throw NotFoundException.resource(package); } + final uploaderIds = p.uploaders; + List? uploaders; + if (uploaderIds != null) { + uploaders = + (await accountBackend.lookupUsersById(uploaderIds)).nonNulls.toList(); + } return { 'package': { 'name': p.name, 'created': p.created?.toIso8601String(), 'publisherId': p.publisherId, + 'uploaders': uploaders?.map((u) => u.email).toList(), 'latestVersion': p.latestVersion, 'isModerated': p.isModerated, if (p.moderatedAt != null) diff --git a/app/test/admin/package_actions_test.dart b/app/test/admin/package_actions_test.dart index a3995abd3a..e3c6887099 100644 --- a/app/test/admin/package_actions_test.dart +++ b/app/test/admin/package_actions_test.dart @@ -23,6 +23,7 @@ void main() { 'name': 'oxygen', 'created': isNotEmpty, 'publisherId': null, + 'uploaders': ['admin@pub.dev'], 'latestVersion': '1.2.0', 'isModerated': false, } From 621adda31a92922fe30d74d0a1a079599db8cc2b Mon Sep 17 00:00:00 2001 From: Sigurd Meldgaard Date: Thu, 27 Feb 2025 13:24:35 +0000 Subject: [PATCH 2/3] use `accountBackend.uploaderEmails` --- app/lib/admin/actions/package_info.dart | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/lib/admin/actions/package_info.dart b/app/lib/admin/actions/package_info.dart index 5323f8c5fb..0bf3155e77 100644 --- a/app/lib/admin/actions/package_info.dart +++ b/app/lib/admin/actions/package_info.dart @@ -30,17 +30,19 @@ Loads and displays the package information. } final uploaderIds = p.uploaders; - List? uploaders; + List? uploaderEmails; if (uploaderIds != null) { - uploaders = - (await accountBackend.lookupUsersById(uploaderIds)).nonNulls.toList(); + uploaderEmails = (await accountBackend.getEmailsOfUserIds(uploaderIds)) + .nonNulls + .toList(); } + return { 'package': { 'name': p.name, 'created': p.created?.toIso8601String(), 'publisherId': p.publisherId, - 'uploaders': uploaders?.map((u) => u.email).toList(), + 'uploaders': uploaderEmails, 'latestVersion': p.latestVersion, 'isModerated': p.isModerated, if (p.moderatedAt != null) From 9d70db120d78e332bb96868a185309a5a46bb412 Mon Sep 17 00:00:00 2001 From: Sigurd Meldgaard Date: Thu, 27 Feb 2025 13:26:35 +0000 Subject: [PATCH 3/3] remove unused import --- app/lib/admin/actions/package_info.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/app/lib/admin/actions/package_info.dart b/app/lib/admin/actions/package_info.dart index 0bf3155e77..2e4f05a388 100644 --- a/app/lib/admin/actions/package_info.dart +++ b/app/lib/admin/actions/package_info.dart @@ -5,7 +5,6 @@ import 'package:pub_dev/package/backend.dart'; import '../../account/backend.dart'; -import '../../account/models.dart'; import 'actions.dart'; final packageInfo = AdminAction(