ci: merge main to release (pull request #7265)

ci: merge main to release
ietf-tools · Mar 28, 2024 · c41c0bb · c41c0bb
2 parents 8c72efa + 452d5da
commit c41c0bb
Show file tree

Hide file tree

Showing 80 changed files with 868 additions and 2,115 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -201,8 +201,8 @@ jobs:
     - name: Collect + Push Statics
       env:
         DEBIAN_FRONTEND: noninteractive
-        AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_KEY_SECRET }}
+        AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_STATIC_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_STATIC_KEY_SECRET }}
         AWS_DEFAULT_REGION: auto
         AWS_ENDPOINT_URL: ${{ secrets.CF_R2_ENDPOINT }}
       run: |

diff --git a/.gitignore b/.gitignore
@@ -26,6 +26,7 @@ datatracker.sublime-workspace
 /static
 /tmp-*
 /.testresult
+*.swp
 *.pyc
 __pycache__
 .yarn/*

diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/.yarn/cache/@volar-language-core-npm-2.1.4-18ee1a037d-7430f65143.zip b/.yarn/cache/@volar-language-core-npm-2.1.4-18ee1a037d-7430f65143.zip
diff --git a/.yarn/cache/@volar-language-service-npm-2.1.4-2d34cb628f-06cdcfacf0.zip b/.yarn/cache/@volar-language-service-npm-2.1.4-2d34cb628f-06cdcfacf0.zip
diff --git a/.yarn/cache/@volar-source-map-npm-2.1.4-5963b1701f-e2f65bcfd6.zip b/.yarn/cache/@volar-source-map-npm-2.1.4-5963b1701f-e2f65bcfd6.zip
diff --git a/.yarn/cache/@vscode-l10n-npm-0.0.18-8a12efe4b5-c33876cebd.zip b/.yarn/cache/@vscode-l10n-npm-0.0.18-8a12efe4b5-c33876cebd.zip
diff --git a/.yarn/cache/@vue-language-plugin-pug-npm-2.0.7-547300c7e0-11cc96eb5f.zip b/.yarn/cache/@vue-language-plugin-pug-npm-2.0.7-547300c7e0-11cc96eb5f.zip
diff --git a/.yarn/cache/caniuse-lite-npm-1.0.30001597-1e349680d5-ec6a2cf0fd.zip b/.yarn/cache/caniuse-lite-npm-1.0.30001597-1e349680d5-ec6a2cf0fd.zip
diff --git a/.yarn/cache/caniuse-lite-npm-1.0.30001599-834cd4cb82-d7e619e2e7.zip b/.yarn/cache/caniuse-lite-npm-1.0.30001599-834cd4cb82-d7e619e2e7.zip
diff --git a/.yarn/cache/d3-npm-7.8.5-5db20a5616-e407e79731.zip b/.yarn/cache/d3-npm-7.8.5-5db20a5616-e407e79731.zip
diff --git a/.yarn/cache/d3-npm-7.9.0-d293821ce6-1c0e9135f1.zip b/.yarn/cache/d3-npm-7.9.0-d293821ce6-1c0e9135f1.zip
diff --git a/...-vue-npm-9.22.0-2cdb92f3c1-5f1e94b412.zip → ...-vue-npm-9.23.0-d36e581933-acb3a4dd27.zip b/...-vue-npm-9.22.0-2cdb92f3c1-5f1e94b412.zip → ...-vue-npm-9.23.0-d36e581933-acb3a4dd27.zip
diff --git a/.yarn/cache/html-validate-npm-8.15.0-a1dfa4198d-0af7685ca1.zip b/.yarn/cache/html-validate-npm-8.15.0-a1dfa4198d-0af7685ca1.zip
diff --git a/.yarn/cache/html-validate-npm-8.16.0-71c478330f-857b05ab87.zip b/.yarn/cache/html-validate-npm-8.16.0-71c478330f-857b05ab87.zip
diff --git a/.yarn/cache/muggle-string-npm-0.4.1-fe3c825cc2-85fe1766d1.zip b/.yarn/cache/muggle-string-npm-0.4.1-fe3c825cc2-85fe1766d1.zip
diff --git a/.yarn/cache/sass-npm-1.71.1-3aced13991-19c4939d30.zip b/.yarn/cache/sass-npm-1.71.1-3aced13991-19c4939d30.zip
diff --git a/.yarn/cache/sass-npm-1.72.0-fb38bb530c-f420079c7d.zip b/.yarn/cache/sass-npm-1.72.0-fb38bb530c-f420079c7d.zip
diff --git a/.yarn/cache/volar-service-html-npm-0.0.34-32b6d24136-83b50cd805.zip b/.yarn/cache/volar-service-html-npm-0.0.34-32b6d24136-83b50cd805.zip
diff --git a/.yarn/cache/volar-service-pug-npm-0.0.34-6f5429e17c-4691aa1c8e.zip b/.yarn/cache/volar-service-pug-npm-0.0.34-6f5429e17c-4691aa1c8e.zip
diff --git a/.yarn/cache/vscode-html-languageservice-npm-5.1.2-2ea2618bdd-3a2a5ee5ad.zip b/.yarn/cache/vscode-html-languageservice-npm-5.1.2-2ea2618bdd-3a2a5ee5ad.zip
diff --git a/.yarn/cache/vscode-jsonrpc-npm-8.2.0-b7d2e5b553-f302a01e59.zip b/.yarn/cache/vscode-jsonrpc-npm-8.2.0-b7d2e5b553-f302a01e59.zip
diff --git a/.yarn/cache/vscode-languageserver-protocol-npm-3.17.5-2b07e16989-dfb42d276d.zip b/.yarn/cache/vscode-languageserver-protocol-npm-3.17.5-2b07e16989-dfb42d276d.zip
diff --git a/.yarn/cache/vscode-languageserver-textdocument-npm-1.0.11-6fc94d2b7b-ea7cdc9d4f.zip b/.yarn/cache/vscode-languageserver-textdocument-npm-1.0.11-6fc94d2b7b-ea7cdc9d4f.zip
diff --git a/.yarn/cache/vscode-languageserver-types-npm-3.17.5-aca3b71a5a-79b420e757.zip b/.yarn/cache/vscode-languageserver-types-npm-3.17.5-aca3b71a5a-79b420e757.zip
diff --git a/.yarn/cache/vscode-uri-npm-3.0.8-56f46b9d24-5142491268.zip b/.yarn/cache/vscode-uri-npm-3.0.8-56f46b9d24-5142491268.zip
diff --git a/bin/daily b/bin/daily
@@ -47,8 +47,5 @@ $DTDIR/ietf/manage.py run_yang_model_checks -v0
 # Enable when removed from /a/www/ietf-datatracker/scripts/Cron-runner:
 $DTDIR/ietf/bin/expire-last-calls
 
-# Send reminders originating from the review app
-$DTDIR/ietf/bin/send-review-reminders
-
 # Purge older PersonApiKeyEvents
 $DTDIR/ietf/manage.py purge_old_personal_api_key_events 14
diff --git a/client/agenda/Agenda.vue b/client/agenda/Agenda.vue
@@ -58,14 +58,17 @@
             n-button(
               :type='agendaStore.isTimezoneMeeting ? `primary` : `default`'
               @click='setTimezone(`meeting`)'
+              :text-color='agendaStore.isTimezoneMeeting ? `#FFF` : null'
               ) Meeting
             n-button(
               :type='agendaStore.isTimezoneLocal ? `primary` : `default`'
               @click='setTimezone(`local`)'
+              :text-color='agendaStore.isTimezoneLocal ? `#FFF` : null'
               ) Local
             n-button(
               :type='agendaStore.timezone === `UTC` ? `primary` : `default`'
               @click='setTimezone(`UTC`)'
+              :text-color='agendaStore.timezone === `UTC` ? `#FFF` : null'
               ) UTC
           n-select.agenda-timezone-ddn(
             v-if='siteStore.viewport > 1250'

diff --git a/client/agenda/AgendaQuickAccess.vue b/client/agenda/AgendaQuickAccess.vue
@@ -62,7 +62,8 @@
         n-button.mt-2(
           id='agenda-quickaccess-calview-btn'
           block
-          color='#6c757d'
+          color='#6f42c1'
+          text-color='#FFF'
           size='large'
           strong
           @click='agendaStore.$patch({ calendarShown: true })'
@@ -78,8 +79,8 @@
           n-button.mt-2(
             id='agenda-quickaccess-addtocal-btn'
             block
-            secondary
-            color='#6c757d'
+            :color='siteStore.theme === `dark` ? `rgba(111, 66, 193, .3)` : `#e2d9f3`'
+            :text-color='siteStore.theme === `dark` ? `#e2d9f3` : `#59359a`'
             size='large'
             strong
             )

diff --git a/client/agenda/AgendaScheduleCalendar.vue b/client/agenda/AgendaScheduleCalendar.vue
@@ -11,14 +11,17 @@ n-drawer(v-model:show='isShown', placement='bottom', :height='state.drawerHeight
             n-button(
               :type='agendaStore.isTimezoneMeeting ? `primary` : `default`'
               @click='setTimezone(`meeting`)'
+              :text-color='agendaStore.isTimezoneMeeting ? `#FFF` : null'
               ) Meeting
             n-button(
               :type='agendaStore.isTimezoneLocal ? `primary` : `default`'
               @click='setTimezone(`local`)'
+              :text-color='agendaStore.isTimezoneLocal ? `#FFF` : null'
               ) Local
             n-button(
               :type='agendaStore.timezone === `UTC` ? `primary` : `default`'
               @click='setTimezone(`UTC`)'
+              :text-color='agendaStore.timezone === `UTC` ? `#FFF` : null'
               ) UTC
           n-divider(vertical)
         n-button.me-2(
@@ -32,7 +35,7 @@ n-drawer(v-model:show='isShown', placement='bottom', :height='state.drawerHeight
           n-badge.ms-2(:value='agendaStore.selectedCatSubs.length', processing)
         n-button(
           ghost
-          color='gray'
+          :color='siteStore.theme === `dark` ? `#e35d6a` : `gray`'
           strong
           @click='close'
           )

diff --git a/client/components/Polls.vue b/client/components/Polls.vue
@@ -3,19 +3,20 @@
   n-data-table(
     v-if='state.items.length > 0'
     :data='state.items'
-    :columns='columns'
+    :columns='state.columns'
     striped
     )
+  span.text-danger(v-else-if='state.errMessage')
+    em {{ state.errMessage }}
   span.text-body-secondary(v-else)
     em No polls available.
 </template>
 
 <script setup>
 import { onMounted, reactive } from 'vue'
 import { DateTime } from 'luxon'
-import {
-  NDataTable
-} from 'naive-ui'
+import { cloneDeep, startCase } from 'lodash-es'
+import { NDataTable } from 'naive-ui'
 
 // PROPS
 
@@ -29,13 +30,15 @@ const props = defineProps({
 // STATE
 
 const state = reactive({
-  items: []
+  items: [],
+  colums: [],
+  errMessage: null
 })
 
-const columns = [
+const defaultColumns = [
   {
     title: 'Question',
-    key: 'question'
+    key: 'text'
   },
   {
     title: 'Start Time',
@@ -44,35 +47,45 @@ const columns = [
   {
     title: 'End Time',
     key: 'end_time'
-  },
-  {
-    title: 'Raise Hand',
-    key: 'raise_hand'
-  },
-  {
-    title: 'Do Not Raise Hand',
-    key: 'do_not_raise_hand'
   }
 ]
 
 // MOUNTED
 
 onMounted(() => {
   // Get polls from embedded json tag
-  const polls = JSON.parse(document.getElementById(`${props.componentId}-data`).textContent || '[]')
-  if (polls.length > 0) {
-    let idx = 1
-    for (const poll of polls) {
-      state.items.push({
-        id: `poll-${idx}`,
-        question: poll.text,
-        start_time: DateTime.fromISO(poll.start_time).toFormat('dd LLLL yyyy \'at\' HH:mm:ss a ZZZZ'),
-        end_time: DateTime.fromISO(poll.end_time).toFormat('dd LLLL yyyy \'at\' HH:mm:ss a ZZZZ'),
-        raise_hand: poll.raise_hand,
-        do_not_raise_hand: poll.do_not_raise_hand
-      })
-      idx++
+  try {
+    const polls = JSON.parse(document.getElementById(`${props.componentId}-data`).textContent || '[]')
+    if (polls.length > 0) {
+      // Populate columns
+      state.columns = cloneDeep(defaultColumns)
+      for (const col in polls[0]) {
+        if (!['text', 'start_time', 'end_time'].includes(col)) {
+          state.columns.push({
+            title: startCase(col),
+            key: col,
+            minWidth: 100,
+            titleAlign: 'center',
+            align: 'center'
+          })
+        }
+      }
+
+      // Populate rows
+      let idx = 1
+      for (const poll of polls) {
+        state.items.push({
+          ...poll,
+          id: `poll-${idx}`,
+          start_time: DateTime.fromISO(poll.start_time).toFormat('dd LLLL yyyy \'at\' HH:mm:ss a ZZZZ'),
+          end_time: DateTime.fromISO(poll.end_time).toFormat('dd LLLL yyyy \'at\' HH:mm:ss a ZZZZ')
+        })
+        idx++
+      }
     }
+  } catch (err) {
+    console.warn(err)
+    state.errMessage = 'Failed to load poll results.'
   }
 })
 </script>

diff --git a/debug.py b/debug.py
@@ -55,7 +55,7 @@ def fix(s,n=64):
         if len(s) > n+3:
             s = s[:n]+"..."
         return s
-    def wrap(fn, *params,**kwargs):
+    def wrap(*params,**kwargs):
         call = wrap.callcount = wrap.callcount + 1
 
         indent = ' ' * _report_indent[0]
@@ -81,8 +81,8 @@ def wrap(fn, *params,**kwargs):
         return ret
     wrap.callcount = 0
     if debug:
-        from decorator import decorator
-        return decorator(wrap, fn)
+        from functools import update_wrapper
+        return update_wrapper(wrap, fn)
     else:
         return fn
 
@@ -119,7 +119,7 @@ def clock(s):
 def time(fn):
     """Decorator to print timing information about a function call.
     """
-    def wrap(fn, *params,**kwargs):
+    def wrap(*params,**kwargs):
 
         indent = ' ' * _report_indent[0]
         fc = "%s.%s()" % (fn.__module__, fn.__name__,)
@@ -132,8 +132,8 @@ def wrap(fn, *params,**kwargs):
         return ret
     wrap.callcount = 0
     if debug:
-        from decorator import decorator
-        return decorator(wrap, fn)
+        from functools import update_wrapper
+        return update_wrapper(wrap, fn)
     else:
         return fn
 
@@ -190,7 +190,7 @@ def type(name):
         value = eval(name, frame.f_globals, frame.f_locals)
         indent = ' ' * (_report_indent[0])
         sys.stderr.write("%s%s: %s\n" % (indent, name, value))
-            
+
 def say(s):
     if debug:
         indent = ' ' * (_report_indent[0])
@@ -205,11 +205,11 @@ def wrapper(*args, **kwargs):
         prof.dump_stats(datafn)
         return retval
     if debug:
-        from decorator import decorator
-        return decorator(wrapper, fn)
+        from functools import update_wrapper
+        return update_wrapper(wrapper, fn)
     else:
         return fn
-    
+
 def traceback(levels=None):
     if debug:
         indent = ' ' * (_report_indent[0])

diff --git a/dev/coverage-action/package-lock.json b/dev/coverage-action/package-lock.json
diff --git a/dev/coverage-action/package.json b/dev/coverage-action/package.json
@@ -19,6 +19,6 @@
     "eslint-plugin-import": "2.29.1",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-promise": "6.1.1",
-    "npm-check-updates": "16.14.15"
+    "npm-check-updates": "16.14.17"
   }
 }
diff --git a/ietf/checks.py b/ietf/checks.py
@@ -42,14 +42,14 @@ def check_group_email_aliases_exists(app_configs, **kwargs):
         if not ok:
             errors.append(checks.Error(
                 "Found no aliases in the group email aliases file\n'%s'."%settings.GROUP_ALIASES_PATH,
-                hint="Please run the generate_group_aliases management command to generate them.",
+                hint="These should be created by the infrastructure using ietf/bin/aliases-from-json.py.",
                 obj=None,
                 id="datatracker.E0002",
             ))
     except IOError as e:
         errors.append(checks.Error(
             "Could not read group email aliases:\n   %s" % e,
-            hint="Please run the generate_group_aliases management command to generate them.",
+            hint="These should be created by the infrastructure using ietf/bin/aliases-from-json.py.",
             obj=None,
             id="datatracker.E0003",
         ))
@@ -69,14 +69,14 @@ def check_doc_email_aliases_exists(app_configs, **kwargs):
         if not ok:
             errors.append(checks.Error(
                 "Found no aliases in the document email aliases file\n'%s'."%settings.DRAFT_VIRTUAL_PATH,
-                hint="Please run the generate_draft_aliases management command to generate them.",
+                hint="These should be created by the infrastructure using ietf/bin/aliases-from-json.py.",
                 obj=None,
                 id="datatracker.E0004",
             ))
     except IOError as e:
         errors.append(checks.Error(
             "Could not read document email aliases:\n   %s" % e,
-            hint="Please run the generate_draft_aliases management command to generate them.",
+            hint="These should be created by the infrastructure using ietf/bin/aliases-from-json.py.",
             obj=None,
             id="datatracker.E0005",
         ))