From af21347b67a5663b46c41d9c91f7e0ef4ef0b920 Mon Sep 17 00:00:00 2001
From: Matthew Holloway <matthew@staff.ietf.org>
Date: Sat, 24 Aug 2024 10:50:31 +1200
Subject: [PATCH 1/6] fix: Dark mode bug, pinia store reset across Vite entry
 points (#7851)

---
 client/embedded.js                      | 4 ++--
 client/main.js                          | 4 ++--
 client/shared/create-pinia-singleton.js | 6 ++++++
 3 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 client/shared/create-pinia-singleton.js

diff --git a/client/embedded.js b/client/embedded.js
index 3b104650c..0509c0aec 100644
--- a/client/embedded.js
+++ b/client/embedded.js
@@ -1,11 +1,11 @@
 import { createApp } from 'vue'
-import { createPinia } from 'pinia'
 import piniaPersist from 'pinia-plugin-persist'
 import Embedded from './Embedded.vue'
+import { createPiniaSingleton } from './shared/create-pinia-singleton'
 
 // Initialize store (Pinia)
 
-const pinia = createPinia()
+const pinia = createPiniaSingleton()
 pinia.use(piniaPersist)
 
 // Mount App
diff --git a/client/main.js b/client/main.js
index 0dc5cf32e..3fbad907b 100644
--- a/client/main.js
+++ b/client/main.js
@@ -1,14 +1,14 @@
 import { createApp } from 'vue'
-import { createPinia } from 'pinia'
 import piniaPersist from 'pinia-plugin-persist'
 import App from './App.vue'
 import router from './router'
+import { createPiniaSingleton } from './shared/create-pinia-singleton'
 
 const app = createApp(App, {})
 
 // Initialize store (Pinia)
 
-const pinia = createPinia()
+const pinia = createPiniaSingleton()
 pinia.use(piniaPersist)
 app.use(pinia)
 
diff --git a/client/shared/create-pinia-singleton.js b/client/shared/create-pinia-singleton.js
new file mode 100644
index 000000000..f0013245a
--- /dev/null
+++ b/client/shared/create-pinia-singleton.js
@@ -0,0 +1,6 @@
+import { createPinia } from 'pinia'
+
+export function createPiniaSingleton(){
+  window.pinia = window.pinia ?? createPinia()
+  return window.pinia
+}

From bece8fd71bb58e214acf1c02ba1ccbe000d23dd6 Mon Sep 17 00:00:00 2001
From: Matthew Holloway <matthew@staff.ietf.org>
Date: Tue, 27 Aug 2024 01:03:15 +1200
Subject: [PATCH 2/6] feat: Agenda URL #hash scrolls to 'now' or specific day
 (#7772)

* feat: Agenda URL #now scroll to current event

* fix: agendaData date offset for dev purposes

* feat: scroll to day

* fix: Showing correct hostname in agenda modify log

* feat: mobile menu scroll to hash and general bug fixes

* fix: agenda mobile menu formatting and Playwright selectors

* fix: removing spurious ? mark

* chore: removing redundant agenda time setter in favour of agenda settings panel for debugging

* style: Update AgendaMobileBar.vue

* style: Update AgendaScheduleList.vue

---------

Co-authored-by: Nicolas Giard <github@ngpixel.com>
---
 client/agenda/Agenda.vue                |  2 +-
 client/agenda/AgendaMobileBar.vue       | 54 +++++++++++++++++++++----
 client/agenda/AgendaQuickAccess.vue     | 10 ++---
 client/agenda/AgendaScheduleList.vue    | 29 ++++++++++++-
 client/agenda/store.js                  |  7 +++-
 playwright/tests/meeting/agenda.spec.js |  2 +-
 6 files changed, 85 insertions(+), 19 deletions(-)

diff --git a/client/agenda/Agenda.vue b/client/agenda/Agenda.vue
index 40dae008a..99a46f4fe 100644
--- a/client/agenda/Agenda.vue
+++ b/client/agenda/Agenda.vue
@@ -434,7 +434,7 @@ function reconnectScrollObservers () {
   scrollObserver.disconnect()
   visibleDays.length = 0
   for (const mDay of agendaStore.meetingDays) {
-    const el = document.getElementById(`agenda-day-${mDay.slug}`)
+    const el = document.getElementById(mDay.slug)
     el.dataset.dayId = mDay.slug.toString()
     el.dataset.dayTs = mDay.ts
     scrollObserver.observe(el)
diff --git a/client/agenda/AgendaMobileBar.vue b/client/agenda/AgendaMobileBar.vue
index 5d15e9e69..78af96e25 100644
--- a/client/agenda/AgendaMobileBar.vue
+++ b/client/agenda/AgendaMobileBar.vue
@@ -29,7 +29,6 @@
 
 <script setup>
 import { computed, h } from 'vue'
-
 import {
   NBadge,
   NDropdown,
@@ -51,21 +50,48 @@ const siteStore = useSiteStore()
 
 // Meeting Days
 
+function optionToLink(opts){
+  const { key, label, icon } = opts
+
+  return {
+    ...opts,
+    type: 'render',
+    render: () => h(
+      'a',
+      {
+        class: 'dropdown-link',
+        'data-testid': 'mobile-link',
+        href: `#${key}`
+      },
+      [
+        h(
+          'span',
+          icon()
+        ),
+        h(
+          'span',
+          label
+        )
+      ]
+    )
+  }
+}
+
 const jumpToDayOptions = computed(() => {
   const days = []
   if (agendaStore.isMeetingLive) {
-    days.push({
+    days.push(optionToLink({
       label: 'Jump to Now',
       key: 'now',
       icon: () => h('i', { class: 'bi bi-arrow-down-right-square text-red' })
-    })
+    }))
   }
   for (const day of agendaStore.meetingDays) {
-    days.push({
+    days.push(optionToLink({
       label: `Jump to ${day.label}`,
       key: day.slug,
       icon: () => h('i', { class: 'bi bi-arrow-down-right-square' })
-    })
+    }))
   }
   return days
 })
@@ -90,14 +116,13 @@ const downloadIcsOptions = [
 function jumpToDay (dayId) {
   if (dayId === 'now') {
     const lastEventId = agendaStore.findCurrentEventId()
-
     if (lastEventId) {
       document.getElementById(`agenda-rowid-${lastEventId}`)?.scrollIntoView(true)
     } else {
       message.warning('There is no event happening right now.')
     }
   } else {
-    document.getElementById(`agenda-day-${dayId}`)?.scrollIntoView(true)
+    document.getElementById(dayId)?.scrollIntoView(true)
   }
 }
 
@@ -162,4 +187,19 @@ function downloadIcs (key) {
     }
   }
 }
+
+.dropdown-link {
+  display: flex;
+  text-decoration:none;
+  gap: 0.2rem 0.5rem;
+  padding: 0.5em;
+  color: var(--bs-body-color);
+  
+  &:hover,
+  &:focus {
+    background-color: var(--bs-dark-bg-subtle);
+    text-decoration: underline;
+  }
+}
+
 </style>
diff --git a/client/agenda/AgendaQuickAccess.vue b/client/agenda/AgendaQuickAccess.vue
index 99adc1027..b226d09c6 100644
--- a/client/agenda/AgendaQuickAccess.vue
+++ b/client/agenda/AgendaQuickAccess.vue
@@ -99,7 +99,7 @@
             li.nav-item(v-for='day of agendaStore.meetingDays')
               a.nav-link(
                 :class='agendaStore.dayIntersectId === day.slug ? `active` : ``'
-                :href='`#slot-` + day.slug'
+                :href='`#${day.slug}`'
                 @click='scrollToDay(day.slug, $event)'
                 )
                 i.bi.bi-arrow-right-short.d-none.d-xxl-inline.me-2
@@ -109,7 +109,6 @@
 <script setup>
 import { computed, h } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { DateTime } from 'luxon'
 import {
   NAffix,
   NBadge,
@@ -200,14 +199,11 @@ function pickerDiscard () {
   }
 }
 
-function scrollToDay (dayId, ev) {
-  ev.preventDefault()
-  document.getElementById(`agenda-day-${dayId}`)?.scrollIntoView(true)
+function scrollToDay (daySlug, ev) {
+  document.getElementById(daySlug)?.scrollIntoView(true)
 }
 
 function scrollToNow (ev) {
-  ev.preventDefault()
-
   const lastEventId = agendaStore.findCurrentEventId()
 
   if (lastEventId) {
diff --git a/client/agenda/AgendaScheduleList.vue b/client/agenda/AgendaScheduleList.vue
index a6d2b9a5a..286999257 100644
--- a/client/agenda/AgendaScheduleList.vue
+++ b/client/agenda/AgendaScheduleList.vue
@@ -24,7 +24,7 @@
           )
           //- ROW - DAY HEADING -----------------------
           template(v-if='item.displayType === `day`')
-            td(:id='`agenda-day-` + item.id', :colspan='pickerModeActive ? 6 : 5') {{item.date}}
+            td(:id='item.slug', :colspan='pickerModeActive ? 6 : 5') {{item.date}}
           //- ROW - SESSION HEADING -------------------
           template(v-else-if='item.displayType === `session-head`')
             td.agenda-table-cell-check(v-if='pickerModeActive') &nbsp;
@@ -200,7 +200,7 @@ import {
 
 import AgendaDetailsModal from './AgendaDetailsModal.vue'
 
-import { useAgendaStore } from './store'
+import { useAgendaStore, daySlugPrefix, daySlug } from './store'
 import { useSiteStore } from '../shared/store'
 import { getUrl } from '../shared/urls'
 
@@ -248,6 +248,7 @@ const meetingEvents = computed(() => {
     if (itemDate.toISODate() !== acc.lastDate) {
       acc.result.push({
         id: item.id,
+        slug: daySlug(item),
         key: `day-${itemDate.toISODate()}`,
         displayType: 'day',
         date: itemDate.toLocaleString(DateTime.DATE_HUGE),
@@ -575,6 +576,30 @@ function recalculateRedLine () {
   }
 }
 
+/**
+ * On page load when browser location hash contains '#now' or '#agenda-day-*' then scroll accordingly
+ */
+;(function scrollToHashInit() {
+  if (!window.location.hash) {
+    return
+  }
+  if (!(window.location.hash === "#now" || window.location.hash.startsWith(`#${daySlugPrefix}`))) {
+    return
+  }
+  const unsubscribe = agendaStore.$subscribe((_mutation, agendaStoreState) => {
+    if (agendaStoreState.schedule.length === 0) {
+      return
+    }
+    unsubscribe() // we only need to scroll once, so unsubscribe from future updates
+    if(window.location.hash === "#now") {
+      const lastEventId = agendaStore.findCurrentEventId()
+      document.getElementById(`agenda-rowid-${lastEventId}`)?.scrollIntoView(true)
+    } else if(window.location.hash.startsWith(`#${daySlugPrefix}`)) {
+      document.getElementById(window.location.hash.substring(1))?.scrollIntoView(true)
+    }
+  })
+})()
+
 // MOUNTED
 
 onMounted(() => {
diff --git a/client/agenda/store.js b/client/agenda/store.js
index 18c3e8c65..71c121972 100644
--- a/client/agenda/store.js
+++ b/client/agenda/store.js
@@ -121,7 +121,7 @@ export const useAgendaStore = defineStore('agenda', {
     meetingDays () {
       const siteStore = useSiteStore()
       return uniqBy(this.scheduleAdjusted, 'adjustedStartDate').sort().map(s => ({
-        slug: s.id.toString(),
+        slug: daySlug(s),
         ts: s.adjustedStartDate,
         label: siteStore.viewport < 1350 ? DateTime.fromISO(s.adjustedStartDate).toFormat('ccc LLL d') : DateTime.fromISO(s.adjustedStartDate).toLocaleString(DateTime.DATE_HUGE)
       }))
@@ -292,3 +292,8 @@ function findFirstConferenceUrl (txt) {
   } catch (err) { }
   return null
 }
+
+export const daySlugPrefix = 'agenda-day-'
+export function daySlug(s) {
+  return `${daySlugPrefix}${s.adjustedStartDate}` // eg 'agenda-day-2024-08-13'
+}
diff --git a/playwright/tests/meeting/agenda.spec.js b/playwright/tests/meeting/agenda.spec.js
index 4bd870ebc..109e1b3b8 100644
--- a/playwright/tests/meeting/agenda.spec.js
+++ b/playwright/tests/meeting/agenda.spec.js
@@ -1431,7 +1431,7 @@ test.describe('past - small screens', () => {
 
         // can open the jump to day dropdown
         await barBtnLocator.first().click()
-        const jumpDayDdnLocator = page.locator('.n-dropdown-menu > .n-dropdown-option')
+        const jumpDayDdnLocator = page.locator('.n-dropdown-menu [data-testid=mobile-link]')
         await expect(jumpDayDdnLocator).toHaveCount(7)
         for (let idx = 0; idx < 7; idx++) {
           const localDateTime = DateTime.fromISO(meetingData.meeting.startDate, { zone: meetingData.meeting.timezone })

From 715edafcdca16ea89797628d9cea2c3d2ee5ac36 Mon Sep 17 00:00:00 2001
From: Matthew Holloway <matthew@staff.ietf.org>
Date: Thu, 29 Aug 2024 00:51:05 +1200
Subject: [PATCH 3/6] fix: return to ballotpopup (#7858)

* fix: return to ballotpopup

* fix: ballot position return to in modals

* fix: ballot return to test

* fix: ballot return to additional allow handlers

* fix: ballot return to handler syntax error in test
---
 ietf/doc/templatetags/ballot_icon.py | 13 +++++++++++--
 ietf/doc/tests_ballot.py             | 20 ++++++++------------
 ietf/doc/views_ballot.py             | 13 +++++++++++++
 ietf/doc/views_doc.py                | 10 +++++++++-
 ietf/templates/doc/ballot_popup.html |  2 +-
 5 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/ietf/doc/templatetags/ballot_icon.py b/ietf/doc/templatetags/ballot_icon.py
index ebcc605cd..5f59822c7 100644
--- a/ietf/doc/templatetags/ballot_icon.py
+++ b/ietf/doc/templatetags/ballot_icon.py
@@ -96,9 +96,14 @@ def ballot_icon(context, doc):
     positions = list(ballot.active_balloter_positions().items())
     positions.sort(key=sort_key)
 
+    request = context.get("request")
+    ballot_edit_return_point_param = f"ballot_edit_return_point={request.path}"
+
     right_click_string = ''
     if has_role(user, "Area Director"):
-        right_click_string = 'oncontextmenu="window.location.href=\'%s\';return false;"' %  urlreverse('ietf.doc.views_ballot.edit_position', kwargs=dict(name=doc.name, ballot_id=ballot.pk))
+        right_click_string = 'oncontextmenu="window.location.href=\'{}?{}\';return false;"'.format(
+            urlreverse('ietf.doc.views_ballot.edit_position', kwargs=dict(name=doc.name, ballot_id=ballot.pk)),
+            ballot_edit_return_point_param)
 
     my_blocking = False
     for i, (balloter, pos) in enumerate(positions):
@@ -113,10 +118,14 @@ def ballot_icon(context, doc):
         typename = "RSAB"
     else:
         typename = "IESG"
+    
+    modal_url = "{}?{}".format(
+        urlreverse("ietf.doc.views_doc.ballot_popup", kwargs=dict(name=doc.name, ballot_id=ballot.pk)),
+        ballot_edit_return_point_param)
 
     res = ['<a %s href="%s" data-bs-toggle="modal" data-bs-target="#modal-%d" aria-label="%s positions" title="%s positions (click to show more)" class="ballot-icon"><table' % (
             right_click_string,
-            urlreverse("ietf.doc.views_doc.ballot_popup", kwargs=dict(name=doc.name, ballot_id=ballot.pk)),
+            modal_url,
             ballot.pk,
             typename,
             typename,)]
diff --git a/ietf/doc/tests_ballot.py b/ietf/doc/tests_ballot.py
index 2403b6ef5..d77e2ddc9 100644
--- a/ietf/doc/tests_ballot.py
+++ b/ietf/doc/tests_ballot.py
@@ -1455,18 +1455,14 @@ class BallotContentTests(TestCase):
 
 class ReturnToUrlTests(TestCase):
     def test_invalid_return_to_url(self):
-        self.assertRaises(
-            Exception,
-            lambda: parse_ballot_edit_return_point('/doc/', 'draft-ietf-opsawg-ipfix-tcpo-v6eh', '998718'),
-        )
-        self.assertRaises(
-            Exception,
-            lambda: parse_ballot_edit_return_point('/a-route-that-does-not-exist/', 'draft-ietf-opsawg-ipfix-tcpo-v6eh', '998718'),
-        )
-        self.assertRaises(
-            Exception,
-            lambda: parse_ballot_edit_return_point('https://example.com/phishing', 'draft-ietf-opsawg-ipfix-tcpo-v6eh', '998718'),
-        )
+        with self.assertRaises(ValueError):
+            parse_ballot_edit_return_point('/', 'draft-ietf-opsawg-ipfix-tcpo-v6eh', '998718')
+
+        with self.assertRaises(ValueError):
+            parse_ballot_edit_return_point('/a-route-that-does-not-exist/', 'draft-ietf-opsawg-ipfix-tcpo-v6eh', '998718')
+
+        with self.assertRaises(ValueError):
+            parse_ballot_edit_return_point('https://example.com/phishing', 'draft-ietf-opsawg-ipfix-tcpo-v6eh', '998718')
 
     def test_valid_default_return_to_url(self):
         self.assertEqual(parse_ballot_edit_return_point(
diff --git a/ietf/doc/views_ballot.py b/ietf/doc/views_ballot.py
index 357bd2fa2..8d9ab0b74 100644
--- a/ietf/doc/views_ballot.py
+++ b/ietf/doc/views_ballot.py
@@ -1314,10 +1314,23 @@ def rsab_ballot_status(request):
 def parse_ballot_edit_return_point(path, doc_name, ballot_id):
     get_default_path = lambda: urlreverse("ietf.doc.views_doc.document_ballot", kwargs=dict(name=doc_name, ballot_id=ballot_id))
     allowed_path_handlers = {
+        "ietf.community.views.view_list",
         "ietf.doc.views_doc.document_ballot",
         "ietf.doc.views_doc.document_irsg_ballot",
         "ietf.doc.views_doc.document_rsab_ballot",
+        "ietf.doc.views_ballot.irsg_ballot_status",
+        "ietf.doc.views_ballot.rsab_ballot_status",
+        "ietf.doc.views_search.search",
+        "ietf.doc.views_search.docs_for_ad",
+        "ietf.doc.views_search.drafts_in_last_call",
+        "ietf.doc.views_search.recent_drafts",
+        "ietf.group.views.chartering_groups",
+        "ietf.group.views.group_documents",
+        "ietf.group.views.stream_documents",
         "ietf.iesg.views.agenda",
         "ietf.iesg.views.agenda_documents",
+        "ietf.iesg.views.discusses",
+        "ietf.iesg.views.past_documents",
     }
     return validate_return_to_path(path, get_default_path, allowed_path_handlers)
+
diff --git a/ietf/doc/views_doc.py b/ietf/doc/views_doc.py
index 0ef132c21..d12dd0418 100644
--- a/ietf/doc/views_doc.py
+++ b/ietf/doc/views_doc.py
@@ -43,7 +43,7 @@ from pathlib import Path
 
 from django.core.cache import caches
 from django.db.models import Max
-from django.http import HttpResponse, Http404
+from django.http import HttpResponse, Http404, HttpResponseBadRequest
 from django.shortcuts import render, get_object_or_404, redirect
 from django.template.loader import render_to_string
 from django.urls import reverse as urlreverse
@@ -73,6 +73,7 @@ from ietf.ietfauth.utils import ( has_role, is_authorized_in_doc_stream, user_is
     role_required, is_individual_draft_author, can_request_rfc_publication)
 from ietf.name.models import StreamName, BallotPositionName
 from ietf.utils.history import find_history_active_at
+from ietf.doc.views_ballot import parse_ballot_edit_return_point
 from ietf.doc.forms import InvestigateForm, TelechatForm, NotifyForm, ActionHoldersForm, DocAuthorForm, DocAuthorChangeBasisForm
 from ietf.doc.mails import email_comment, email_remind_action_holders
 from ietf.mailtrigger.utils import gather_relevant_expansions
@@ -1586,11 +1587,18 @@ def ballot_popup(request, name, ballot_id):
     doc = get_object_or_404(Document, name=name)
     c = document_ballot_content(request, doc, ballot_id=ballot_id, editable=False)
     ballot = get_object_or_404(BallotDocEvent,id=ballot_id)
+    
+    try:
+        return_to_url = parse_ballot_edit_return_point(request.GET.get('ballot_edit_return_point'), name, ballot_id)
+    except ValueError:
+        return HttpResponseBadRequest('ballot_edit_return_point is invalid')
+    
     return render(request, "doc/ballot_popup.html",
                               dict(doc=doc,
                                    ballot_content=c,
                                    ballot_id=ballot_id,
                                    ballot_type_slug=ballot.ballot_type.slug,
+                                   ballot_edit_return_point=return_to_url,
                                    editable=True,
                                    ))
 
diff --git a/ietf/templates/doc/ballot_popup.html b/ietf/templates/doc/ballot_popup.html
index 2c0863ab6..d2589cd54 100644
--- a/ietf/templates/doc/ballot_popup.html
+++ b/ietf/templates/doc/ballot_popup.html
@@ -27,7 +27,7 @@
             {% if editable and user|has_role:"Area Director,Secretariat,IRSG Member,RSAB Member" %}
                 {% if user|can_ballot:doc %}
                     <a class="btn btn-primary"
-                       href="{% url "ietf.doc.views_ballot.edit_position" name=doc.name ballot_id=ballot_id %}?ballot_edit_return_point={{ request.path|urlencode }}">
+                       href="{% url "ietf.doc.views_ballot.edit_position" name=doc.name ballot_id=ballot_id %}?ballot_edit_return_point={{ ballot_edit_return_point|urlencode }}">
                         Edit position
                     </a>
                 {% endif %}

From 1f6db0fef1e92b38fbd756e71b2faad7e1595998 Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Wed, 28 Aug 2024 14:17:14 -0500
Subject: [PATCH 4/6] feat: mark bofreqs as spam (#7869)

---
 ietf/doc/migrations/0023_bofreqspamstate.py | 30 +++++++++
 ietf/doc/tests_bofreq.py                    | 11 +++-
 ietf/name/fixtures/names.json               | 13 ++++
 ietf/templates/doc/bofreq/bof_requests.html | 68 +++++++++++----------
 4 files changed, 87 insertions(+), 35 deletions(-)
 create mode 100644 ietf/doc/migrations/0023_bofreqspamstate.py

diff --git a/ietf/doc/migrations/0023_bofreqspamstate.py b/ietf/doc/migrations/0023_bofreqspamstate.py
new file mode 100644
index 000000000..dbbaf996e
--- /dev/null
+++ b/ietf/doc/migrations/0023_bofreqspamstate.py
@@ -0,0 +1,30 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    State = apps.get_model("doc", "State")
+    State.objects.get_or_create(
+        type_id="bofreq",
+        slug="spam",
+        defaults={"name": "Spam", "desc": "The BOF request is spam", "order": 5},
+    )
+
+
+def reverse(apps, schema_editor):
+    State = apps.get_model("doc", "State")
+    Document = apps.get_model("doc", "Document")
+    assert not Document.objects.filter(
+        states__type="bofreq", states__slug="spam"
+    ).exists()
+    State.objects.filter(type_id="bofreq", slug="spam").delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("doc", "0022_remove_dochistory_internal_comments_and_more"),
+    ]
+
+    operations = [migrations.RunPython(forward, reverse)]
diff --git a/ietf/doc/tests_bofreq.py b/ietf/doc/tests_bofreq.py
index 319ab778d..2e27efd62 100644
--- a/ietf/doc/tests_bofreq.py
+++ b/ietf/doc/tests_bofreq.py
@@ -54,8 +54,8 @@ This test section has some text.
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         for state in states:
-            self.assertEqual(len(q(f'#bofreqs-{state.slug}')), 1)
-            self.assertEqual(len(q(f'#bofreqs-{state.slug} tbody tr')), 3)
+            self.assertEqual(len(q(f'#bofreqs-{state.slug}')), 1 if state.slug!="spam" else 0)
+            self.assertEqual(len(q(f'#bofreqs-{state.slug} tbody tr')), 3 if state.slug!="spam" else 0)
         self.assertFalse(q('#start_button'))
         PersonFactory(user__username='nobody')
         self.client.login(username='nobody', password='nobody+password')
@@ -63,6 +63,13 @@ This test section has some text.
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         self.assertTrue(q('#start_button'))
+        self.client.logout()
+        self.client.login(username='secretary', password='secretary+password')
+        r = self.client.get(url)
+        q = PyQuery(r.content)
+        for state in states:
+            self.assertEqual(len(q(f'#bofreqs-{state.slug}')), 1)
+            self.assertEqual(len(q(f'#bofreqs-{state.slug} tbody tr')), 3)
 
 
     def test_bofreq_main_page(self):
diff --git a/ietf/name/fixtures/names.json b/ietf/name/fixtures/names.json
index 59b367deb..401767657 100644
--- a/ietf/name/fixtures/names.json
+++ b/ietf/name/fixtures/names.json
@@ -2617,6 +2617,19 @@
     "model": "doc.state",
     "pk": 180
   },
+  {
+    "fields": {
+      "desc": "The BOF request is spam",
+      "name": "Spam",
+      "next_states": [],
+      "order": 5,
+      "slug": "spam",
+      "type": "bofreq",
+      "used": true
+    },
+    "model": "doc.state",
+    "pk": 182
+  },
   {
     "fields": {
       "label": "State"
diff --git a/ietf/templates/doc/bofreq/bof_requests.html b/ietf/templates/doc/bofreq/bof_requests.html
index 2a806b18a..19c2e5dd1 100644
--- a/ietf/templates/doc/bofreq/bof_requests.html
+++ b/ietf/templates/doc/bofreq/bof_requests.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2021 All Rights Reserved #}
 {% load origin %}
-{% load person_filters %}
+{% load person_filters ietf_filters %}
 {% load static %}
 {% block pagehead %}
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
@@ -26,40 +26,42 @@
     {% else %}
         {% regroup reqs by get_state_slug as grouped_reqs %}
         {% for req_group in grouped_reqs %}
-            <h2 class="mt-5">{{ req_group.grouper|capfirst }} BOF Requests</h2>
-            <table id="bofreqs-{{ req_group.grouper }}"
-                   class="table table-sm table-striped tablesorter">
-                <thead>
-                    <tr>
-                        <th scope="col" data-sort="name">Name</th>
-                        <th scope="col" class="d-none d-sm-table-cell" data-sort="date">Date</th>
-                        <th scope="col" data-sort="title">Title</th>
-                        <th scope="col" data-sort="responsible">Responsible</th>
-                        <th scope="col" data-sort="editors">Editors</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {% for req in req_group.list %}
+            {% if req_group.grouper != "spam" or request.user|has_role:"Secretariat" %}
+                <h2 class="mt-5">{{ req_group.grouper|capfirst }} BOF Requests</h2>
+                <table id="bofreqs-{{ req_group.grouper }}"
+                    class="table table-sm table-striped tablesorter">
+                    <thead>
                         <tr>
-                            <td>
-                                <a href="{% url 'ietf.doc.views_doc.document_main' name=req.name %}">{{ req.name }}-{{ req.rev }}</a>
-                            </td>
-                            <td class="d-none d-sm-table-cell">{{ req.latest_revision_event.time|date:"Y-m-d" }}</td>
-                            <td>{{ req.title }}</td>
-                            <td>
-                                {% for person in req.responsible %}
-                                    {% person_link person %}{% if not forloop.last %},{% endif %}
-                                {% endfor %}
-                            </td>
-                            <td>
-                                {% for person in req.editors %}
-                                    {% person_link person %}{% if not forloop.last %},{% endif %}
-                                {% endfor %}
-                            </td>
+                            <th scope="col" data-sort="name">Name</th>
+                            <th scope="col" class="d-none d-sm-table-cell" data-sort="date">Date</th>
+                            <th scope="col" data-sort="title">Title</th>
+                            <th scope="col" data-sort="responsible">Responsible</th>
+                            <th scope="col" data-sort="editors">Editors</th>
                         </tr>
-                    {% endfor %}
-                </tbody>
-            </table>
+                    </thead>
+                    <tbody>
+                        {% for req in req_group.list %}
+                            <tr>
+                                <td>
+                                    <a href="{% url 'ietf.doc.views_doc.document_main' name=req.name %}">{{ req.name }}-{{ req.rev }}</a>
+                                </td>
+                                <td class="d-none d-sm-table-cell">{{ req.latest_revision_event.time|date:"Y-m-d" }}</td>
+                                <td>{{ req.title }}</td>
+                                <td>
+                                    {% for person in req.responsible %}
+                                        {% person_link person %}{% if not forloop.last %},{% endif %}
+                                    {% endfor %}
+                                </td>
+                                <td>
+                                    {% for person in req.editors %}
+                                        {% person_link person %}{% if not forloop.last %},{% endif %}
+                                    {% endfor %}
+                                </td>
+                            </tr>
+                        {% endfor %}
+                    </tbody>
+                </table>
+            {% endif %}
         {% endfor %}
     {% endif %}
 {% endblock %}

From 73968dca5f0ee2450080b585d6da162bdc870955 Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Wed, 28 Aug 2024 14:17:36 -0500
Subject: [PATCH 5/6] fix: use rsab mailtrigger for To in ballot position email
 (#7868)

---
 ietf/doc/tests_ballot.py | 3 +++
 ietf/doc/views_ballot.py | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/ietf/doc/tests_ballot.py b/ietf/doc/tests_ballot.py
index d77e2ddc9..0c99ed281 100644
--- a/ietf/doc/tests_ballot.py
+++ b/ietf/doc/tests_ballot.py
@@ -230,6 +230,9 @@ class EditPositionTests(TestCase):
         r = self.client.post(url, dict(position="discuss", discuss="Test discuss text"))
         self.assertEqual(r.status_code, 403)
         
+    # N.B. This test needs to be rewritten to exercise all types of ballots (iesg, irsg, rsab)
+    # and test against the output of the mailtriggers instead of looking for hardcoded values
+    # in the To and CC results. See #7864
     def test_send_ballot_comment(self):
         ad = Person.objects.get(user__username="ad")
         draft = WgDraftFactory(ad=ad,group__acronym='mars')
diff --git a/ietf/doc/views_ballot.py b/ietf/doc/views_ballot.py
index 8d9ab0b74..2b7faac92 100644
--- a/ietf/doc/views_ballot.py
+++ b/ietf/doc/views_ballot.py
@@ -323,6 +323,8 @@ def build_position_email(balloter, doc, pos):
 
     if doc.stream_id == "irtf":
         addrs = gather_address_lists('irsg_ballot_saved',doc=doc)
+    elif doc.stream_id == "editorial":
+        addrs = gather_address_lists('rsab_ballot_saved',doc=doc)
     else:
         addrs = gather_address_lists('iesg_ballot_saved',doc=doc)
 

From 17bd3124686c33c1089a179e32a2d57f4856a54a Mon Sep 17 00:00:00 2001
From: Matthew Holloway <matthew@staff.ietf.org>
Date: Thu, 29 Aug 2024 07:32:58 +1200
Subject: [PATCH 6/6] fix: Document type badges (#7760)

* fix: document type badge#7475

* chore: PR feedback (naming)

* fix: use type_id rather than str(type) for conditionals in templatetag

* fix: remove debugging CSS inline style dashed border

* fix: document type badge template tag passing context variables

* fix: context vars to document_type_badge

* fix: badge error logging

---------

Co-authored-by: Robert Sparks <rjsparks@nostrum.com>
---
 ietf/doc/templatetags/document_type_badge.py  | 29 +++++++++++++++++++
 ietf/static/css/document_html.scss            |  5 ++++
 ietf/templates/doc/badge/doc-badge-draft.html | 16 ++++++++++
 ietf/templates/doc/badge/doc-badge-rfc.html   | 13 +++++++++
 ietf/templates/doc/document_html.html         | 10 ++-----
 ietf/templates/doc/document_info.html         | 19 ++----------
 6 files changed, 68 insertions(+), 24 deletions(-)
 create mode 100644 ietf/doc/templatetags/document_type_badge.py
 create mode 100644 ietf/templates/doc/badge/doc-badge-draft.html
 create mode 100644 ietf/templates/doc/badge/doc-badge-rfc.html

diff --git a/ietf/doc/templatetags/document_type_badge.py b/ietf/doc/templatetags/document_type_badge.py
new file mode 100644
index 000000000..a82c606ff
--- /dev/null
+++ b/ietf/doc/templatetags/document_type_badge.py
@@ -0,0 +1,29 @@
+# Copyright The IETF Trust 2015-2020, All Rights Reserved
+from django import template
+from django.conf import settings
+from django.template.loader import render_to_string
+from ietf.utils.log import log
+
+register = template.Library()
+
+
+@register.simple_tag
+def document_type_badge(doc, snapshot, submission, resurrected_by):
+    context = {"doc": doc, "snapshot": snapshot, "submission": submission, "resurrected_by": resurrected_by}
+    if doc.type_id == "rfc":
+        return render_to_string(
+            "doc/badge/doc-badge-rfc.html",
+            context,
+        )
+    elif doc.type_id == "draft":
+        return render_to_string(
+            "doc/badge/doc-badge-draft.html",
+            context,
+        )
+    else:
+        error_message = f"Unsupported document type {doc.type_id}."
+        if settings.SERVER_MODE != 'production':
+            raise ValueError(error_message)
+        else:
+            log(error_message)
+        return ""
diff --git a/ietf/static/css/document_html.scss b/ietf/static/css/document_html.scss
index 0b5a70f12..47ef8d64b 100644
--- a/ietf/static/css/document_html.scss
+++ b/ietf/static/css/document_html.scss
@@ -320,6 +320,11 @@ tbody.meta tr {
     background-color: $danger;
 }
 
+.badge-generic {
+    color: white;
+    background-color: $danger;
+}
+
 #toc-nav {
     width: inherit;
     overscroll-behavior-y: none; // Prevent overscrolling from scrolling the main content
diff --git a/ietf/templates/doc/badge/doc-badge-draft.html b/ietf/templates/doc/badge/doc-badge-draft.html
new file mode 100644
index 000000000..f7f66b6c5
--- /dev/null
+++ b/ietf/templates/doc/badge/doc-badge-draft.html
@@ -0,0 +1,16 @@
+{% load origin %}
+{% load static %}
+{% load ietf_filters %}
+{% load person_filters %}
+{% origin %}
+{# Non-RFC #}
+
+{% if doc.became_rfc %} 
+    <div{% if document_html %} class="alert alert-warning small"{% endif %}>This is an older version of an Internet-Draft that was ultimately published as <a href="{% if document_html %}{% url 'ietf.doc.views_doc.document_html' name=doc.became_rfc.name %}{% else %}{% url 'ietf.doc.views_doc.document_main' name=doc.became_rfc.name %}{% endif %}">{{doc.became_rfc.name|prettystdname}}</a>.</div>
+{% elif snapshot and doc.rev != latest_rev  %}
+    <div{% if document_html %} class="alert alert-warning small p-2 mt-2"{% endif %}>This is an older version of an Internet-Draft whose latest revision state is "{{ doc.doc.get_state }}".</div>
+{% else %}
+    <span class="{% if doc.get_state_slug == 'active' %}text-success{% elif doc.get_state_slug == 'expired' or doc.get_state_slug == 'repl' %}text-danger{% endif %}">{% if snapshot and doc.rev == latest_rev %}{{ doc.doc.get_state }}{% else %}{{ doc.get_state }}{% endif %} Internet-Draft</span>
+    {% if submission %}({{ submission|safe }}){% endif %}
+    {% if resurrected_by %}- resurrect requested by {{ resurrected_by }}{% endif %}
+{% endif %}
\ No newline at end of file
diff --git a/ietf/templates/doc/badge/doc-badge-rfc.html b/ietf/templates/doc/badge/doc-badge-rfc.html
new file mode 100644
index 000000000..780f14a54
--- /dev/null
+++ b/ietf/templates/doc/badge/doc-badge-rfc.html
@@ -0,0 +1,13 @@
+{% load origin %}
+{% load static %}
+{% load ietf_filters %}
+{% load person_filters %}
+{% origin %}
+
+<span class="text-success">RFC
+    {% if not document_html %}
+    - {{ doc.std_level }}
+    {% else %}
+        <span class="badge rounded-pill badge-{% if not snapshot %}{{ doc|std_level_to_label_format }}{% else %}generic{% endif %}">{{ doc.std_level }}</span>
+    {% endif %}
+</span>
diff --git a/ietf/templates/doc/document_html.html b/ietf/templates/doc/document_html.html
index 3eabe2ebb..a85b1f531 100644
--- a/ietf/templates/doc/document_html.html
+++ b/ietf/templates/doc/document_html.html
@@ -4,6 +4,7 @@
 {% load origin %}
 {% load static %}
 {% load ietf_filters textfilters %}
+{% load document_type_badge %}
 {% load django_vite %}
 {% origin %}
 <html data-bs-theme="auto" lang="en">
@@ -107,6 +108,7 @@
                     {{ doc.name }}-{{ doc.rev }}
                 {% endif %}
                 <br class="d-sm-none">
+
                 <span class="ms-sm-3 badge rounded-pill badge-{% if not snapshot %}{{ doc|std_level_to_label_format }}{% else %}draft{% endif %}">
                     {% if not snapshot %}
                         {{ doc.std_level }}
@@ -185,13 +187,7 @@
                                     {{ doc.name }}-{{ doc.rev }}
                                 {% endif %}
                                 <br>
-                                <span class="badge rounded-pill badge-{% if not snapshot %}{{ doc|std_level_to_label_format }}{% else %}draft{% endif %}">
-                                    {% if not snapshot %}
-                                        {{ doc.std_level }}
-                                    {% else %}
-                                        Internet-Draft
-                                    {% endif %}
-                                </span>
+                                {% document_type_badge doc snapshot submission resurrected_by %}
                             </p>
                         </div>
                         {% if request.COOKIES.htmlconf and request.COOKIES.htmlconf != 'html' and html %}
diff --git a/ietf/templates/doc/document_info.html b/ietf/templates/doc/document_info.html
index 97cd49cf7..71050f9d4 100644
--- a/ietf/templates/doc/document_info.html
+++ b/ietf/templates/doc/document_info.html
@@ -3,6 +3,7 @@
 {% load static %}
 {% load ietf_filters %}
 {% load person_filters %}
+{% load document_type_badge %}
 {% origin %}
 
 <tbody class="meta align-top {% if not document_html %} border-top{% endif %}">
@@ -11,14 +12,8 @@
         <th scope="row">{% if document_html %}Document type{% else %}Type{% endif %}</th>
         <td class="edit"></td>
         <td>
+            {% document_type_badge doc snapshot submission resurrected_by %}
             {% if doc.type_id == "rfc" %}
-                <span class="text-success">RFC
-                    {% if not document_html %}
-                    - {{ doc.std_level }}
-                    {% else %}
-                        <span class="badge rounded-pill badge-{% if not snapshot %}{{ doc|std_level_to_label_format }}{% else %}draft{% endif %}">{{ doc.std_level }}</span>
-                    {% endif %}
-                </span>
                 {% if doc.pub_date %}
                     {% if document_html %}<br>{% else %}({% endif %}{{ doc.pub_date|date:"F Y" }}{% if not document_html %}){% endif %}
                 {% else %}
@@ -59,16 +54,6 @@
                         {% if submission %}({{ submission|safe }}){% endif %}
                     </div>
                 {% endif %}
-            {% else %}
-                {% if doc.became_rfc %} 
-                   <div{% if document_html %} class="alert alert-warning small"{% endif %}>This is an older version of an Internet-Draft that was ultimately published as <a href="{% if document_html %}{% url 'ietf.doc.views_doc.document_html' name=doc.became_rfc.name %}{% else %}{% url 'ietf.doc.views_doc.document_main' name=doc.became_rfc.name %}{% endif %}">{{doc.became_rfc.name|prettystdname}}</a>.</div>
-                {% elif snapshot and doc.rev != latest_rev  %}
-                    <div{% if document_html %} class="alert alert-warning small p-2 mt-2"{% endif %}>This is an older version of an Internet-Draft whose latest revision state is "{{ doc.doc.get_state }}".</div>
-                 {% else %}
-                    <span class="{% if doc.get_state_slug == 'active' %}text-success{% elif doc.get_state_slug == 'expired' or doc.get_state_slug == 'repl' %}text-danger{% endif %}">{% if snapshot and doc.rev == latest_rev %}{{ doc.doc.get_state }}{% else %}{{ doc.get_state }}{% endif %} Internet-Draft</span>
-                    {% if submission %}({{ submission|safe }}){% endif %}
-                    {% if resurrected_by %}- resurrect requested by {{ resurrected_by }}{% endif %}
-                {% endif %}
             {% endif %}
             {% if doc.get_state_slug != "active" and doc.get_state_slug != "rfc" and doc.type_id != "rfc" %}
                 <div class="badge rounded-pill text-bg-warning{% if not document_html %} float-end{% endif %}">