From 307093536c45b81450e68c639c2d78b4bb2360c1 Mon Sep 17 00:00:00 2001 From: Greg Kaleka Date: Wed, 24 Dec 2025 13:15:45 -0500 Subject: [PATCH] Tweaks to report formatting and new library handling (#2051) --- core/models.py | 2 +- libraries/forms.py | 8 ++++++-- reports/generation.py | 20 ++++++++++++++++++-- templates/admin/release_report_detail.html | 2 +- 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/core/models.py b/core/models.py index e74c7595..877d38d4 100644 --- a/core/models.py +++ b/core/models.py @@ -84,4 +84,4 @@ class SiteSettings(models.Model): @property def wordcloud_ignore_set(self): - return set(x.strip() for x in self.wordcloud_ignore.split(",")) + return set(x.strip().lower() for x in self.wordcloud_ignore.split(",")) diff --git a/libraries/forms.py b/libraries/forms.py index 92f3bd9e..8edd6c51 100644 --- a/libraries/forms.py +++ b/libraries/forms.py @@ -341,7 +341,9 @@ class CreateReportForm(CreateReportFullForm): library_data = get_library_data(library_order, prior_version.pk, version.pk) slack_stats = get_slack_stats(prior_version, version) - library_index_library_data = get_libraries_for_index(library_data, version) + library_index_library_data = get_libraries_for_index( + library_data, version, prior_version + ) batched_library_data = conditional_batched( library_data, 2, @@ -463,7 +465,9 @@ class CreateReportForm(CreateReportFullForm): library_data = get_library_data(library_order, prior_version.pk, version.pk) slack_stats = get_slack_stats(prior_version, version) - library_index_library_data = get_libraries_for_index(library_data, version) + library_index_library_data = get_libraries_for_index( + library_data, version, prior_version + ) batched_library_data = conditional_batched( library_data, 2, diff --git a/reports/generation.py b/reports/generation.py index bd1b83a9..deff31ab 100644 --- a/reports/generation.py +++ b/reports/generation.py @@ -642,13 +642,29 @@ def get_slack_channels(): ) -def get_libraries_for_index(library_data, version: Version): +def get_libraries_for_index( + library_data, version: Version, prior_version: Version | None = None +): library_index_library_data = [] + + # Get libraries that existed in prior version + prior_version_library_ids = set() + if prior_version: + prior_version_library_ids = set( + LibraryVersion.objects.filter(version=prior_version).values_list( + "library_id", flat=True + ) + ) + + changed_libraries = {lib["library"] for lib in library_data} + for library in get_libraries_by_quality(version): + is_changed = library in changed_libraries + is_new = library.id not in prior_version_library_ids library_index_library_data.append( ( library, - library in [lib["library"] for lib in library_data], + is_changed or is_new, ) ) return library_index_library_data diff --git a/templates/admin/release_report_detail.html b/templates/admin/release_report_detail.html index 1fba04c0..53714af2 100644 --- a/templates/admin/release_report_detail.html +++ b/templates/admin/release_report_detail.html @@ -232,7 +232,7 @@ ul.slack-channels li div a:hover, -
+

Most Committed Libraries