From fe7c8685cef2abc4937c2718723b5d8653b17764 Mon Sep 17 00:00:00 2001 From: andrepapoti Date: Mon, 22 Apr 2024 15:25:34 -0300 Subject: [PATCH 1/8] views: add series-list view This view is meant to give a quickoverview on a project since some of them can have hundreds of patches actives. This view also allows the user to apply changes on all of the series patches at once Signed-off-by: andrepapoti --- htdocs/css/style.css | 6 + .../templates/patchwork/series-list.html | 106 ++++++++++++++++++ patchwork/urls.py | 10 ++ patchwork/views/patch.py | 6 + patchwork/views/series.py | 44 ++++++++ 5 files changed, 172 insertions(+) create mode 100644 patchwork/templates/patchwork/series-list.html diff --git a/htdocs/css/style.css b/htdocs/css/style.css index 268a8c372..cba33cf94 100644 --- a/htdocs/css/style.css +++ b/htdocs/css/style.css @@ -407,6 +407,12 @@ span.p_mod { color: #a020f0; } font-weight: bold; } +/* series */ +a.series-list-header { + color: inherit; /* Inherit color from parent element */ + text-decoration: none; /* Optional: removes underline */ +} + /* bundles */ table.bundlelist { margin-top: 2em; diff --git a/patchwork/templates/patchwork/series-list.html b/patchwork/templates/patchwork/series-list.html new file mode 100644 index 000000000..f157c6ca2 --- /dev/null +++ b/patchwork/templates/patchwork/series-list.html @@ -0,0 +1,106 @@ +{% extends "base.html" %} + +{% load person %} +{% load static %} + +{% block title %}{{project.name}}{% endblock %} +{% block series_active %}active{% endblock %} + +{% block body %} + +{% load person %} +{% load listurl %} +{% load patch %} +{% load project %} +{% load static %} + +{% include "patchwork/partials/pagination.html" %} + + + + + + + +{% if user.is_authenticated and user.profile.show_ids %} + +{% endif %} + + + + + + + + + + + + + + + + +{% for series in page %} + +{% if user.is_authenticated and user.profile.show_ids %} + +{% endif %} + + + + + + + + +{% empty %} + + + +{% endfor %} + +
+ ID + + Series + + Version + + Cover Letter + + Patches + + {% if 'date.asc' == order %} + + + {% elif 'date.desc' == order %} + + + {% endif %} + Date + {% if 'date.asc' == order or 'date.desc' == order%} + + {% endif %} + + Submitter +
+ + + {{ series.name|default:"[no subject]"|truncatechars:100 }} + + {{ series.version|default:"-"}} + + {% if series.cover_letter.content %} + ✓ + {% else %} + - + {% endif %} + {{ series.received_total}}{{ series.date|date:"Y-m-d" }}{{ series.submitter|personify:project }}
No series to display
+ +{% if page.paginator.count %} +{% include "patchwork/partials/pagination.html" %} +{% endif %} +{% endblock %} diff --git a/patchwork/urls.py b/patchwork/urls.py index ecd3668de..15343ad0f 100644 --- a/patchwork/urls.py +++ b/patchwork/urls.py @@ -33,9 +33,19 @@ path('', project_views.project_list, name='project-list'), path( 'project//list/', + patch_views.patch_list_redirect, + name='patch-list-redirect', + ), + path( + 'project//patches/', patch_views.patch_list, name='patch-list', ), + path( + 'project//series/', + series_views.series_list, + name='series-list', + ), path( 'project//bundles/', bundle_views.bundle_list, diff --git a/patchwork/views/patch.py b/patchwork/views/patch.py index efe94f17c..198b26ca7 100644 --- a/patchwork/views/patch.py +++ b/patchwork/views/patch.py @@ -10,6 +10,7 @@ from django.http import HttpResponseRedirect from django.shortcuts import get_object_or_404 from django.shortcuts import render +from django.shortcuts import redirect from django.urls import reverse from patchwork.forms import CreateBundleForm @@ -38,6 +39,11 @@ def patch_list(request, project_id): return render(request, 'patchwork/list.html', context) +def patch_list_redirect(request, project_id): + new_url = reverse('patch-list', kwargs={'project_id': project_id}) + return redirect(f'{new_url}?{request.GET.urlencode()}') + + def patch_detail(request, project_id, msgid): project = get_object_or_404(Project, linkname=project_id) db_msgid = Patch.decode_msgid(msgid) diff --git a/patchwork/views/series.py b/patchwork/views/series.py index a8892ae6a..7c45fb741 100644 --- a/patchwork/views/series.py +++ b/patchwork/views/series.py @@ -2,12 +2,16 @@ # Copyright (C) 2017 Stephen Finucane # # SPDX-License-Identifier: GPL-2.0-or-later +import collections from django.http import HttpResponse from django.shortcuts import get_object_or_404 +from django.shortcuts import render from patchwork.models import Series +from patchwork.models import Project from patchwork.views.utils import series_to_mbox +from patchwork.paginator import Paginator def series_mbox(request, series_id): @@ -20,3 +24,43 @@ def series_mbox(request, series_id): ) return response + + +def series_list(request, project_id): + project = get_object_or_404(Project, linkname=project_id) + sort = request.GET.get('order', 'date.desc') + sort_field, sort_dir = sort.split('.') + sort_order = f"{'-' if sort_dir == 'desc' else ''}{sort_field}" + context = {} + series_list = ( + Series.objects.filter(project=project) + .only( + 'submitter', + 'project', + 'version', + 'name', + 'date', + 'id', + 'cover_letter', + ) + .select_related('project', 'submitter', 'cover_letter') + .order_by(sort_order) + ) + + paginator = Paginator(request, series_list) + context.update( + { + 'project': project, + 'projects': Project.objects.all(), + 'series_list': series_list, + 'page': paginator.current_page, + 'order': sort, + 'list_view': { + 'view': 'series-list', + 'view_params': {'project_id': project.linkname}, + 'params': collections.OrderedDict(), + }, + } + ) + + return render(request, 'patchwork/series-list.html', context) From 4770c98511503e0825b29d0c93b14fdb6ab09f45 Mon Sep 17 00:00:00 2001 From: andrepapoti Date: Mon, 22 Apr 2024 15:26:04 -0300 Subject: [PATCH 2/8] tests: Add tests for series list view Signed-off-by: andrepapoti --- patchwork/tests/views/test_series.py | 51 ++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 patchwork/tests/views/test_series.py diff --git a/patchwork/tests/views/test_series.py b/patchwork/tests/views/test_series.py new file mode 100644 index 000000000..c37a98df0 --- /dev/null +++ b/patchwork/tests/views/test_series.py @@ -0,0 +1,51 @@ +# Patchwork - automated patch tracking system +# Copyright (C) 2024 Meta Platforms, Inc. and affiliates. +# +# SPDX-License-Identifier: GPL-2.0-or-later + +from datetime import datetime as dt + +from django.test import TestCase +from django.urls import reverse + +from patchwork.models import Person +from patchwork.tests.utils import create_patch +from patchwork.tests.utils import create_cover +from patchwork.tests.utils import create_person +from patchwork.tests.utils import create_project +from patchwork.tests.utils import create_series +from patchwork.tests.utils import create_user + + +class SeriesList(TestCase): + def setUp(self): + self.project = create_project() + self.user = create_user() + self.person_1 = Person.objects.get(user=self.user) + self.person_2 = create_person() + self.series_1 = create_series(project=self.project) + self.series_2 = create_series(project=self.project) + create_cover(project=self.project, series=self.series_1) + + for i in range(5): + create_patch( + submitter=self.person_1, + project=self.project, + series=self.series_1, + date=dt(2014, 3, 16, 13, 4, 50, 155643), + ) + create_patch( + submitter=self.person_2, + project=self.project, + series=self.series_2, + date=dt(2014, 3, 16, 13, 4, 50, 155643), + ) + + def test_series_list(self): + requested_url = reverse( + 'series-list', + kwargs={'project_id': self.project.linkname}, + ) + response = self.client.get(requested_url) + + self.assertEqual(response.status_code, 200) From 8659befffa1d399984823ab138f65cb13ae73773 Mon Sep 17 00:00:00 2001 From: andrepapoti Date: Tue, 23 Apr 2024 02:28:28 -0300 Subject: [PATCH 3/8] views: add series-detail view Signed-off-by: andrepapoti --- .../templates/patchwork/series-detail.html | 41 +++++++++++++++++++ .../templates/patchwork/series-list.html | 2 + patchwork/urls.py | 5 +++ patchwork/views/series.py | 23 +++++++++++ 4 files changed, 71 insertions(+) create mode 100644 patchwork/templates/patchwork/series-detail.html diff --git a/patchwork/templates/patchwork/series-detail.html b/patchwork/templates/patchwork/series-detail.html new file mode 100644 index 000000000..d38d7b9f9 --- /dev/null +++ b/patchwork/templates/patchwork/series-detail.html @@ -0,0 +1,41 @@ +{% extends "base.html" %} + +{% load humanize %} +{% load syntax %} +{% load person %} +{% load patch %} +{% load static %} +{% load utils %} + +{% block title %}{{series.name}}{% endblock %} + +{% block body %} + +
+

{{ series.name }}

+
+ + + + + + + + + + + + + + + + + + +
Cover Letter{{ series.cover_letter.content|default:"No cover letter available" }}
Date{{ series.date }}
Submitter{{ series.submitter }}
Total{{ series.patches }}
+
+

Patches

+
+{% include "patchwork/partials/patch-list.html" %} + +{% endblock %} diff --git a/patchwork/templates/patchwork/series-list.html b/patchwork/templates/patchwork/series-list.html index f157c6ca2..bd23c252d 100644 --- a/patchwork/templates/patchwork/series-list.html +++ b/patchwork/templates/patchwork/series-list.html @@ -75,7 +75,9 @@ {% endif %} + {{ series.name|default:"[no subject]"|truncatechars:100 }} + {{ series.version|default:"-"}} diff --git a/patchwork/urls.py b/patchwork/urls.py index 15343ad0f..63a2a0e2d 100644 --- a/patchwork/urls.py +++ b/patchwork/urls.py @@ -120,6 +120,11 @@ name='comment-redirect', ), # series views + path( + 'project//series//', + series_views.series_detail, + name='series-detail', + ), path( 'series//mbox/', series_views.series_mbox, diff --git a/patchwork/views/series.py b/patchwork/views/series.py index 7c45fb741..a36b80412 100644 --- a/patchwork/views/series.py +++ b/patchwork/views/series.py @@ -9,7 +9,9 @@ from django.shortcuts import render from patchwork.models import Series +from patchwork.models import Patch from patchwork.models import Project +from patchwork.views import generic_list from patchwork.views.utils import series_to_mbox from patchwork.paginator import Paginator @@ -26,6 +28,27 @@ def series_mbox(request, series_id): return response +def series_detail(request, project_id, series_id): + series = get_object_or_404(Series, id=series_id) + + patches = Patch.objects.filter(series=series) + + context = generic_list( + request, + series.project, + 'series-detail', + view_args={ + 'project_id': project_id, + 'series_id': series_id, + }, + patches=patches, + ) + + context.update({'series': series}) + + return render(request, 'patchwork/series-detail.html', context) + + def series_list(request, project_id): project = get_object_or_404(Project, linkname=project_id) sort = request.GET.get('order', 'date.desc') From ca73edf226e6fb6dd6f1feac696b76f41867054a Mon Sep 17 00:00:00 2001 From: Andre Papoti Date: Tue, 24 Dec 2024 17:18:39 -0300 Subject: [PATCH 4/8] views: add shortcut to series-list view on navigation bar --- templates/base.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/templates/base.html b/templates/base.html index 9519ecc55..49663d7f1 100644 --- a/templates/base.html +++ b/templates/base.html @@ -48,6 +48,12 @@ {% block navbarmenu %} {% if project %}
    +
  • + + + Series + +
  • From c7fb7dfa8fd17d13dfdffd312d672a03da44e988 Mon Sep 17 00:00:00 2001 From: Andre Papoti Date: Tue, 24 Dec 2024 17:19:05 -0300 Subject: [PATCH 5/8] views: add series navigation buttons for patch-detail view --- patchwork/templates/patchwork/submission.html | 14 ++++++++++++++ patchwork/views/patch.py | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/patchwork/templates/patchwork/submission.html b/patchwork/templates/patchwork/submission.html index cd74491c0..88ad58aa1 100644 --- a/patchwork/templates/patchwork/submission.html +++ b/patchwork/templates/patchwork/submission.html @@ -20,6 +20,20 @@

    {{ submission.name }}

    +
    + + next + +
    + +
    + + previous + +
    + diff --git a/patchwork/views/patch.py b/patchwork/views/patch.py index 198b26ca7..e1f86ef28 100644 --- a/patchwork/views/patch.py +++ b/patchwork/views/patch.py @@ -133,6 +133,20 @@ def patch_detail(request, project_id, msgid): if errors: context['errors'] = errors + try: + context['previous_submission'] = Patch.objects.get( + series=patch.series, number=patch.number - 1 + ) + except Patch.DoesNotExist: + context['previous_submission'] = None + + try: + context['next_submission'] = Patch.objects.get( + series=patch.series, number=patch.number + 1 + ) + except Patch.DoesNotExist: + context['next_submission'] = None + return render(request, 'patchwork/submission.html', context) From 330d2b023b1b9961384aaffcf6afc47c05d0be8d Mon Sep 17 00:00:00 2001 From: andrepapoti Date: Mon, 22 Apr 2024 15:44:07 -0300 Subject: [PATCH 6/8] docs: add release notes for series-list and series-detail Signed-off-by: andrepapoti --- .../notes/add_series_list_view-bf219022216fea6a.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 releasenotes/notes/add_series_list_view-bf219022216fea6a.yaml diff --git a/releasenotes/notes/add_series_list_view-bf219022216fea6a.yaml b/releasenotes/notes/add_series_list_view-bf219022216fea6a.yaml new file mode 100644 index 000000000..c8b32e6a6 --- /dev/null +++ b/releasenotes/notes/add_series_list_view-bf219022216fea6a.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + A series view is now available, allowing users to list available series and + view details of individual series. From 6eb5ae4dbfac479bc84baff75f3357168de109c9 Mon Sep 17 00:00:00 2001 From: Victor Accarini Date: Mon, 17 Feb 2025 21:45:41 -0300 Subject: [PATCH 7/8] fixup! views: add series-list view --- patchwork/models.py | 27 +++++++ .../templates/patchwork/series-list.html | 21 +++-- patchwork/templatetags/series.py | 76 +++++++++++++++++++ 3 files changed, 116 insertions(+), 8 deletions(-) create mode 100644 patchwork/templatetags/series.py diff --git a/patchwork/models.py b/patchwork/models.py index a05db7f9c..d2a2ae479 100644 --- a/patchwork/models.py +++ b/patchwork/models.py @@ -14,6 +14,7 @@ from django.contrib.auth.models import User from django.core.exceptions import ValidationError from django.core.validators import validate_unicode_slug +from django.db.models import Count from django.db import models from django.urls import reverse from django.utils.functional import cached_property @@ -880,6 +881,32 @@ def received_total(self): def received_all(self): return self.total <= self.received_total + @property + def interest_count(self): + count = self.patches.aggregate( + Count('planning_to_review', distinct=True) + ) + return count['planning_to_review__count'] + + @property + def check_count(self): + """Generate a list of unique checks for all patchs in the series. + + Compile a list of checks associated with this series patches for each + type of check. Only "unique" checks are considered, identified by their + 'context' field. This means, given n checks with the same 'context', the + newest check is the only one counted regardless of its value. The end + result will be a association of types to number of unique checks for + said type. + """ + counts = {key: 0 for key, _ in Check.STATE_CHOICES} + + for p in self.patches.all(): + for check in p.checks: + counts[check.state] += 1 + + return counts + def add_cover_letter(self, cover): """Add a cover letter to the series. diff --git a/patchwork/templates/patchwork/series-list.html b/patchwork/templates/patchwork/series-list.html index bd23c252d..02887ebbf 100644 --- a/patchwork/templates/patchwork/series-list.html +++ b/patchwork/templates/patchwork/series-list.html @@ -11,6 +11,7 @@ {% load person %} {% load listurl %} {% load patch %} +{% load series %} {% load project %} {% load static %} @@ -37,7 +38,15 @@ + + + + + + + diff --git a/patchwork/templatetags/series.py b/patchwork/templatetags/series.py new file mode 100644 index 000000000..a235b420f --- /dev/null +++ b/patchwork/templatetags/series.py @@ -0,0 +1,76 @@ +# Patchwork - automated patch tracking system +# Copyright (C) 2008 Jeremy Kerr +# Copyright (C) 2015 Intel Corporation +# +# SPDX-License-Identifier: GPL-2.0-or-later + +from django import template +from django.utils.safestring import mark_safe + +from patchwork.models import Check + + +register = template.Library() + + +@register.filter(name='series_tags') +def series_tags(series): + counts = [] + titles = [] + + for tag in [t for t in series.project.tags if t.show_column]: + count = 0 + for patch in series.patches.with_tag_counts(series.project).all(): + count += getattr(patch, tag.attr_name) + + titles.append('%d %s' % (count, tag.name)) + if count == 0: + counts.append('-') + else: + counts.append(str(count)) + + return mark_safe( + '%s' % (' / '.join(titles), ' '.join(counts)) + ) + + +@register.filter(name='series_checks') +def series_checks(series): + required = [Check.STATE_SUCCESS, Check.STATE_WARNING, Check.STATE_FAIL] + titles = ['Success', 'Warning', 'Fail'] + counts = series.check_count + + check_elements = [] + for state in required[::-1]: + if counts[state]: + color = dict(Check.STATE_CHOICES).get(state) + count = str(counts[state]) + else: + color = '' + count = '-' + + check_elements.append( + f'{count}' + ) + + check_elements.reverse() + + return mark_safe( + '%s' + % (' / '.join(titles), ''.join(check_elements)) + ) + + +@register.filter(name='series_interest') +def series_interest(series): + reviews = series.interest_count + review_title = ( + f'has {reviews} interested reviewers' + if reviews > 0 + else 'no interested reviewers' + ) + review_class = 'exists' if reviews > 0 else '' + return mark_safe( + '%s' + % (review_class, review_title, reviews if reviews > 0 else '-') + ) From 9cc89340e93753108afa444f6895ebb5f3e77ffe Mon Sep 17 00:00:00 2001 From: Victor Accarini Date: Tue, 18 Feb 2025 09:57:54 -0300 Subject: [PATCH 8/8] fixup! views: add series-detail view --- patchwork/models.py | 6 +++--- .../patchwork/partials/download-buttons.html | 11 +++++++++++ .../templates/patchwork/series-detail.html | 17 +++++++++++++++-- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/patchwork/models.py b/patchwork/models.py index d2a2ae479..18420160e 100644 --- a/patchwork/models.py +++ b/patchwork/models.py @@ -962,10 +962,10 @@ def add_patch(self, patch, number): return patch def get_absolute_url(self): - # TODO(stephenfin): We really need a proper series view return reverse( - 'patch-list', kwargs={'project_id': self.project.linkname} - ) + ('?series=%d' % self.id) + 'series-detail', + kwargs={'project_id': self.project.linkname, 'series_id': self.id}, + ) def get_mbox_url(self): return reverse('series-mbox', kwargs={'series_id': self.id}) diff --git a/patchwork/templates/patchwork/partials/download-buttons.html b/patchwork/templates/patchwork/partials/download-buttons.html index 34c5f8fc6..292ecb7bf 100644 --- a/patchwork/templates/patchwork/partials/download-buttons.html +++ b/patchwork/templates/patchwork/partials/download-buttons.html @@ -1,4 +1,5 @@
    +{% if submission %} + + series + +{% endif %}
    diff --git a/patchwork/templates/patchwork/series-detail.html b/patchwork/templates/patchwork/series-detail.html index d38d7b9f9..3da9edbb8 100644 --- a/patchwork/templates/patchwork/series-detail.html +++ b/patchwork/templates/patchwork/series-detail.html @@ -12,13 +12,17 @@ {% block body %}
    +{% include "patchwork/partials/download-buttons.html" %}

    {{ series.name }}

    Message ID - Cover Letter + {% project_tags %} + + S/W/F + + Review Interest @@ -83,13 +92,9 @@ {{ series.version|default:"-"}} - - {% if series.cover_letter.content %} - ✓ - {% else %} - - - {% endif %} - {{ series|series_tags }}{{ series|series_checks }}{{ series|series_interest }} {{ series.received_total}} {{ series.date|date:"Y-m-d" }} {{ series.submitter|personify:project }}
    - - + + @@ -38,4 +42,13 @@

    Patches


    {% include "patchwork/partials/patch-list.html" %} +
    +

    Cover Letter

    + {% if series.cover_letter.content %} + 
    {{ series.cover_letter.content }}
    + {% else %} + No cover letter available + {% endif %} +
    + {% endblock %}
    Cover Letter{{ series.cover_letter.content|default:"No cover letter available" }}Series ID + {{ series.id }} + +
    Date