sminnee

diff --git a/common/messages/grid.ts b/common/messages/grid.ts
index 155e77fd..54ad174c 100644
--- a/common/messages/grid.ts
+++ b/common/messages/grid.ts
@@ -1,70 +1,86 @@
 // Descriptions used in message types
 
+import * as t from 'io-ts'
 import { TDate } from 'timeago.js'
+import { User } from '../../src/user'

sminnee

diff --git a/app/tests/Service/Advisories/SecurityAdvisoriesTest.php b/app/tests/Service/Advisories/SecurityAdvisoriesTest.php
new file mode 100644
index 0000000..ff18429
--- /dev/null
+++ b/app/tests/Service/Advisories/SecurityAdvisoriesTest.php
@@ -0,0 +1,108 @@
+<?php
+
+use SilverStripe\Dev\SapphireTest;
+

sminnee

diff --git a/app/tests/Service/Advisories/SecurityAdvisoriesTest.php b/app/tests/Service/Advisories/SecurityAdvisoriesTest.php
new file mode 100644
index 0000000..ff18429
--- /dev/null
+++ b/app/tests/Service/Advisories/SecurityAdvisoriesTest.php
@@ -0,0 +1,108 @@
+<?php
+
+use SilverStripe\Dev\SapphireTest;
+

sminnee

# Basic php-apache 8.0.0beta3 appserver for Lando
#

# docker build -t sminnee/lando-php:8.0-apache .
FROM php:8.0.0beta3-apache-buster

# Install dependencies we need
RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
  && apt -y update && apt-get install -y \
    gnupg2 \

sminnee

upgrade-code recompose --write

Upgrading PHP constraint
========================

 Done.

Rebuilding dependencies
=======================

sminnee

diff --git a/ss_dbt/models/platform/github_metrics.sql b/ss_dbt/models/platform/github_metrics.sql
index 2c230fa..3bcb334 100644
--- a/ss_dbt/models/platform/github_metrics.sql
+++ b/ss_dbt/models/platform/github_metrics.sql
@@ -21,6 +21,15 @@ SELECT
     coalesce(prs_created, 0) AS prs_created,
     coalesce(prs_closed, 0) AS prs_closed,
 
+    coalesce(bugs_p1_created, 0) AS bugs_p1_created,
+    coalesce(bugs_p1_closed, 0) AS bugs_p1_closed,

sminnee

diff --git a/ss_dbt/models/platform/github_metrics.sql b/ss_dbt/models/platform/github_metrics.sql
index 394a156..455f8d9 100644
--- a/ss_dbt/models/platform/github_metrics.sql
+++ b/ss_dbt/models/platform/github_metrics.sql
@@ -52,10 +52,12 @@ SELECT
     COALESCE(SUM(notype_closed) OVER (PARTITION BY closed.repository ORDER BY closed.week ASC ROWS BETWEEN unbounded preceding AND CURRENT row), 0)
     AS notype_total_closed,
 
-    SUM(prs_created) OVER (PARTITION BY created.repository ORDER BY created.week ASC ROWS BETWEEN unbounded preceding AND CURRENT row)
-     - COALESCE(SUM(prs_closed) OVER (PARTITION BY closed.repository ORDER BY closed.week ASC ROWS BETWEEN unbounded preceding AND CURRENT row), 0)

sminnee

diff --git a/ss_dbt/models/platform/github_metrics.sql b/ss_dbt/models/platform/github_metrics.sql
index 0d80597..0135570 100644
--- a/ss_dbt/models/platform/github_metrics.sql
+++ b/ss_dbt/models/platform/github_metrics.sql
@@ -11,8 +11,8 @@ SELECT
     coalesce(issues_closed, 0) AS issues_closed,
     coalesce(bugs_created, 0) AS bugs_created,
     coalesce(bugs_closed, 0) AS bugs_closed,
-    coalesce(bugs_created, 0) AS enhancements_created,
-    coalesce(bugs_closed, 0) AS enhancements_closed,

sminnee

diff --git a/ss_dbt/models/platform/github_metrics.sql b/ss_dbt/models/platform/github_metrics.sql
index 0d80597..aa5dba3 100644
--- a/ss_dbt/models/platform/github_metrics.sql
+++ b/ss_dbt/models/platform/github_metrics.sql
@@ -22,92 +22,41 @@ SELECT
     coalesce(prs_closed, 0) AS prs_closed,
 
     -- Backlog sizes at end of week
-    (
-      SELECT COUNT(*)

sminnee

diff --git a/client/src/components/OptionsetField/OptionField.js b/client/src/components/OptionsetField/OptionField.js
index 4b0aeaa..35223df 100644
--- a/client/src/components/OptionsetField/OptionField.js
+++ b/client/src/components/OptionsetField/OptionField.js
@@ -68,10 +68,14 @@ class OptionField extends Component {
   }
 
   render() {
-    const labelText = this.props.leftTitle !== null
+    const leftTitle = this.props.leftTitle !== null