Skip to content

Commit 3070935

Browse files
authored
Tweaks to report formatting and new library handling (#2051)
1 parent 2fb20a1 commit 3070935

File tree

4 files changed

+26
-6
lines changed

4 files changed

+26
-6
lines changed

core/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,4 @@ def load(cls):
8484

8585
@property
8686
def wordcloud_ignore_set(self):
87-
return set(x.strip() for x in self.wordcloud_ignore.split(","))
87+
return set(x.strip().lower() for x in self.wordcloud_ignore.split(","))

libraries/forms.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,9 @@ def get_stats(self):
341341
library_data = get_library_data(library_order, prior_version.pk, version.pk)
342342
slack_stats = get_slack_stats(prior_version, version)
343343

344-
library_index_library_data = get_libraries_for_index(library_data, version)
344+
library_index_library_data = get_libraries_for_index(
345+
library_data, version, prior_version
346+
)
345347
batched_library_data = conditional_batched(
346348
library_data,
347349
2,
@@ -463,7 +465,9 @@ def generate_context(
463465
library_data = get_library_data(library_order, prior_version.pk, version.pk)
464466
slack_stats = get_slack_stats(prior_version, version)
465467

466-
library_index_library_data = get_libraries_for_index(library_data, version)
468+
library_index_library_data = get_libraries_for_index(
469+
library_data, version, prior_version
470+
)
467471
batched_library_data = conditional_batched(
468472
library_data,
469473
2,

reports/generation.py

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -642,13 +642,29 @@ def get_slack_channels():
642642
)
643643

644644

645-
def get_libraries_for_index(library_data, version: Version):
645+
def get_libraries_for_index(
646+
library_data, version: Version, prior_version: Version | None = None
647+
):
646648
library_index_library_data = []
649+
650+
# Get libraries that existed in prior version
651+
prior_version_library_ids = set()
652+
if prior_version:
653+
prior_version_library_ids = set(
654+
LibraryVersion.objects.filter(version=prior_version).values_list(
655+
"library_id", flat=True
656+
)
657+
)
658+
659+
changed_libraries = {lib["library"] for lib in library_data}
660+
647661
for library in get_libraries_by_quality(version):
662+
is_changed = library in changed_libraries
663+
is_new = library.id not in prior_version_library_ids
648664
library_index_library_data.append(
649665
(
650666
library,
651-
library in [lib["library"] for lib in library_data],
667+
is_changed or is_new,
652668
)
653669
)
654670
return library_index_library_data

templates/admin/release_report_detail.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ <h2 class="mx-auto my-1">Git activity for this release</h2>
232232
</div>
233233
</div>
234234

235-
<div class="flex flex-col justify-center">
235+
<div class="flex flex-col justify-center flex-1">
236236
<h3 class="mx-auto">Most Committed Libraries</h3>
237237
<div id="top-committed-libraries-chart" class="w-full text-center"></div>
238238
</div>

0 commit comments

Comments
 (0)