Merge branch 'main' into feat/rfc

README.md

@@ -58,6 +58,8 @@ Click the <kbd>Fork</kbd> button in the top-right corner of the repository to cr
 
 As outlined in the [Contributing](https://github.com/ietf-tools/.github/blob/main/CONTRIBUTING.md) guide, you will first want to create a fork of the datatracker project in your personal GitHub account before cloning it.
 
+Windows developers: [Start with WSL2 from the beginning](https://github.com/ietf-tools/.github/blob/main/docs/windows-dev.md).
+
 Because of the extensive history of this project, cloning the datatracker project locally can take a long time / disk space. You can speed up the cloning process by limiting the history depth, for example *(replace `USERNAME` with your GitHub username)*:
 
 - To fetch only up to the 10 latest commits:

client/agenda/Agenda.vue

@@ -9,7 +9,7 @@
       span.meeting-warning(v-if='agendaStore.meeting.warningNote') {{agendaStore.meeting.warningNote}}
   h4
     span {{agendaStore.meeting.city}}, {{ meetingDate }}
-    h6.float-end.d-none.d-lg-inline(v-if='meetingUpdated') #[span.text-muted Updated:] {{ meetingUpdated }}
+    h6.float-end.d-none.d-lg-inline(v-if='meetingUpdated') #[span.text-body-secondary Updated:] {{ meetingUpdated }}
 
   .agenda-topnav.my-3
     meeting-navigation
@@ -49,7 +49,7 @@
           n-popover(v-if='!agendaStore.infoNoteShown')
             template(#trigger)
               n-button.ms-2(text, @click='toggleInfoNote')
-                i.bi.bi-info-circle.text-muted
+                i.bi.bi-info-circle.text-body-secondary
             span Show Info Note
         .col-12.col-sm-auto.d-flex.align-items-center
           i.bi.bi-globe.me-2

client/agenda/AgendaQuickAccess.vue

@@ -58,7 +58,7 @@
             )
             i.bi.bi-x-square.me-2
             span Discard
-        n-divider: small.text-muted Calendar
+        n-divider: small.text-body-secondary Calendar
         n-button.mt-2(
           id='agenda-quickaccess-calview-btn'
           block
@@ -86,7 +86,7 @@
             i.bi.bi-calendar-check.me-2
             span {{ shortMode ? '.ics' : 'Add to your calendar...' }}
         template(v-if='agendaStore.meetingDays.length > 0')
-          n-divider: small.text-muted Jump to...
+          n-divider: small.text-body-secondary Jump to...
           ul.nav.nav-pills.flex-column.small.agenda-quickaccess-jumpto
             li.nav-item(v-if='agendaStore.isMeetingLive')
               a.nav-link(

client/agenda/AgendaShareModal.vue

@@ -20,7 +20,7 @@ n-modal(v-model:show='modalShown')
         i.bi.bi-share
         span Share this view
     .agenda-share-content
-      .text-muted.pb-2 Use the following URL for sharing the current view #[em (including any active filters)] with other users:
+      .text-body-secondary.pb-2 Use the following URL for sharing the current view #[em (including any active filters)] with other users:
       n-input-group
         n-input(
           ref='filteredUrlIpt'

client/components/ChatLog.vue

@@ -15,7 +15,7 @@
       )
       template(#default)
         div(v-html='item.text')
-  span.text-muted(v-else)
+  span.text-body-secondary(v-else)
     em No chat log available.
 </template>
 

client/components/Polls.vue

@@ -6,7 +6,7 @@
     :columns='columns'
     striped
     )
-  span.text-muted(v-else)
+  span.text-body-secondary(v-else)
     em No polls available.
 </template>
 

dev/coverage-action/package.json

@@ -14,11 +14,11 @@
     "luxon": "3.3.0"
   },
   "devDependencies": {
-    "eslint": "8.42.0",
+    "eslint": "8.43.0",
     "eslint-config-standard": "17.1.0",
     "eslint-plugin-import": "2.27.5",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-promise": "6.1.1",
-    "npm-check-updates": "16.10.12"
+    "npm-check-updates": "16.10.13"
   }
 }

dev/diff/package.json

@@ -2,12 +2,12 @@
   "name": "diff",
   "type": "module",
   "dependencies": {
-    "chalk": "^5.2.0",
+    "chalk": "^5.3.0",
     "dockerode": "^3.3.5",
     "enquirer": "^2.3.6",
     "extract-zip": "^2.0.1",
     "fs-extra": "^11.1.1",
-    "got": "^12.6.1",
+    "got": "^13.0.0",
     "keypress": "^0.2.1",
     "listr2": "^6.6.0",
     "lodash-es": "^4.17.21",

ietf/doc/tests.py

@@ -2558,6 +2558,7 @@ def test_personal_chart(self):
         d = r.json()
         self.assertEqual(len(d), 1)
         self.assertEqual(len(d[0]), 2)
+        self.assertEqual(d[0][1], 1) 
 
         page_url = urlreverse('ietf.person.views.profile', kwargs=dict(email_or_name=person.name))
         r = self.client.get(page_url)

ietf/doc/tests_utils.py

@@ -310,7 +310,7 @@ def test_build_file_urls(self, mocked):
             build_file_urls(WgDraftFactory(rev=''))
 
         urls, types = build_file_urls(WgDraftFactory(rev='23'))
-        self.assertEqual(['xml', 'bibtex'], [t for t, _ in urls])
+        self.assertEqual(['xml', 'bibtex', 'bibxml'], [t for t, _ in urls])
         self.assertEqual(types, ['xml'])
 
         urls, types = build_file_urls(WgRfcFactory(rev=''))

ietf/doc/utils.py

@@ -1035,6 +1035,7 @@ def build_file_urls(doc: Union[Document, DocHistory]):
             file_urls.append(("htmlized", urlreverse('ietf.doc.views_doc.document_html', kwargs=dict(name=doc.name, rev=doc.rev))))
             file_urls.append(("pdfized", urlreverse('ietf.doc.views_doc.document_pdfized', kwargs=dict(name=doc.name, rev=doc.rev))))
         file_urls.append(("bibtex", urlreverse('ietf.doc.views_doc.document_bibtex',kwargs=dict(name=doc.name,rev=doc.rev))))
+        file_urls.append(("bibxml", urlreverse('ietf.doc.views_doc.document_bibxml',kwargs=dict(name=doc.name,rev=doc.rev))))
     else:
         if doc.type_id == "draft":
             # TODO: look at the state of the database post migration and update this comment, or remove the block

ietf/doc/views_stats.py

@@ -40,7 +40,7 @@ def model_to_timeline_data(model, field='time', **kwargs):
     assert field in [ f.name for f in model._meta.get_fields() ]
 
     objects = ( model.objects.filter(**kwargs)
-                                .annotate(date=TruncDate(field))
+                                .annotate(date=TruncDate(field, tzinfo=datetime.timezone.utc))
                                 .order_by('date')
                                 .values('date')
                                 .annotate(count=Count('id')))

ietf/ietfauth/widgets.py

@@ -41,7 +41,7 @@ def render(self, name, value, attrs=None, renderer=None):
             <div class="progress" style="margin-bottom: 10px;">
                 <div class="progress-bar progress-bar-warning password_strength_bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="5" style="width: 0%%"></div>
             </div>
-            <p class="text-muted password_strength_info hidden">
+            <p class="text-body-secondary password_strength_info hidden">
                 <span class="label label-danger">
                     %s
                 </span>
@@ -89,7 +89,7 @@ def render(self, name, value, attrs=None, renderer=None):
 
         confirmation_markup = """
         <div style="margin-top: 10px;" class="hidden password_strength_info">
-            <p class="text-muted">
+            <p class="text-body-secondary">
                 <span class="label label-danger">
                     %s
                 </span>

ietf/name/fixtures/names.json

@@ -2987,7 +2987,7 @@
       "parent_types": [],
       "req_subm_approval": false,
       "role_order": "[\n    \"chair\",\n    \"member\"\n]",
-      "session_purposes": "[\n    \"officehourse\",\n    \"regular\"\n]",
+      "session_purposes": "[\n    \"officehours\",\n    \"regular\"\n]",
       "show_on_agenda": true
     },
     "model": "group.groupfeatures",

ietf/nomcom/templatetags/nomcom_tags.py

@@ -1,8 +1,10 @@
-# Copyright The IETF Trust 2013-2019, All Rights Reserved
+# Copyright The IETF Trust 2013-2023, All Rights Reserved
 import os
 import tempfile
 import re
 
+from collections import defaultdict
+
 from django import template
 from django.conf import settings
 from django.template.defaultfilters import linebreaksbr, force_escape
@@ -84,3 +86,11 @@ def decrypt(string, request, year, plain=False):
     if not plain:
         return force_escape(linebreaksbr(out))
     return mark_safe(force_escape(out))
+
+@register.filter
+def feedback_totals(staterank_list):
+    totals = defaultdict(lambda: 0)
+    for fb_dict in staterank_list:
+        for fbtype_name, fbtype_count, _ in fb_dict['feedback']:
+            totals[fbtype_name] += fbtype_count
+    return totals.values()