diff --git a/codegen.ts b/codegen.ts
new file mode 100644
index 0000000000..2f9d12ab25
--- /dev/null
+++ b/codegen.ts
@@ -0,0 +1,26 @@
+import type { CodegenConfig } from "@graphql-codegen/cli";
+
+const config: CodegenConfig = {
+  schema: "sdlschema/**/*.graphql",
+  documents: ["./src/**/*.ts", "./src/**/*.graphql", "./src/**/*.gql"],
+  hooks: {
+    afterAllFileWrite: ["prettier --write"],
+  },
+  overwrite: true,
+  generates: {
+    "./src/gql/generated/types.ts": {
+      plugins: ["typescript", "typescript-operations"],
+      config: {
+        preResolveTypes: true,
+        arrayInputCoercion: false,
+        scalars: {
+          StringMap: "{ [key: string]: any }",
+          Time: "Date",
+          Duration: "number",
+        },
+      },
+    },
+  },
+};
+
+export default config;
diff --git a/codegen.yml b/codegen.yml
deleted file mode 100644
index 610c4f5dee..0000000000
--- a/codegen.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-  schema: sdlschema/**/*.graphql
-  documents: 
-    - ./src/**/*.ts
-    - ./src/**/*.graphql
-    - ./src/**/*.gql
-  hooks:
-    afterAllFileWrite:
-      - prettier --write
-  overwrite: true
-  generates: 
-    ./src/gql/generated/types.ts: 
-      plugins:
-      - typescript
-      - typescript-operations
-      config:
-        preResolveTypes: true,
-        arrayInputCoercion: false
-        scalars:
-          StringMap: "{ [key: string]: any }"
-          Time: Date
-          Duration: number
diff --git a/cypress/integration/host/host_events.ts b/cypress/integration/host/host_events.ts
index a2010ae5f0..2ccd0a4d14 100644
--- a/cypress/integration/host/host_events.ts
+++ b/cypress/integration/host/host_events.ts
@@ -93,15 +93,19 @@ describe("Host events", () => {
       },
       {
         hostType: "host-running-task-set",
-        text: "Assigned to run task evergreen_ubuntu1604_test_command_patch_5e823e1f28...",
+        text: "Assigned to run task evergreen_ubuntu1604_test_command_patch_5e823e1f28",
       },
       {
         hostType: "host-running-task-cleared",
-        text: "Current running task cleared (was:evergreen_ubuntu1604_test_command_patch_5e823e1f28...)",
+        text: "Current running task cleared (was: ",
+      },
+      {
+        hostType: "host-running-task-cleared",
+        text: "evergreen_ubuntu1604_test_command_patch_5e823e1f28baeaa22ae00823d83e03082cd148ab_5e4ff3abe3c3317e352062e4_20_02_21_15_13_48",
       },
       {
         hostType: "host-task-finished",
-        text: "Task evergreen_ubuntu1604_test_command_patch_5e823e1f28... completed with status: test-timed-out",
+        text: "Task evergreen_ubuntu1604_test_command_patch_5e823e1f28baeaa22ae00823d83e03082cd148ab_5e4ff3abe3c3317e352062e4_20_02_21_15_13_48 completed with status: test-timed-out",
       },
     ];
     hostTypes.forEach(({ hostType, text }) => {
diff --git a/cypress/integration/preferences/notifications.ts b/cypress/integration/preferences/notifications.ts
index 51c077f32a..26215be3cc 100644
--- a/cypress/integration/preferences/notifications.ts
+++ b/cypress/integration/preferences/notifications.ts
@@ -24,17 +24,65 @@ describe("global subscription settings", () => {
 });
 
 describe("user subscriptions table", () => {
-  it("shows all of a user's subscriptions and expands with details", () => {
+  beforeEach(() => {
     cy.visit(pageRoute);
+  });
+
+  it("shows all of a user's subscriptions and expands with details", () => {
     cy.dataCy("subscription-row").should("have.length", 3);
 
     cy.dataCy("regex-selectors").should("not.be.visible");
     cy.dataCy("trigger-data").should("not.be.visible");
-    cy.get("tr button").first().click();
+    cy.dataCy("subscription-row")
+      .eq(0)
+      .within(() => {
+        cy.get("button").first().click();
+      });
     cy.dataCy("regex-selectors").should("be.visible");
     cy.dataCy("trigger-data").should("not.be.visible");
-    cy.get("tr button").last().click();
+    cy.dataCy("subscription-row")
+      .eq(2)
+      .within(() => {
+        cy.get("button").first().click();
+      });
     cy.dataCy("regex-selectors").should("be.visible");
     cy.dataCy("trigger-data").should("be.visible");
   });
+
+  it("Shows the selected count in the 'Delete' button", () => {
+    cy.dataCy("subscription-row")
+      .eq(0)
+      .within(() => {
+        cy.get("input[type=checkbox]").check({ force: true });
+      });
+    cy.dataCy("delete-some-button").contains("Delete (1)");
+
+    cy.get("thead").within(() => {
+      cy.get("input[type=checkbox]").check({ force: true });
+    });
+    cy.dataCy("delete-some-button").contains("Delete (3)");
+
+    cy.get("thead").within(() => {
+      cy.get("input[type=checkbox]").uncheck({ force: true });
+    });
+    cy.dataCy("delete-some-button").contains("Delete");
+    cy.dataCy("delete-some-button").should(
+      "have.attr",
+      "aria-disabled",
+      "true"
+    );
+  });
+
+  describe("Deleting subscriptions", { testIsolation: false }, () => {
+    it("Deletes a single subscription", () => {
+      cy.dataCy("subscription-row")
+        .eq(0)
+        .within(() => {
+          cy.get("input[type=checkbox]").check({ force: true });
+        });
+      cy.dataCy("delete-some-button").click();
+      cy.validateToast("success", "Deleted 1 subscription.");
+      cy.dataCy("subscription-row").should("have.length", 2);
+    });
+  });
 });
diff --git a/cypress/integration/project/patches.ts b/cypress/integration/project/patches.ts
index 3cd61a5c93..ba06d0bd2a 100644
--- a/cypress/integration/project/patches.ts
+++ b/cypress/integration/project/patches.ts
@@ -15,4 +15,11 @@ describe("Project Patches Page", () => {
     cy.location("pathname").should("eq", adminPatchesRoute);
     cy.dataCy("patch-card").should("exist");
   });
+
+  it("Project dropdown navigates to another project patches page upon selection", () => {
+    cy.visit(evergreenPatchesRoute);
+    cy.dataCy("project-select").click();
+    cy.dataCy("project-display-name").contains("Spruce").click();
+    cy.location("pathname").should("eq", "/project/spruce/patches");
+  });
 });
diff --git a/cypress/integration/projectSettings/constants.ts b/cypress/integration/projectSettings/constants.ts
index cdc8eea829..ed9c8938ee 100644
--- a/cypress/integration/projectSettings/constants.ts
+++ b/cypress/integration/projectSettings/constants.ts
@@ -19,6 +19,27 @@ export const getPluginsRoute = (identifier: string) =>
 export const getContainersRoute = (identifier: string) =>
   `${getSettingsRoute(identifier)}/containers`;
 
+export const getViewsAndFiltersRoute = (identifier: string) =>
+  `${getSettingsRoute(identifier)}/views-and-filters`;
+
 export const project = "spruce";
 export const projectUseRepoEnabled = "evergreen";
 export const repo = "602d70a2b2373672ee493184";
+
+/**
+ * `saveButtonEnabled` checks if the save button is enabled or disabled.
+ * @param isEnabled - if true, the save button should be enabled. If false, the save button should be disabled.
+ */
+export const saveButtonEnabled = (isEnabled: boolean = true) => {
+  cy.dataCy("save-settings-button").should(
+    isEnabled ? "not.have.attr" : "have.attr",
+    "aria-disabled",
+    "true"
+  );
+};
+
+export const clickSave = () => {
+  cy.dataCy("save-settings-button")
+    .should("not.have.attr", "aria-disabled", "true")
+    .click();
+};
diff --git a/cypress/integration/projectSettings/project_settings.ts b/cypress/integration/projectSettings/project_settings.ts
index 5a2b59b2ff..3133cdb623 100644
--- a/cypress/integration/projectSettings/project_settings.ts
+++ b/cypress/integration/projectSettings/project_settings.ts
@@ -8,6 +8,8 @@ import {
   project,
   projectUseRepoEnabled,
   repo,
+  saveButtonEnabled,
+  clickSave,
 } from "./constants";
 
 describe("Access page", { testIsolation: false }, () => {
@@ -603,9 +605,12 @@ describe(
         cy.dataCy("display-name-input").should("not.have.attr", "placeholder");
       });
 
-      it.skip("Shows a navigation warning modal when navigating away from project settings", () => {
+      it("Shows a navigation warning modal that lists the general page when navigating away from project settings", () => {
         cy.contains("My Patches").click();
         cy.dataCy("navigation-warning-modal").should("be.visible");
+        cy.dataCy("unsaved-pages").within(() => {
+          cy.get("li").should("have.length", 1);
+        });
         cy.get("body").type("{esc}");
       });
 
@@ -1053,9 +1058,9 @@ describe("Notifications", { testIsolation: false }, () => {
     cy.selectLGOption("Event", "Any Task Finishes");
     cy.selectLGOption("Notification Method", "Comment on a JIRA issue");
     cy.getInputByLabel("JIRA Issue").type("JIRA-123");
-    cy.contains(
-      "JIRA comment subscription not allowed for tasks in a project"
-    ).should("exist");
+    cy.contains("Subscription type not allowed for tasks in a project.").should(
+      "exist"
+    );
     cy.dataCy("save-settings-button").scrollIntoView();
     saveButtonEnabled(false);
   });
@@ -1205,21 +1210,3 @@ describe("Containers", () => {
     cy.validateToast("success", "Successfully updated project");
   });
 });
-
-/**
- * `saveButtonEnabled` checks if the save button is enabled or disabled.
- * @param isEnabled - if true, the save button should be enabled. If false, the save button should be disabled.
- */
-const saveButtonEnabled = (isEnabled: boolean = true) => {
-  cy.dataCy("save-settings-button").should(
-    isEnabled ? "not.have.attr" : "have.attr",
-    "aria-disabled",
-    "true"
-  );
-};
-
-const clickSave = () => {
-  cy.dataCy("save-settings-button")
-    .should("not.have.attr", "aria-disabled", "true")
-    .click();
-};
diff --git a/cypress/integration/projectSettings/views_and_filters.ts b/cypress/integration/projectSettings/views_and_filters.ts
new file mode 100644
index 0000000000..f01f2f7820
--- /dev/null
+++ b/cypress/integration/projectSettings/views_and_filters.ts
@@ -0,0 +1,61 @@
+import {
+  getViewsAndFiltersRoute,
+  saveButtonEnabled,
+  clickSave,
+} from "./constants";
+
+describe("Views & filters page", () => {
+  const destination = getViewsAndFiltersRoute("sys-perf");
+
+  beforeEach(() => {
+    cy.visit(destination);
+    // Wait for page content to finish loading.
+    cy.dataCy("parsley-filter-list").children().should("have.length", 2);
+    saveButtonEnabled(false);
+  });
+
+  describe("parsley filters", () => {
+    it("does not allow saving with invalid regular expression or empty expression", () => {
+      cy.contains("button", "Add filter").should("be.visible").click();
+      cy.dataCy("parsley-filter-expression").first().type("*");
+      saveButtonEnabled(false);
+      cy.contains("Value should be a valid regex expression.");
+      cy.dataCy("parsley-filter-expression").first().clear();
+      saveButtonEnabled(false);
+    });
+
+    it("does not allow saving with duplicate filter expressions", () => {
+      cy.contains("button", "Add filter").should("be.visible").click();
+      cy.dataCy("parsley-filter-expression").first().type("filter_1");
+      saveButtonEnabled(false);
+      cy.contains("Filter expression already appears in this project.");
+    });
+
+    it("can successfully save and delete filter", () => {
+      cy.contains("button", "Add filter").should("be.visible").click();
+      cy.dataCy("parsley-filter-expression").first().type("my_filter");
+      saveButtonEnabled(true);
+      clickSave();
+      cy.validateToast("success", "Successfully updated project");
+      cy.dataCy("parsley-filter-list").children().should("have.length", 3);
+
+      cy.dataCy("delete-item-button").first().should("be.visible").click();
+      clickSave();
+      cy.validateToast("success", "Successfully updated project");
+      cy.dataCy("parsley-filter-list").children().should("have.length", 2);
+    });
+  });
+
+  describe("project view", () => {
+    it("updates field to 'all' view and back to 'default'", () => {
+      cy.getInputByLabel("All tasks view").click({ force: true });
+      clickSave();
+      cy.validateToast("success", "Successfully updated project");
+      cy.getInputByLabel("All tasks view").should("be.checked");
+
+      cy.getInputByLabel("Default view").click({ force: true });
+      clickSave();
+      cy.validateToast("success", "Successfully updated project");
+    });
+  });
+});
diff --git a/cypress/integration/version/name_change_modal.ts b/cypress/integration/version/name_change_modal.ts
new file mode 100644
index 0000000000..4b372e95b8
--- /dev/null
+++ b/cypress/integration/version/name_change_modal.ts
@@ -0,0 +1,37 @@
+describe("Name change modal", () => {
+  beforeEach(() => {
+    cy.visit("version/5f74d99ab2373627c047c5e5");
+  });
+
+  it("Use the name change modal to change the name of a patch", () => {
+    const originalName = "main: EVG-7823 add a commit queue message (#4048)";
+    cy.contains(originalName);
+    cy.dataCy("name-change-modal-trigger").click();
+    const newName = "a different name";
+    cy.get("textarea").clear().type(newName);
+    cy.contains("Confirm").click();
+    cy.get("textarea").should("not.exist");
+    cy.contains(newName);
+    cy.validateToast("success", "Patch name was successfully updated.", true);
+    // revert name change
+    cy.dataCy("name-change-modal-trigger").click();
+    cy.get("textarea").clear().type(originalName);
+    cy.contains("Confirm").click();
+    cy.get("textarea").should("not.exist");
+    cy.validateToast("success", "Patch name was successfully updated.", true);
+    cy.contains(originalName);
+  });
+
+  it("The confirm button is disabled when the text area value is empty or greater than 300 characters", () => {
+    cy.dataCy("name-change-modal-trigger").click();
+    cy.get("textarea").clear();
+    cy.contains("button", "Confirm").should("be.disabled");
+    cy.get("textarea").type("lol");
+    cy.contains("button", "Confirm").should("not.be.disabled");
+    const over300Chars =
+      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+    cy.get("textarea").type(over300Chars);
+    cy.contains("button", "Confirm").should("be.disabled");
+    cy.contains("should NOT be longer than 300 characters");
+  });
+});
diff --git a/cypress/integration/version/restart_modal.ts b/cypress/integration/version/restart_modal.ts
index 6c58f1bf69..08d56e2da8 100644
--- a/cypress/integration/version/restart_modal.ts
+++ b/cypress/integration/version/restart_modal.ts
@@ -37,7 +37,7 @@ describe("Restarting a patch", { testIsolation: false }, () => {
     cy.dataCy("task-status-badge").should("contain.text", "1 of 1 Selected");
   });
 
-  it("Selecting on the patch status filter should toggle the tasks that have matching statuses to it", () => {
+  it("Selecting on the task status filter should toggle the tasks that have matching statuses to it", () => {
     cy.dataCy("task-status-filter").click();
     cy.getInputByLabel("All").check({ force: true });
     cy.dataCy("task-status-filter").click();
diff --git a/package.json b/package.json
index 2667df1548..93b3874271 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "spruce",
-  "version": "3.0.83",
+  "version": "3.0.89",
   "private": true,
   "scripts": {
     "bootstrap-logkeeper": "./scripts/bootstrap-logkeeper.sh",
@@ -11,7 +11,7 @@
     "build:staging": "env-cmd -e staging yarn build",
     "build": "GIT_SHA=`git rev-parse HEAD` vite build",
     "check-types": "tsc -p tsconfig.json --noEmit",
-    "codegen": "graphql-codegen --config codegen.yml",
+    "codegen": "graphql-codegen --config codegen.ts",
     "cy:open": "cypress open",
     "cy:run": "cypress run",
     "cy:test": "cypress run --spec",
@@ -53,12 +53,11 @@
   },
   "dependencies": {
     "@apollo/client": "3.6.9",
-    "@bugsnag/js": "7.18.0",
+    "@bugsnag/js": "7.20.2",
     "@bugsnag/plugin-react": "7.18.0",
-    "@emotion/css": "^11.9.0",
-    "@emotion/eslint-plugin": "11.0.0",
-    "@emotion/react": "11.1.4",
-    "@emotion/styled": "11.0.0",
+    "@emotion/css": "11.11.0",
+    "@emotion/react": "11.11.0",
+    "@emotion/styled": "11.11.0",
     "@leafygreen-ui/badge": "8.0.2",
     "@leafygreen-ui/banner": "7.0.4",
     "@leafygreen-ui/button": "20.0.0",
@@ -80,6 +79,7 @@
     "@leafygreen-ui/menu": "20.0.0",
     "@leafygreen-ui/modal": "14.0.1",
     "@leafygreen-ui/number-input": "1.0.4",
+    "@leafygreen-ui/pagination": "1.0.7",
     "@leafygreen-ui/palette": "3.4.4",
     "@leafygreen-ui/popover": "11.0.1",
     "@leafygreen-ui/radio-box-group": "12.0.1",
@@ -95,9 +95,9 @@
     "@leafygreen-ui/text-input": "12.1.0",
     "@leafygreen-ui/toast": "6.1.4",
     "@leafygreen-ui/toggle": "10.0.1",
-    "@leafygreen-ui/tokens": "1.4.1",
+    "@leafygreen-ui/tokens": "2.1.0",
     "@leafygreen-ui/tooltip": "9.1.6",
-    "@leafygreen-ui/typography": "15.1.0",
+    "@leafygreen-ui/typography": "16.4.1",
     "@rjsf/core": "4.2.0",
     "ansi_up": "5.1.0",
     "antd": "4.20.0",
@@ -127,15 +127,15 @@
     "react-window-infinite-loader": "^1.0.8"
   },
   "devDependencies": {
-    "@babel/core": "7.21.8",
     "@babel/plugin-proposal-private-property-in-object": "^7.17.12",
     "@babel/preset-react": "^7.12.13",
     "@bugsnag/source-maps": "^2.3.0",
-    "@emotion/babel-plugin": "^11.1.2",
-    "@emotion/jest": "^11.9.1",
-    "@graphql-codegen/cli": "3.1.0",
-    "@graphql-codegen/typescript": "3.0.1",
-    "@graphql-codegen/typescript-operations": "3.0.1",
+    "@emotion/babel-plugin": "11.11.0",
+    "@emotion/eslint-plugin": "11.11.0",
+    "@emotion/jest": "11.11.0",
+    "@graphql-codegen/cli": "3.2.2",
+    "@graphql-codegen/typescript": "3.0.2",
+    "@graphql-codegen/typescript-operations": "3.0.2",
     "@graphql-eslint/eslint-plugin": "3.18.0",
     "@originjs/vite-plugin-commonjs": "1.0.3",
     "@storybook/addon-actions": "7.0.0-rc.5",
@@ -203,7 +203,7 @@
     "serve-handler": "^6.1.5",
     "storybook": "7.0.0-rc.5",
     "typescript": "5.0.3",
-    "vite": "4.3.7",
+    "vite": "4.3.9",
     "vite-plugin-checker": "0.6.0",
     "vite-plugin-env-compatible": "1.1.1",
     "vite-plugin-imp": "2.4.0",
diff --git a/src/analytics/patch/usePatchAnalytics.ts b/src/analytics/patch/usePatchAnalytics.ts
index 7ed652d766..b5c61bee82 100644
--- a/src/analytics/patch/usePatchAnalytics.ts
+++ b/src/analytics/patch/usePatchAnalytics.ts
@@ -45,6 +45,7 @@ type Action =
       subscription: SaveSubscriptionForUserMutationVariables["subscription"];
     }
   | { name: "Toggle Display Task Dropdown"; expanded: boolean }
+  | { name: "Set Patch Visibility"; hidden: boolean }
   | { name: "Click Base Commit Link" }
   | { name: "Open Schedule Tasks Modal" };
 
diff --git a/src/analytics/patches/useProjectPatchesAnalytics.ts b/src/analytics/patches/useProjectPatchesAnalytics.ts
index f2e351d209..7bcd2c5e7a 100644
--- a/src/analytics/patches/useProjectPatchesAnalytics.ts
+++ b/src/analytics/patches/useProjectPatchesAnalytics.ts
@@ -7,11 +7,12 @@ import {
 import { useGetUserQuery } from "analytics/useGetUserQuery";
 
 type Action =
-  | { name: "Filter Patches"; filterBy: string }
-  | { name: "Filter Commit Queue" }
   | { name: "Change Page Size" }
+  | { name: "Change Project" }
   | { name: "Click Patch Link" }
-  | { name: "Click Variant Icon"; variantIconStatus: string };
+  | { name: "Click Variant Icon"; variantIconStatus: string }
+  | { name: "Filter Commit Queue" }
+  | { name: "Filter Patches"; filterBy: string };
 
 interface P extends Properties {}
 interface Analytics extends A<Action> {}
diff --git a/src/components/Breadcrumbs/__snapshots__/Breadcrumbs.stories.storyshot b/src/components/Breadcrumbs/__snapshots__/Breadcrumbs.stories.storyshot
index ae230bd30f..389bd2e41d 100644
--- a/src/components/Breadcrumbs/__snapshots__/Breadcrumbs.stories.storyshot
+++ b/src/components/Breadcrumbs/__snapshots__/Breadcrumbs.stories.storyshot
@@ -9,7 +9,7 @@ exports[`storybook Storyshots components/Breadcrumbs Default 1`] = `
       class="leafygreen-ui-cssveg"
     >
       <a
-        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
         href="/commits/spruce"
       >
         <span
diff --git a/src/components/CodeChanges/CodeChanges.tsx b/src/components/CodeChanges/CodeChanges.tsx
index 8b99a87c56..e831721851 100644
--- a/src/components/CodeChanges/CodeChanges.tsx
+++ b/src/components/CodeChanges/CodeChanges.tsx
@@ -1,7 +1,12 @@
 import { useQuery } from "@apollo/client";
 import styled from "@emotion/styled";
 import Button from "@leafygreen-ui/button";
-import { Body, Description, Subtitle } from "@leafygreen-ui/typography";
+import {
+  Body,
+  Description,
+  Subtitle,
+  SubtitleProps,
+} from "@leafygreen-ui/typography";
 import { Skeleton } from "antd";
 import { useParams } from "react-router-dom";
 import { CodeChangesBadge } from "components/CodeChangesBadge";
@@ -13,7 +18,6 @@ import {
   FileDiffsFragment,
 } from "gql/generated/types";
 import { GET_CODE_CHANGES } from "gql/queries";
-import { SubtitleType } from "types/leafygreen";
 import { commits } from "utils";
 import { formatZeroIndexForDisplay } from "utils/numbers";
 
@@ -114,8 +118,7 @@ const StyledButton = styled(Button)`
   margin-right: ${size.xs};
 `;
 
-// @ts-expect-error
-const Title: SubtitleType = styled(Subtitle)`
+const Title = styled(Subtitle)<SubtitleProps>`
   font-weight: normal;
   margin-right: ${size.s};
   margin-bottom: ${size.s};
diff --git a/src/components/Dropdown/__snapshots__/Dropdown.stories.storyshot b/src/components/Dropdown/__snapshots__/Dropdown.stories.storyshot
index 829ea31088..8de3094d16 100644
--- a/src/components/Dropdown/__snapshots__/Dropdown.stories.storyshot
+++ b/src/components/Dropdown/__snapshots__/Dropdown.stories.storyshot
@@ -76,7 +76,7 @@ exports[`storybook Storyshots components/Dropdown Default 1`] = `
             class="css-soeq2u-LabelWrapper e1yw4j303"
           >
             <p
-              class="css-197mxpc-OverflowBody e1yw4j300 leafygreen-ui-1yli3c0"
+              class="css-197mxpc-OverflowBody e1yw4j300 leafygreen-ui-1tb6tuo"
               data-cy="dropdown-value"
             />
           </div>
diff --git a/src/components/EditableTagField/__snapshots__/EditableTagField.stories.storyshot b/src/components/EditableTagField/__snapshots__/EditableTagField.stories.storyshot
index 2819bb73f0..287ad8e8ad 100644
--- a/src/components/EditableTagField/__snapshots__/EditableTagField.stories.storyshot
+++ b/src/components/EditableTagField/__snapshots__/EditableTagField.stories.storyshot
@@ -25,7 +25,7 @@ exports[`storybook Storyshots components/EditableTagField Default 1`] = `
                 class="leafygreen-ui-a533bt"
               >
                 <label
-                  class="leafygreen-ui-1vn1hji leafygreen-ui-1k5mcru"
+                  class="leafygreen-ui-gr5280"
                   for="tag_key_1"
                 >
                   Key
@@ -64,7 +64,7 @@ exports[`storybook Storyshots components/EditableTagField Default 1`] = `
                 class="leafygreen-ui-a533bt"
               >
                 <label
-                  class="leafygreen-ui-1vn1hji leafygreen-ui-1k5mcru"
+                  class="leafygreen-ui-gr5280"
                   for="tag_value_1"
                 >
                   Value
@@ -145,7 +145,7 @@ exports[`storybook Storyshots components/EditableTagField Default 1`] = `
                 class="leafygreen-ui-a533bt"
               >
                 <label
-                  class="leafygreen-ui-1vn1hji leafygreen-ui-1k5mcru"
+                  class="leafygreen-ui-gr5280"
                   for="tag_key_2"
                 >
                   Key
@@ -184,7 +184,7 @@ exports[`storybook Storyshots components/EditableTagField Default 1`] = `
                 class="leafygreen-ui-a533bt"
               >
                 <label
-                  class="leafygreen-ui-1vn1hji leafygreen-ui-1k5mcru"
+                  class="leafygreen-ui-gr5280"
                   for="tag_value_2"
                 >
                   Value
@@ -265,7 +265,7 @@ exports[`storybook Storyshots components/EditableTagField Default 1`] = `
                 class="leafygreen-ui-a533bt"
               >
                 <label
-                  class="leafygreen-ui-1vn1hji leafygreen-ui-1k5mcru"
+                  class="leafygreen-ui-gr5280"
                   for="tag_key_3"
                 >
                   Key
@@ -304,7 +304,7 @@ exports[`storybook Storyshots components/EditableTagField Default 1`] = `
                 class="leafygreen-ui-a533bt"
               >
                 <label
-                  class="leafygreen-ui-1vn1hji leafygreen-ui-1k5mcru"
+                  class="leafygreen-ui-gr5280"
                   for="tag_value_3"
                 >
                   Value
diff --git a/src/components/ErrorBoundary/ErrorFallback.tsx b/src/components/ErrorBoundary/ErrorFallback.tsx
index 6e02ee3ea7..3081cc36b1 100644
--- a/src/components/ErrorBoundary/ErrorFallback.tsx
+++ b/src/components/ErrorBoundary/ErrorFallback.tsx
@@ -2,7 +2,6 @@ import styled from "@emotion/styled";
 import { palette } from "@leafygreen-ui/palette";
 import { H1, H2 } from "@leafygreen-ui/typography";
 import { size } from "constants/tokens";
-import { H1Type, H2Type } from "types/leafygreen";
 import { environmentVariables } from "utils";
 import errorPage from "./errorPage.svg";
 
@@ -25,11 +24,11 @@ const ErrorFallback = () => (
 
 export default ErrorFallback;
 
-const StyledHeader = styled<H1Type>(H1)`
+const StyledHeader = styled(H1)`
   color: ${white};
 `;
 
-const StyledSubtitle = styled<H2Type>(H2)`
+const StyledSubtitle = styled(H2)`
   color: ${white};
 `;
 
diff --git a/src/components/ErrorBoundary/__snapshots__/ErrorFallback.stories.storyshot b/src/components/ErrorBoundary/__snapshots__/ErrorFallback.stories.storyshot
index 3742180d95..ca143504e6 100644
--- a/src/components/ErrorBoundary/__snapshots__/ErrorFallback.stories.storyshot
+++ b/src/components/ErrorBoundary/__snapshots__/ErrorFallback.stories.storyshot
@@ -12,12 +12,12 @@ exports[`storybook Storyshots components/ErrorBoundary/ErrorFallback Default Err
         class="css-1ow8p7h-Text e1n39ls31"
       >
         <h1
-          class="css-15usbh5-StyledHeader e1n39ls34 leafygreen-ui-a01oan"
+          class="css-15usbh5-StyledHeader e1n39ls34 leafygreen-ui-yk169t"
         >
           Error
         </h1>
         <h2
-          class="css-15lzim1-StyledSubtitle e1n39ls33 leafygreen-ui-1wgcd7w"
+          class="css-15lzim1-StyledSubtitle e1n39ls33 leafygreen-ui-oaqrgz"
         >
           Ouch! That's gotta hurt,
           <br />
diff --git a/src/components/ExpandedText/__snapshots__/ExpandedText.stories.storyshot b/src/components/ExpandedText/__snapshots__/ExpandedText.stories.storyshot
index fbb62686c9..e514cf2b8a 100644
--- a/src/components/ExpandedText/__snapshots__/ExpandedText.stories.storyshot
+++ b/src/components/ExpandedText/__snapshots__/ExpandedText.stories.storyshot
@@ -3,7 +3,7 @@
 exports[`storybook Storyshots components/ExpandedText Default 1`] = `
 <div>
   <small
-    class="leafygreen-ui-cssveg css-7pbzgz-ButtonText eq9i5u71 leafygreen-ui-ppjyot"
+    class="leafygreen-ui-cssveg css-7pbzgz-ButtonText eq9i5u71 leafygreen-ui-6flbwy"
   >
     more
   </small>
diff --git a/src/components/FilterBadges/__snapshots__/FilterBadges.stories.storyshot b/src/components/FilterBadges/__snapshots__/FilterBadges.stories.storyshot
index 3763614747..0dcdb4fb17 100644
--- a/src/components/FilterBadges/__snapshots__/FilterBadges.stories.storyshot
+++ b/src/components/FilterBadges/__snapshots__/FilterBadges.stories.storyshot
@@ -60,7 +60,7 @@ exports[`storybook Storyshots components/FilterBadges Default 1`] = `
           class="leafygreen-ui-a533bt"
         >
           <label
-            class="leafygreen-ui-1vn1hji leafygreen-ui-1k5mcru"
+            class="leafygreen-ui-gr5280"
             for="textinput-7"
           >
             key
@@ -91,7 +91,7 @@ exports[`storybook Storyshots components/FilterBadges Default 1`] = `
           class="leafygreen-ui-a533bt"
         >
           <label
-            class="leafygreen-ui-1vn1hji leafygreen-ui-1k5mcru"
+            class="leafygreen-ui-gr5280"
             for="textinput-8"
           >
             value
diff --git a/src/components/HistoryTable/HistoryTableIcon/__snapshots__/HistoryTableIcon.stories.storyshot b/src/components/HistoryTable/HistoryTableIcon/__snapshots__/HistoryTableIcon.stories.storyshot
index cb78fb6bce..55c9eac38d 100644
--- a/src/components/HistoryTable/HistoryTableIcon/__snapshots__/HistoryTableIcon.stories.storyshot
+++ b/src/components/HistoryTable/HistoryTableIcon/__snapshots__/HistoryTableIcon.stories.storyshot
@@ -33,7 +33,7 @@ exports[`storybook Storyshots Components/HistoryTable/Icons Active Icons 1`] = `
         </svg>
       </div>
       <p
-        class="leafygreen-ui-1yli3c0"
+        class="leafygreen-ui-1tb6tuo"
       />
     </div>
     <div
@@ -59,7 +59,7 @@ exports[`storybook Storyshots Components/HistoryTable/Icons Active Icons 1`] = `
         </svg>
       </div>
       <p
-        class="leafygreen-ui-1yli3c0"
+        class="leafygreen-ui-1tb6tuo"
       >
         5/10 failing tests
       </p>
@@ -88,7 +88,7 @@ exports[`storybook Storyshots Components/HistoryTable/Icons Active Icons 1`] = `
         </svg>
       </div>
       <p
-        class="leafygreen-ui-1yli3c0"
+        class="leafygreen-ui-1tb6tuo"
       >
         1/2 failing tests
       </p>
@@ -119,7 +119,7 @@ exports[`storybook Storyshots Components/HistoryTable/Icons Active Icons 1`] = `
         </svg>
       </div>
       <p
-        class="leafygreen-ui-1yli3c0"
+        class="leafygreen-ui-1tb6tuo"
       />
     </div>
     <div
@@ -157,7 +157,7 @@ exports[`storybook Storyshots Components/HistoryTable/Icons Active Icons 1`] = `
         </svg>
       </div>
       <p
-        class="leafygreen-ui-1yli3c0"
+        class="leafygreen-ui-1tb6tuo"
       >
         5/10 failing tests
       </p>
@@ -190,7 +190,7 @@ exports[`storybook Storyshots Components/HistoryTable/Icons Active Icons 1`] = `
         </svg>
       </div>
       <p
-        class="leafygreen-ui-1yli3c0"
+        class="leafygreen-ui-1tb6tuo"
       >
         5/10 failing tests
       </p>
@@ -222,7 +222,7 @@ exports[`storybook Storyshots Components/HistoryTable/Icons Active Icons 1`] = `
         </svg>
       </div>
       <p
-        class="leafygreen-ui-1yli3c0"
+        class="leafygreen-ui-1tb6tuo"
       >
         5/10 failing tests
       </p>
@@ -262,7 +262,7 @@ exports[`storybook Storyshots Components/HistoryTable/Icons Active Icons 1`] = `
         </svg>
       </div>
       <p
-        class="leafygreen-ui-1yli3c0"
+        class="leafygreen-ui-1tb6tuo"
       >
         5/10 failing tests
       </p>
@@ -295,7 +295,7 @@ exports[`storybook Storyshots Components/HistoryTable/Icons Active Icons 1`] = `
         </svg>
       </div>
       <p
-        class="leafygreen-ui-1yli3c0"
+        class="leafygreen-ui-1tb6tuo"
       />
     </div>
     <div
@@ -333,7 +333,7 @@ exports[`storybook Storyshots Components/HistoryTable/Icons Active Icons 1`] = `
         </svg>
       </div>
       <p
-        class="leafygreen-ui-1yli3c0"
+        class="leafygreen-ui-1tb6tuo"
       />
     </div>
   </div>
diff --git a/src/components/HistoryTable/HistoryTableTestSearch/__snapshots__/HistoryTableTestSearch.stories.storyshot b/src/components/HistoryTable/HistoryTableTestSearch/__snapshots__/HistoryTableTestSearch.stories.storyshot
index 7e8c157e73..9079a1757f 100644
--- a/src/components/HistoryTable/HistoryTableTestSearch/__snapshots__/HistoryTableTestSearch.stories.storyshot
+++ b/src/components/HistoryTable/HistoryTableTestSearch/__snapshots__/HistoryTableTestSearch.stories.storyshot
@@ -18,7 +18,7 @@ exports[`storybook Storyshots Components/HistoryTable/HistoryTableTestSearch Def
             class="leafygreen-ui-a533bt"
           >
             <label
-              class="leafygreen-ui-1vn1hji leafygreen-ui-1k5mcru"
+              class="leafygreen-ui-gr5280"
               for="textinput-9"
             >
               Filter by Failed Tests
diff --git a/src/components/MetadataCard.tsx b/src/components/MetadataCard.tsx
index d19312b02b..80a55954f3 100644
--- a/src/components/MetadataCard.tsx
+++ b/src/components/MetadataCard.tsx
@@ -1,6 +1,6 @@
 import { ApolloError } from "@apollo/client";
 import styled from "@emotion/styled";
-import { Body } from "@leafygreen-ui/typography";
+import { Body, BodyProps } from "@leafygreen-ui/typography";
 import { Skeleton } from "antd";
 import { ErrorWrapper } from "components/ErrorWrapper";
 import { SiderCard, wordBreakCss } from "components/styles";
@@ -48,7 +48,7 @@ export const MetadataItem: React.VFC<ItemProps> = ({
   "data-cy": dataCy,
 }) => <Item data-cy={dataCy}>{children}</Item>;
 
-const Title = styled(Body)`
+const Title = styled(Body)<BodyProps>`
   font-size: 15px;
 `;
 
diff --git a/src/components/PageTitle.tsx b/src/components/PageTitle.tsx
index 1295d5f72f..aca4d89ec9 100644
--- a/src/components/PageTitle.tsx
+++ b/src/components/PageTitle.tsx
@@ -32,7 +32,8 @@ const TitleTypography: React.VFC<TitleTypographyProps> = ({
   }
 };
 
-export const PageTitle: React.VFC<Props> = ({
+export const PageTitle: React.FC<Props> = ({
+  children,
   loading,
   title,
   badge,
@@ -54,6 +55,7 @@ export const PageTitle: React.VFC<Props> = ({
           <TitleWrapper size={size}>
             <TitleTypography size={size}>
               <span data-cy="page-title">{title}</span>
+              {children}
               <BadgeWrapper size={size}>{badge}</BadgeWrapper>
             </TitleTypography>
           </TitleWrapper>
diff --git a/src/components/PatchActionButtons/SetPatchVisibility.tsx b/src/components/PatchActionButtons/SetPatchVisibility.tsx
index 0da4313b56..f64e02ee3b 100644
--- a/src/components/PatchActionButtons/SetPatchVisibility.tsx
+++ b/src/components/PatchActionButtons/SetPatchVisibility.tsx
@@ -2,6 +2,7 @@ import { useState, useRef } from "react";
 import { useMutation } from "@apollo/client";
 import { MenuItem } from "@leafygreen-ui/menu";
 import { Body } from "@leafygreen-ui/typography";
+import { usePatchAnalytics } from "analytics";
 import Popconfirm from "components/Popconfirm";
 import { useToastContext } from "context/toast";
 import {
@@ -21,7 +22,7 @@ export const SetPatchVisibility: React.VFC<Props> = ({
   const dispatchToast = useToastContext();
   const [open, setOpen] = useState(false);
   const menuItemRef = useRef<HTMLDivElement>(null);
-
+  const { sendEvent } = usePatchAnalytics(patchId);
   const [setPatchVisibility] = useMutation<
     SetPatchVisibilityMutation,
     SetPatchVisibilityMutationVariables
@@ -45,6 +46,7 @@ export const SetPatchVisibility: React.VFC<Props> = ({
       <Popconfirm
         align="left"
         onConfirm={() => {
+          sendEvent({ name: "Set Patch Visibility", hidden: true });
           setPatchVisibility({
             variables: { patchIds: [patchId], hidden: true },
           });
diff --git a/src/components/PatchesPage/index.tsx b/src/components/PatchesPage/index.tsx
index eec7ce14a6..917e758c8d 100644
--- a/src/components/PatchesPage/index.tsx
+++ b/src/components/PatchesPage/index.tsx
@@ -30,18 +30,20 @@ interface Props {
         variantIconStatus: string;
       }
   >;
-  pageTitle: string;
-  patches?: PatchesPagePatchesFragment;
+  filterComp?: React.ReactNode;
   loading: boolean;
+  pageTitle: string;
   pageType: "project" | "user";
+  patches?: PatchesPagePatchesFragment;
 }
 
 export const PatchesPage: React.VFC<Props> = ({
   analyticsObject,
-  pageTitle,
-  patches,
+  filterComp,
   loading,
+  pageTitle,
   pageType,
+  patches,
 }) => {
   const { search } = useLocation();
   const setPageSize = usePageSizeSelector();
@@ -71,7 +73,7 @@ export const PatchesPage: React.VFC<Props> = ({
   return (
     <PageWrapper>
       <PageTitle data-cy="patches-page-title">{pageTitle}</PageTitle>
-      <FiltersWrapperSpaceBetween>
+      <FiltersWrapperSpaceBetween hasAdditionalFilterComp={!!filterComp}>
         <SearchInput
           aria-label="Search patch descriptions"
           placeholder="Patch description regex"
@@ -80,6 +82,7 @@ export const PatchesPage: React.VFC<Props> = ({
           data-cy="patch-description-input"
         />
         <StatusSelector />
+        {filterComp}
         <CheckboxContainer>
           <Checkbox
             data-cy="commit-queue-checkbox"
@@ -135,9 +138,16 @@ const PaginationRow = styled.div`
   justify-content: flex-end;
   align-items: center;
 `;
-const FiltersWrapperSpaceBetween = styled(FiltersWrapper)`
+const FiltersWrapperSpaceBetween = styled(FiltersWrapper)<{
+  hasAdditionalFilterComp: boolean;
+}>`
   display: grid;
-  grid-template-columns: repeat(2, 1fr) 2fr;
+  grid-template-columns:
+    repeat(
+      ${({ hasAdditionalFilterComp }) => (hasAdditionalFilterComp ? 3 : 2)},
+      1fr
+    )
+    2fr;
   grid-column-gap: ${size.s};
 `;
 
diff --git a/src/components/ProjectSelect/__snapshots__/ProjectSelect.stories.storyshot b/src/components/ProjectSelect/__snapshots__/ProjectSelect.stories.storyshot
index dd25e82359..014f9d654f 100644
--- a/src/components/ProjectSelect/__snapshots__/ProjectSelect.stories.storyshot
+++ b/src/components/ProjectSelect/__snapshots__/ProjectSelect.stories.storyshot
@@ -6,7 +6,7 @@ exports[`storybook Storyshots components/ProjectSelect Default 1`] = `
     class="css-1ry038z-Container e17dnzmx0"
   >
     <label
-      class="leafygreen-ui-1k5mcru"
+      class="leafygreen-ui-1fi5x3a"
       for="searchable-dropdown-Project"
     >
       Project
@@ -37,7 +37,7 @@ exports[`storybook Storyshots components/ProjectSelect Default 1`] = `
                 class="css-soeq2u-LabelWrapper e1yw4j303"
               >
                 <p
-                  class="css-197mxpc-OverflowBody e1yw4j300 leafygreen-ui-1yli3c0"
+                  class="css-197mxpc-OverflowBody e1yw4j300 leafygreen-ui-1tb6tuo"
                   data-cy="dropdown-value"
                 >
                   evergreen smoke test
@@ -76,7 +76,7 @@ exports[`storybook Storyshots components/ProjectSelect With Clickable Header 1`]
     class="css-1ry038z-Container e17dnzmx0"
   >
     <label
-      class="leafygreen-ui-1k5mcru"
+      class="leafygreen-ui-1fi5x3a"
       for="searchable-dropdown-Project"
     >
       Project
@@ -107,7 +107,7 @@ exports[`storybook Storyshots components/ProjectSelect With Clickable Header 1`]
                 class="css-soeq2u-LabelWrapper e1yw4j303"
               >
                 <p
-                  class="css-197mxpc-OverflowBody e1yw4j300 leafygreen-ui-1yli3c0"
+                  class="css-197mxpc-OverflowBody e1yw4j300 leafygreen-ui-1tb6tuo"
                   data-cy="dropdown-value"
                 >
                   evergreen smoke test
diff --git a/src/components/ProjectSelect/index.tsx b/src/components/ProjectSelect/index.tsx
index 7722fe78e5..9a9dd6fdda 100644
--- a/src/components/ProjectSelect/index.tsx
+++ b/src/components/ProjectSelect/index.tsx
@@ -13,17 +13,19 @@ import { Unpacked } from "types/utils";
 import { ProjectOptionGroup } from "./ProjectOptionGroup";
 
 interface ProjectSelectProps {
-  selectedProjectIdentifier: string;
-  isProjectSettingsPage?: boolean;
   getRoute: (projectIdentifier: string) => string;
+  isProjectSettingsPage?: boolean;
   onSubmit?: (projectIdentifier: string) => void;
+  selectedProjectIdentifier: string;
+  showLabel?: boolean;
 }
 
 export const ProjectSelect: React.VFC<ProjectSelectProps> = ({
-  selectedProjectIdentifier,
-  isProjectSettingsPage = false,
   getRoute,
+  isProjectSettingsPage = false,
   onSubmit = () => {},
+  selectedProjectIdentifier,
+  showLabel = true,
 }) => {
   const navigate = useNavigate();
 
@@ -90,7 +92,7 @@ export const ProjectSelect: React.VFC<ProjectSelectProps> = ({
 
   return (
     <SearchableDropdown
-      label="Project"
+      label={showLabel ? "Project" : null}
       value={
         selectedProject?.displayName ||
         selectedProject?.identifier ||
diff --git a/src/components/SearchableDropdown/__snapshots__/SearchableDropdown.stories.storyshot b/src/components/SearchableDropdown/__snapshots__/SearchableDropdown.stories.storyshot
index 3778694a00..d3f4510a04 100644
--- a/src/components/SearchableDropdown/__snapshots__/SearchableDropdown.stories.storyshot
+++ b/src/components/SearchableDropdown/__snapshots__/SearchableDropdown.stories.storyshot
@@ -6,7 +6,7 @@ exports[`storybook Storyshots components/SearchableDropdown Custom Option 1`] =
     class="css-1ry038z-Container e17dnzmx0"
   >
     <label
-      class="leafygreen-ui-1k5mcru"
+      class="leafygreen-ui-1fi5x3a"
       for="searchable-dropdown-Custom option select"
     >
       Custom option select
@@ -37,7 +37,7 @@ exports[`storybook Storyshots components/SearchableDropdown Custom Option 1`] =
                 class="css-soeq2u-LabelWrapper e1yw4j303"
               >
                 <p
-                  class="css-197mxpc-OverflowBody e1yw4j300 leafygreen-ui-1yli3c0"
+                  class="css-197mxpc-OverflowBody e1yw4j300 leafygreen-ui-1tb6tuo"
                   data-cy="dropdown-value"
                 >
                   Select an element
@@ -76,7 +76,7 @@ exports[`storybook Storyshots components/SearchableDropdown Default 1`] = `
     class="css-1ry038z-Container e17dnzmx0"
   >
     <label
-      class="leafygreen-ui-1k5mcru"
+      class="leafygreen-ui-1fi5x3a"
       for="searchable-dropdown-Searchable Dropdown"
     >
       Searchable Dropdown
@@ -107,7 +107,7 @@ exports[`storybook Storyshots components/SearchableDropdown Default 1`] = `
                 class="css-soeq2u-LabelWrapper e1yw4j303"
               >
                 <p
-                  class="css-197mxpc-OverflowBody e1yw4j300 leafygreen-ui-1yli3c0"
+                  class="css-197mxpc-OverflowBody e1yw4j300 leafygreen-ui-1tb6tuo"
                   data-cy="dropdown-value"
                 >
                   Select an element
diff --git a/src/components/SearchableDropdown/index.tsx b/src/components/SearchableDropdown/index.tsx
index 8876880704..3eae60179e 100644
--- a/src/components/SearchableDropdown/index.tsx
+++ b/src/components/SearchableDropdown/index.tsx
@@ -1,6 +1,5 @@
 import {
   ChangeEvent,
-  ReactNode,
   useState,
   PropsWithChildren,
   useRef,
@@ -20,17 +19,17 @@ const { gray, blue } = palette;
 
 export interface SearchableDropdownProps<T> {
   allowMultiSelect?: boolean;
-  buttonRenderer?: (option: T | T[]) => ReactNode;
+  buttonRenderer?: (option: T | T[]) => React.ReactNode;
   ["data-cy"]?: string;
   disabled?: boolean;
-  label: string | ReactNode;
+  label?: React.ReactNode;
   onChange: (value: T | T[]) => void;
   options?: T[] | string[];
   optionRenderer?: (
     option: T,
     onClick: (selectedV) => void,
     isChecked: (selectedV) => boolean
-  ) => ReactNode;
+  ) => React.ReactNode;
   searchFunc?: (options: T[], match: string) => T[];
   searchPlaceholder?: string;
   value: T | T[];
@@ -144,7 +143,7 @@ const SearchableDropdown = <T extends {}>({
 
   return (
     <Container>
-      <Label htmlFor={`searchable-dropdown-${label}`}>{label}</Label>
+      {label && <Label htmlFor={`searchable-dropdown-${label}`}>{label}</Label>}
       <Wrapper>
         <Dropdown
           id={`searchable-dropdown-${label}`}
diff --git a/src/components/SettingsCard.tsx b/src/components/SettingsCard.tsx
index 30c15b39bc..6bf0f0bfc3 100644
--- a/src/components/SettingsCard.tsx
+++ b/src/components/SettingsCard.tsx
@@ -1,11 +1,10 @@
 import styled from "@emotion/styled";
 import Card from "@leafygreen-ui/card";
-import { H3 } from "@leafygreen-ui/typography";
+import { H3, H3Props } from "@leafygreen-ui/typography";
 import { size } from "constants/tokens";
-import { H3Type } from "types/leafygreen";
 
-export const SettingsCardTitle = styled<H3Type>(H3)`
-  margin: ${size.m} 0;
+export const SettingsCardTitle = styled(H3)<H3Props>`
+  margin: ${size.m} 0 ${size.s} 0;
 `;
 
 export const formComponentSpacingCSS = "margin-bottom: 48px;";
diff --git a/src/components/SpruceForm/Container.tsx b/src/components/SpruceForm/Container.tsx
index f0441e0276..59aeae0dcd 100644
--- a/src/components/SpruceForm/Container.tsx
+++ b/src/components/SpruceForm/Container.tsx
@@ -1,20 +1,23 @@
 import { SettingsCard, SettingsCardTitle } from "components/SettingsCard";
 
 interface ContainerProps {
-  title?: string;
-  id?: string;
-  "data-cy"?: string;
   children: React.ReactNode;
+  "data-cy"?: string;
+  description?: React.ReactNode;
+  id?: string;
+  title?: string;
 }
 
 export const SpruceFormContainer: React.VFC<ContainerProps> = ({
   children,
   "data-cy": dataCy,
+  description,
   id,
   title,
 }) => (
   <div>
     {title && <SettingsCardTitle id={id}>{title}</SettingsCardTitle>}
+    {description}
     <SettingsCard data-cy={dataCy}>{children}</SettingsCard>
   </div>
 );
diff --git a/src/components/SpruceForm/CustomFields.tsx b/src/components/SpruceForm/CustomFields.tsx
index 5c031e498c..329731d272 100644
--- a/src/components/SpruceForm/CustomFields.tsx
+++ b/src/components/SpruceForm/CustomFields.tsx
@@ -1,5 +1,11 @@
 import styled from "@emotion/styled";
-import { Description, H3, Subtitle } from "@leafygreen-ui/typography";
+import {
+  Description,
+  H3,
+  H3Props,
+  Subtitle,
+  SubtitleProps,
+} from "@leafygreen-ui/typography";
 import { Field, FieldProps } from "@rjsf/core";
 import { size } from "constants/tokens";
 
@@ -12,20 +18,15 @@ export const TitleField: React.VFC<TitleFieldProps> = ({
 }) => {
   const isSectionTitle = uiSchema?.["ui:sectionTitle"] ?? false;
   const Component = isSectionTitle ? StyledH3 : StyledSubtitle;
-  return (
-    /* @ts-expect-error */
-    <Component id={id}>{title}</Component>
-  );
+  return <Component id={id}>{title}</Component>;
 };
 
-/* @ts-expect-error  */
-const StyledH3 = styled(H3)`
+const StyledH3 = styled(H3)<H3Props>`
   margin-top: ${size.m};
   margin-bottom: 12px;
 `;
 
-/* @ts-expect-error  */
-const StyledSubtitle = styled(Subtitle)`
+const StyledSubtitle = styled(Subtitle)<SubtitleProps>`
   margin-top: ${size.s};
   margin-bottom: 12px;
 `;
diff --git a/src/components/SpruceForm/FieldTemplates/ArrayFieldTemplates/index.tsx b/src/components/SpruceForm/FieldTemplates/ArrayFieldTemplates/index.tsx
index 080ea80228..05c6aa5c88 100644
--- a/src/components/SpruceForm/FieldTemplates/ArrayFieldTemplates/index.tsx
+++ b/src/components/SpruceForm/FieldTemplates/ArrayFieldTemplates/index.tsx
@@ -141,6 +141,8 @@ export const ArrayFieldTemplate: React.VFC<ArrayFieldTemplateProps> = ({
   const addButtonSize = uiSchema["ui:addButtonSize"] || "small";
   const addButtonText = uiSchema["ui:addButtonText"] || "Add";
   const secondaryButton = uiSchema["ui:secondaryButton"];
+  const arrayDataCy = uiSchema["ui:data-cy"];
+
   // Override RJSF's default array behavior; add new elements to beginning of array unless otherwise specified.
   const addToEnd = uiSchema["ui:addToEnd"] ?? false;
   const handleAddClick =
@@ -178,6 +180,7 @@ export const ArrayFieldTemplate: React.VFC<ArrayFieldTemplateProps> = ({
       <ArrayContainer
         fullWidth={fullWidth || useExpandableCard}
         hasChildren={!!items?.length}
+        data-cy={arrayDataCy}
       >
         {items.length === 0 ? (
           <Placeholder>{placeholder}</Placeholder>
diff --git a/src/components/SpruceForm/FieldTemplates/ObjectFieldTemplates/index.tsx b/src/components/SpruceForm/FieldTemplates/ObjectFieldTemplates/index.tsx
index bcb83e32ce..a4bc2d9edd 100644
--- a/src/components/SpruceForm/FieldTemplates/ObjectFieldTemplates/index.tsx
+++ b/src/components/SpruceForm/FieldTemplates/ObjectFieldTemplates/index.tsx
@@ -53,19 +53,36 @@ export const ObjectFieldTemplate = ({
  * `CardFieldTemplate` is a custom ObjectFieldTemplate that renders a card with a title and a list of properties.
  */
 export const CardFieldTemplate: React.VFC<ObjectFieldTemplateProps> = ({
+  DescriptionField,
   idSchema,
   properties,
+  schema,
   title,
-  uiSchema: { "ui:title": uiTitle, "ui:data-cy": dataCy },
-}) => (
-  <SpruceFormContainer
-    title={uiTitle || title}
-    id={`${idSchema.$id}__title`}
-    data-cy={dataCy}
-  >
-    {properties.map((prop) => prop.content)}
-  </SpruceFormContainer>
-);
+  uiSchema: {
+    "ui:data-cy": dataCy,
+    "ui:description": uiDescription,
+    "ui:title": uiTitle,
+  },
+}) => {
+  const description = uiDescription || schema.description;
+  return (
+    <SpruceFormContainer
+      title={uiTitle || title}
+      id={`${idSchema.$id}__title`}
+      data-cy={dataCy}
+      description={
+        description && (
+          <DescriptionField
+            id={`${idSchema.$id}__description`}
+            description={description}
+          />
+        )
+      }
+    >
+      {properties.map((prop) => prop.content)}
+    </SpruceFormContainer>
+  );
+};
 
 /**
  * `AccordionFieldTemplate` is a custom ObjectFieldTemplate that renders an accordion with a title and a list of properties.
@@ -116,7 +133,6 @@ const RowContainer = styled.div`
   gap: ${size.s};
 `;
 
-/* @ts-expect-error  */
 const AccordionTitle = styled(Subtitle)`
   font-size: ${fontSize.l};
   margin: ${size.xs} 0;
diff --git a/src/components/SpruceForm/SpruceForm.test.tsx b/src/components/SpruceForm/SpruceForm.test.tsx
index 548ddf03d9..d343862144 100644
--- a/src/components/SpruceForm/SpruceForm.test.tsx
+++ b/src/components/SpruceForm/SpruceForm.test.tsx
@@ -306,6 +306,54 @@ describe("spruce form", () => {
         ).toHaveStyle("cursor: not-allowed");
       });
     });
+
+    describe("radio group", () => {
+      it("renders 3 inputs with the specified default selected", () => {
+        const { formData, schema, uiSchema } = radioGroup;
+        const onChange = jest.fn();
+        render(
+          <SpruceForm
+            schema={schema}
+            formData={formData}
+            onChange={onChange}
+            uiSchema={uiSchema}
+          />
+        );
+
+        expect(screen.getAllByRole("radio")).toHaveLength(3);
+        expect(screen.getByLabelText("New York")).toBeChecked();
+      });
+
+      it("disables options in enumDisabled", () => {
+        const { formData, schema, uiSchema } = radioGroup;
+        const onChange = jest.fn();
+        render(
+          <SpruceForm
+            schema={schema}
+            formData={formData}
+            onChange={onChange}
+            uiSchema={uiSchema}
+          />
+        );
+
+        expect(screen.getByLabelText("Connecticut")).toBeDisabled();
+      });
+
+      it("shows option descriptions", () => {
+        const { formData, schema, uiSchema } = radioGroup;
+        const onChange = jest.fn();
+        render(
+          <SpruceForm
+            schema={schema}
+            formData={formData}
+            onChange={onChange}
+            uiSchema={uiSchema}
+          />
+        );
+
+        expect(screen.getByText("The Garden State")).toBeVisible();
+      });
+    });
   });
 });
 
@@ -362,7 +410,6 @@ const basicForm = {
     },
     users: {
       "ui:addButtonText": "New User",
-      "ui:data-cy": "new-user-input",
       items: {
         "ui:ariaLabelledBy": "root_access",
         "ui:data-cy": "new-user-input",
@@ -449,3 +496,41 @@ const select = {
     },
   },
 };
+
+const radioGroup = {
+  formData: {},
+  schema: {
+    type: "object" as "object",
+    properties: {
+      states: {
+        type: "string" as "string",
+        title: "Tri-state Area",
+        default: "ny",
+        oneOf: [
+          {
+            type: "string" as "string",
+            title: "New York",
+            enum: ["ny"],
+          },
+          {
+            type: "string" as "string",
+            title: "New Jersey",
+            description: "The Garden State",
+            enum: ["nj"],
+          },
+          {
+            type: "string" as "string",
+            title: "Connecticut",
+            enum: ["ct"],
+          },
+        ],
+      },
+    },
+  },
+  uiSchema: {
+    states: {
+      "ui:enumDisabled": ["ct"],
+      "ui:widget": "radio",
+    },
+  },
+};
diff --git a/src/components/SpruceForm/Widgets/LeafyGreenWidgets.tsx b/src/components/SpruceForm/Widgets/LeafyGreenWidgets.tsx
index 11fb1f3e19..021d809bc1 100644
--- a/src/components/SpruceForm/Widgets/LeafyGreenWidgets.tsx
+++ b/src/components/SpruceForm/Widgets/LeafyGreenWidgets.tsx
@@ -1,3 +1,4 @@
+import { useEffect, useRef } from "react";
 import styled from "@emotion/styled";
 import Banner from "@leafygreen-ui/banner";
 import Checkbox from "@leafygreen-ui/checkbox";
@@ -7,6 +8,7 @@ import { Radio, RadioGroup } from "@leafygreen-ui/radio-group";
 import {
   SegmentedControl,
   SegmentedControlOption,
+  SegmentedControlProps,
 } from "@leafygreen-ui/segmented-control";
 import { Option, Select } from "@leafygreen-ui/select";
 import TextArea from "@leafygreen-ui/text-area";
@@ -232,11 +234,13 @@ export const LeafyGreenRadio: React.VFC<EnumSpruceWidgetProps> = ({
       >
         {enumOptions.map((o) => {
           const optionDisabled = enumDisabled?.includes(o.value) ?? false;
+          const { description } = o.schema ?? {};
           return (
             <Radio
               key={o.value}
               value={o.value}
               disabled={disabled || optionDisabled}
+              description={description}
             >
               {o.label}
             </Radio>
@@ -327,21 +331,39 @@ const StyledRadioBox = styled(RadioBox)`
 `;
 
 export const LeafyGreenTextArea: React.VFC<SpruceWidgetProps> = ({
-  label,
   disabled,
-  value,
+  label,
   onChange,
   options,
   rawErrors,
   readonly,
+  value,
 }) => {
-  const { "data-cy": dataCy, emptyValue = "", elementWrapperCSS } = options;
+  const {
+    "data-cy": dataCy,
+    elementWrapperCSS,
+    emptyValue = "",
+    focusOnMount,
+  } = options;
 
   const { errors, hasError } = processErrors(rawErrors);
+  const el = useRef<HTMLTextAreaElement>();
+
+  useEffect(() => {
+    if (focusOnMount) {
+      const textarea = el.current;
+      if (textarea) {
+        textarea.focus();
+        textarea.selectionStart = textarea.value.length;
+        textarea.selectionEnd = textarea.value.length;
+      }
+    }
+  }, [focusOnMount]);
 
   return (
     <ElementWrapper css={elementWrapperCSS}>
       <TextArea
+        ref={el}
         data-cy={dataCy}
         label={label}
         disabled={disabled || readonly}
@@ -370,6 +392,7 @@ export const LeafyGreenSegmentedControl: React.VFC<EnumSpruceWidgetProps> = ({
     enumDisabled,
     enumOptions,
     elementWrapperCSS,
+    sizeVariant,
   } = options;
 
   const isDisabled = disabled || readonly;
@@ -382,6 +405,7 @@ export const LeafyGreenSegmentedControl: React.VFC<EnumSpruceWidgetProps> = ({
         value={value}
         onChange={onChange}
         aria-controls={ariaControls?.join(" ")}
+        size={sizeVariant as SegmentedControlProps["size"]}
       >
         {enumOptions.map((o) => {
           const optionDisabled = enumDisabled?.includes(o.value) ?? false;
diff --git a/src/components/SpruceForm/Widgets/types.ts b/src/components/SpruceForm/Widgets/types.ts
index fc76d63dcc..c0748541e4 100644
--- a/src/components/SpruceForm/Widgets/types.ts
+++ b/src/components/SpruceForm/Widgets/types.ts
@@ -1,21 +1,24 @@
 import { SerializedStyles } from "@emotion/react";
 import { TextInputType } from "@leafygreen-ui/text-input";
 import { WidgetProps } from "@rjsf/core";
+import { SpruceFormProps } from "components/SpruceForm/types";
 
 export interface SpruceWidgetProps extends WidgetProps {
   options: Partial<{
     "aria-controls": string[];
     "data-cy": string;
     ariaLabelledBy: string;
+    customLabel: string;
     description: string;
     elementWrapperCSS: SerializedStyles;
     emptyValue: string | null;
     errors: string[];
+    focusOnMount: boolean;
+    inputType: TextInputType;
     showLabel: boolean;
+    sizeVariant: string;
     tooltipDescription: string;
-    inputType: TextInputType;
     warnings: string[];
-    customLabel: string;
   }>;
 }
 
@@ -23,6 +26,7 @@ export type EnumSpruceWidgetProps = {
   options: {
     enumDisabled: string[];
     enumOptions: Array<{
+      schema?: SpruceFormProps["schema"];
       label: string;
       value: string;
     }>;
diff --git a/src/components/SpruceForm/__snapshots__/SpruceForm.stories.storyshot b/src/components/SpruceForm/__snapshots__/SpruceForm.stories.storyshot
index 17d849226d..7f08df153f 100644
--- a/src/components/SpruceForm/__snapshots__/SpruceForm.stories.storyshot
+++ b/src/components/SpruceForm/__snapshots__/SpruceForm.stories.storyshot
@@ -4,7 +4,7 @@ exports[`storybook Storyshots components/SpruceForm Example 1 1`] = `
 <div>
   <div>
     <h3
-      class="css-1d9n1kx-SettingsCardTitle e1h7idos1 leafygreen-ui-376vw8"
+      class="css-18p6yz-SettingsCardTitle e1h7idos1 leafygreen-ui-feh85s"
     >
       Distro Projects
     </h3>
@@ -20,7 +20,7 @@ exports[`storybook Storyshots components/SpruceForm Example 1 1`] = `
           id=" root"
         >
           <fieldset
-            class="css-enw7dc-ObjectFieldTemplate"
+            class="css-0"
             id="root"
           >
             <div
@@ -28,7 +28,7 @@ exports[`storybook Storyshots components/SpruceForm Example 1 1`] = `
               id=" root_cloneMethod"
             >
               <div
-                class="css-1ik0alb-ElementWrapper-LeafyGreenSelect ee4bs9n0"
+                class="css-c1sqx6-ElementWrapper ee4bs9n0"
               >
                 <div
                   class="css-12pm1mq-MaxWidthContainer eevpusu0"
@@ -96,7 +96,7 @@ exports[`storybook Storyshots components/SpruceForm Example 1 1`] = `
               id=" root_expansions"
             >
               <h6
-                class="css-ho1tq1-StyledSubtitle e63qz861 leafygreen-ui-41zalo"
+                class="css-ho1tq1-StyledSubtitle e63qz861 leafygreen-ui-19p3n10"
                 id="root_expansions__title"
               >
                 Expansions
@@ -149,7 +149,7 @@ exports[`storybook Storyshots components/SpruceForm Example 1 1`] = `
                     id=" root_expansions_0"
                   >
                     <fieldset
-                      class="css-enw7dc-ObjectFieldTemplate"
+                      class="css-0"
                       id="root_expansions_0"
                     >
                       <div
@@ -157,7 +157,7 @@ exports[`storybook Storyshots components/SpruceForm Example 1 1`] = `
                         id=" root_expansions_0_key"
                       >
                         <div
-                          class="css-1kjj8dy-ElementWrapper-LeafyGreenTextInput ee4bs9n0"
+                          class="css-c1sqx6-ElementWrapper ee4bs9n0"
                         >
                           <div
                             class="css-12pm1mq-MaxWidthContainer eevpusu0"
@@ -169,7 +169,7 @@ exports[`storybook Storyshots components/SpruceForm Example 1 1`] = `
                                 class="leafygreen-ui-a533bt"
                               >
                                 <label
-                                  class="leafygreen-ui-1vn1hji leafygreen-ui-1k5mcru"
+                                  class="leafygreen-ui-gr5280"
                                   for="textinput-10"
                                 >
                                   key
@@ -201,7 +201,7 @@ exports[`storybook Storyshots components/SpruceForm Example 1 1`] = `
                         id=" root_expansions_0_value"
                       >
                         <div
-                          class="css-1kjj8dy-ElementWrapper-LeafyGreenTextInput ee4bs9n0"
+                          class="css-c1sqx6-ElementWrapper ee4bs9n0"
                         >
                           <div
                             class="css-12pm1mq-MaxWidthContainer eevpusu0"
@@ -213,7 +213,7 @@ exports[`storybook Storyshots components/SpruceForm Example 1 1`] = `
                                 class="leafygreen-ui-a533bt"
                               >
                                 <label
-                                  class="leafygreen-ui-1vn1hji leafygreen-ui-1k5mcru"
+                                  class="leafygreen-ui-gr5280"
                                   for="textinput-11"
                                 >
                                   value
@@ -285,7 +285,7 @@ exports[`storybook Storyshots components/SpruceForm Example 1 1`] = `
               id=" root_validProjects"
             >
               <div
-                class="css-odleto-ElementWrapper-LeafyGreenTextArea ee4bs9n0"
+                class="css-c1sqx6-ElementWrapper ee4bs9n0"
               >
                 <div
                   class="leafygreen-ui-1iyoj2o"
@@ -316,7 +316,7 @@ exports[`storybook Storyshots components/SpruceForm Example 2 1`] = `
 <div>
   <div>
     <h3
-      class="css-1d9n1kx-SettingsCardTitle e1h7idos1 leafygreen-ui-376vw8"
+      class="css-18p6yz-SettingsCardTitle e1h7idos1 leafygreen-ui-feh85s"
     >
       Admin Options
     </h3>
@@ -332,7 +332,7 @@ exports[`storybook Storyshots components/SpruceForm Example 2 1`] = `
           id=" root"
         >
           <fieldset
-            class="css-enw7dc-ObjectFieldTemplate"
+            class="css-0"
             id="root"
           >
             <div
@@ -340,7 +340,7 @@ exports[`storybook Storyshots components/SpruceForm Example 2 1`] = `
               id=" root_distroIsCluster"
             >
               <div
-                class="css-g4pjur-ElementWrapper-LeafyGreenCheckBox ee4bs9n0"
+                class="css-c1sqx6-ElementWrapper ee4bs9n0"
               >
                 <div
                   class="leafygreen-ui-55kazc"
@@ -397,7 +397,7 @@ exports[`storybook Storyshots components/SpruceForm Example 2 1`] = `
               id=" root_disableShallowClone"
             >
               <div
-                class="css-g4pjur-ElementWrapper-LeafyGreenCheckBox ee4bs9n0"
+                class="css-c1sqx6-ElementWrapper ee4bs9n0"
               >
                 <div
                   class="leafygreen-ui-55kazc"
@@ -454,7 +454,7 @@ exports[`storybook Storyshots components/SpruceForm Example 2 1`] = `
               id=" root_disableQueue"
             >
               <div
-                class="css-g4pjur-ElementWrapper-LeafyGreenCheckBox ee4bs9n0"
+                class="css-c1sqx6-ElementWrapper ee4bs9n0"
               >
                 <div
                   class="leafygreen-ui-55kazc"
@@ -511,7 +511,7 @@ exports[`storybook Storyshots components/SpruceForm Example 2 1`] = `
               id=" root_decommissionHosts"
             >
               <div
-                class="css-g4pjur-ElementWrapper-LeafyGreenCheckBox ee4bs9n0"
+                class="css-c1sqx6-ElementWrapper ee4bs9n0"
               >
                 <div
                   class="leafygreen-ui-55kazc"
@@ -569,7 +569,7 @@ exports[`storybook Storyshots components/SpruceForm Example 2 1`] = `
               id=" root_reprovisionMethod"
             >
               <div
-                class="css-kuac4f-ElementWrapper-LeafyGreenRadio ee4bs9n0"
+                class="css-c1sqx6-ElementWrapper ee4bs9n0"
               >
                 <div
                   aria-label="radio-group-1"
@@ -645,7 +645,7 @@ exports[`storybook Storyshots components/SpruceForm Example 3 1`] = `
 <div>
   <div>
     <h3
-      class="css-1d9n1kx-SettingsCardTitle e1h7idos1 leafygreen-ui-376vw8"
+      class="css-18p6yz-SettingsCardTitle e1h7idos1 leafygreen-ui-feh85s"
     >
       UI Options
     </h3>
@@ -661,7 +661,7 @@ exports[`storybook Storyshots components/SpruceForm Example 3 1`] = `
           id=" root"
         >
           <fieldset
-            class="css-enw7dc-ObjectFieldTemplate"
+            class="css-0"
             id="root"
           >
             <div
@@ -669,7 +669,7 @@ exports[`storybook Storyshots components/SpruceForm Example 3 1`] = `
               id=" root_visible"
             >
               <div
-                class="css-g4pjur-ElementWrapper-LeafyGreenCheckBox ee4bs9n0"
+                class="css-c1sqx6-ElementWrapper ee4bs9n0"
               >
                 <div
                   class="leafygreen-ui-55kazc"
diff --git a/src/components/Table/BaseTable.tsx b/src/components/Table/BaseTable.tsx
new file mode 100644
index 0000000000..08b28c7543
--- /dev/null
+++ b/src/components/Table/BaseTable.tsx
@@ -0,0 +1,51 @@
+import {
+  Cell,
+  ExpandedContent,
+  flexRender,
+  HeaderCell,
+  HeaderRow,
+  type LGRowData,
+  Row,
+  Table,
+  TableBody,
+  type TableProps,
+  TableHead,
+} from "@leafygreen-ui/table/new";
+
+type SpruceTableProps = {
+  "data-cy-row"?: string;
+  "data-cy-table"?: string;
+};
+
+export const BaseTable = <T extends LGRowData>({
+  "data-cy-row": dataCyRow,
+  "data-cy-table": dataCyTable,
+  table,
+  ...args
+}: SpruceTableProps & TableProps<T>) => (
+  <Table data-cy={dataCyTable} table={table} {...args}>
+    <TableHead>
+      {table.getHeaderGroups().map((headerGroup) => (
+        <HeaderRow key={headerGroup.id}>
+          {headerGroup.headers.map((header) => (
+            <HeaderCell key={header.id} header={header}>
+              {flexRender(header.column.columnDef.header, header.getContext())}
+            </HeaderCell>
+          ))}
+        </HeaderRow>
+      ))}
+    </TableHead>
+    <TableBody>
+      {table.getRowModel().rows.map((row) => (
+        <Row key={row.id} row={row} data-cy={dataCyRow}>
+          {row.getVisibleCells().map((cell) => (
+            <Cell key={cell.id}>
+              {flexRender(cell.column.columnDef.cell, cell.getContext())}
+            </Cell>
+          ))}
+          {row.original.renderExpandedContent && <ExpandedContent row={row} />}
+        </Row>
+      ))}
+    </TableBody>
+  </Table>
+);
diff --git a/src/components/Table/LGFilters.tsx b/src/components/Table/LGFilters.tsx
new file mode 100644
index 0000000000..28bfcff65d
--- /dev/null
+++ b/src/components/Table/LGFilters.tsx
@@ -0,0 +1,46 @@
+import { LeafyGreenTableRow } from "@leafygreen-ui/table/new";
+import { TableFilterPopover } from "components/TablePopover";
+import { TreeDataEntry } from "components/TreeSelect";
+
+type TreeSelectFilterProps = {
+  "data-cy"?: string;
+  tData: TreeDataEntry[];
+  title: React.ReactNode;
+};
+
+export const getColumnTreeSelectFilterProps = ({
+  "data-cy": dataCy,
+  tData,
+  title,
+}: TreeSelectFilterProps) => ({
+  header: ({ column }) => {
+    // Only present options that appear in the table
+    const options = tData.filter(
+      ({ value }) => !!column.getFacetedUniqueValues().get(value)
+    );
+    return (
+      <>
+        {title}
+        <TableFilterPopover
+          value={column?.getFilterValue() ?? []}
+          options={options}
+          onConfirm={(value) => {
+            column.setFilterValue(value);
+          }}
+          data-cy={dataCy}
+        />
+      </>
+    );
+  },
+  filterFn: (
+    row: LeafyGreenTableRow<any>,
+    columnId: string,
+    filterValue: string[]
+  ) => {
+    // If no filter is specified, show all rows
+    if (!filterValue.length) {
+      return true;
+    }
+    return filterValue.includes(row.getValue(columnId));
+  },
+});
diff --git a/src/components/Table/TableControl/__snapshots__/TableControl.stories.storyshot b/src/components/Table/TableControl/__snapshots__/TableControl.stories.storyshot
index 678270c609..c7ecd64134 100644
--- a/src/components/Table/TableControl/__snapshots__/TableControl.stories.storyshot
+++ b/src/components/Table/TableControl/__snapshots__/TableControl.stories.storyshot
@@ -9,7 +9,7 @@ exports[`storybook Storyshots components/Table/TableControl Default 1`] = `
       class="css-1mx1jed-FlexContainer et5phr01"
     >
       <p
-        class="leafygreen-ui-1yli3c0"
+        class="leafygreen-ui-1tb6tuo"
       >
         <span
           data-cy="filtered-count"
@@ -85,7 +85,7 @@ exports[`storybook Storyshots components/Table/TableControl Default 1`] = `
           class="css-ob08n2-PageLabel e4w46hm1"
         >
           <small
-            class="leafygreen-ui-ppjyot"
+            class="leafygreen-ui-6flbwy"
           >
             1
              / 
diff --git a/src/components/TaskStatusIconLegend/__snapshots__/TaskStatusIconLegend.stories.storyshot b/src/components/TaskStatusIconLegend/__snapshots__/TaskStatusIconLegend.stories.storyshot
index 29fcbfddba..2824164269 100644
--- a/src/components/TaskStatusIconLegend/__snapshots__/TaskStatusIconLegend.stories.storyshot
+++ b/src/components/TaskStatusIconLegend/__snapshots__/TaskStatusIconLegend.stories.storyshot
@@ -29,7 +29,7 @@ exports[`storybook Storyshots components/TaskStatusIconLegend Legend Only 1`] =
         class="css-wx7pa1-LabelContainer e1yp16pl2"
       >
         <small
-          class="leafygreen-ui-ppjyot"
+          class="leafygreen-ui-6flbwy"
         >
           Succeeded
         </small>
@@ -54,7 +54,7 @@ exports[`storybook Storyshots components/TaskStatusIconLegend Legend Only 1`] =
         class="css-wx7pa1-LabelContainer e1yp16pl2"
       >
         <small
-          class="leafygreen-ui-ppjyot"
+          class="leafygreen-ui-6flbwy"
         >
           Failed
         </small>
@@ -80,7 +80,7 @@ exports[`storybook Storyshots components/TaskStatusIconLegend Legend Only 1`] =
         class="css-wx7pa1-LabelContainer e1yp16pl2"
       >
         <small
-          class="leafygreen-ui-ppjyot"
+          class="leafygreen-ui-6flbwy"
         >
           Known Issue
         </small>
@@ -117,7 +117,7 @@ exports[`storybook Storyshots components/TaskStatusIconLegend Legend Only 1`] =
         class="css-wx7pa1-LabelContainer e1yp16pl2"
       >
         <small
-          class="leafygreen-ui-ppjyot"
+          class="leafygreen-ui-6flbwy"
         >
           Setup Failed
         </small>
@@ -146,12 +146,12 @@ exports[`storybook Storyshots components/TaskStatusIconLegend Legend Only 1`] =
         class="css-wx7pa1-LabelContainer e1yp16pl2"
       >
         <small
-          class="leafygreen-ui-ppjyot"
+          class="leafygreen-ui-6flbwy"
         >
           Test Timed Out
         </small>
         <small
-          class="leafygreen-ui-ppjyot"
+          class="leafygreen-ui-6flbwy"
         >
           Task Timed Out
         </small>
@@ -179,12 +179,12 @@ exports[`storybook Storyshots components/TaskStatusIconLegend Legend Only 1`] =
         class="css-wx7pa1-LabelContainer e1yp16pl2"
       >
         <small
-          class="leafygreen-ui-ppjyot"
+          class="leafygreen-ui-6flbwy"
         >
           Dispatched
         </small>
         <small
-          class="leafygreen-ui-ppjyot"
+          class="leafygreen-ui-6flbwy"
         >
           Running
         </small>
@@ -214,17 +214,17 @@ exports[`storybook Storyshots components/TaskStatusIconLegend Legend Only 1`] =
         class="css-wx7pa1-LabelContainer e1yp16pl2"
       >
         <small
-          class="leafygreen-ui-ppjyot"
+          class="leafygreen-ui-6flbwy"
         >
           Will Run
         </small>
         <small
-          class="leafygreen-ui-ppjyot"
+          class="leafygreen-ui-6flbwy"
         >
           Pending
         </small>
         <small
-          class="leafygreen-ui-ppjyot"
+          class="leafygreen-ui-6flbwy"
         >
           Unstarted
         </small>
@@ -254,17 +254,17 @@ exports[`storybook Storyshots components/TaskStatusIconLegend Legend Only 1`] =
         class="css-wx7pa1-LabelContainer e1yp16pl2"
       >
         <small
-          class="leafygreen-ui-ppjyot"
+          class="leafygreen-ui-6flbwy"
         >
           System Unresponsive
         </small>
         <small
-          class="leafygreen-ui-ppjyot"
+          class="leafygreen-ui-6flbwy"
         >
           System Timed Out
         </small>
         <small
-          class="leafygreen-ui-ppjyot"
+          class="leafygreen-ui-6flbwy"
         >
           System Failed
         </small>
@@ -301,27 +301,27 @@ exports[`storybook Storyshots components/TaskStatusIconLegend Legend Only 1`] =
         class="css-wx7pa1-LabelContainer e1yp16pl2"
       >
         <small
-          class="leafygreen-ui-ppjyot"
+          class="leafygreen-ui-6flbwy"
         >
           Aborted
         </small>
         <small
-          class="leafygreen-ui-ppjyot"
+          class="leafygreen-ui-6flbwy"
         >
           Blocked
         </small>
         <small
-          class="leafygreen-ui-ppjyot"
+          class="leafygreen-ui-6flbwy"
         >
           Unscheduled
         </small>
         <small
-          class="leafygreen-ui-ppjyot"
+          class="leafygreen-ui-6flbwy"
         >
           Inactive
         </small>
         <small
-          class="leafygreen-ui-ppjyot"
+          class="leafygreen-ui-6flbwy"
         >
           Undispatched
         </small>
diff --git a/src/components/TasksTable/__snapshots__/TasksTable.stories.storyshot b/src/components/TasksTable/__snapshots__/TasksTable.stories.storyshot
index a6cc4a0253..a9be30edf8 100644
--- a/src/components/TasksTable/__snapshots__/TasksTable.stories.storyshot
+++ b/src/components/TasksTable/__snapshots__/TasksTable.stories.storyshot
@@ -102,7 +102,7 @@ exports[`storybook Storyshots components/TasksTable Base Task Table 1`] = `
                         <span
                           class="ant-table-column-title"
                         >
-                          Patch Status
+                          Task Status
                         </span>
                         <span
                           class="ant-table-column-sorter ant-table-column-sorter-full"
@@ -283,7 +283,7 @@ exports[`storybook Storyshots components/TasksTable Base Task Table 1`] = `
                       class="ant-table-cell cy-task-table-col-NAME"
                     >
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/task/some_id"
                       >
                         <span
@@ -325,7 +325,7 @@ exports[`storybook Storyshots components/TasksTable Base Task Table 1`] = `
                       class="ant-table-cell cy-task-table-col-VARIANT"
                     >
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/variant-history/undefined/ubuntu1604"
                       >
                         <span
@@ -344,7 +344,7 @@ exports[`storybook Storyshots components/TasksTable Base Task Table 1`] = `
                       class="ant-table-cell cy-task-table-col-NAME"
                     >
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/task/some_id_2"
                       >
                         <span
@@ -386,7 +386,7 @@ exports[`storybook Storyshots components/TasksTable Base Task Table 1`] = `
                       class="ant-table-cell cy-task-table-col-VARIANT"
                     >
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/variant-history/undefined/ubuntu1604"
                       >
                         <span
@@ -405,7 +405,7 @@ exports[`storybook Storyshots components/TasksTable Base Task Table 1`] = `
                       class="ant-table-cell cy-task-table-col-NAME"
                     >
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/task/some_id_3"
                       >
                         <span
@@ -447,7 +447,7 @@ exports[`storybook Storyshots components/TasksTable Base Task Table 1`] = `
                       class="ant-table-cell cy-task-table-col-VARIANT"
                     >
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/variant-history/undefined/Windows"
                       >
                         <span
@@ -571,7 +571,7 @@ exports[`storybook Storyshots components/TasksTable Execution Tasks Table 1`] =
                         <span
                           class="ant-table-column-title"
                         >
-                          Patch Status
+                          Task Status
                         </span>
                         <span
                           class="ant-table-column-sorter ant-table-column-sorter-full"
@@ -761,7 +761,7 @@ exports[`storybook Storyshots components/TasksTable Execution Tasks Table 1`] =
                         type="button"
                       />
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/task/some_id"
                       >
                         <span
@@ -803,7 +803,7 @@ exports[`storybook Storyshots components/TasksTable Execution Tasks Table 1`] =
                       class="ant-table-cell cy-task-table-col-VARIANT"
                     >
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/variant-history/undefined/ubuntu1604"
                       >
                         <span
@@ -831,7 +831,7 @@ exports[`storybook Storyshots components/TasksTable Execution Tasks Table 1`] =
                         type="button"
                       />
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/task/some_id_2"
                       >
                         <span
@@ -873,7 +873,7 @@ exports[`storybook Storyshots components/TasksTable Execution Tasks Table 1`] =
                       class="ant-table-cell cy-task-table-col-VARIANT"
                     >
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/variant-history/undefined/ubuntu1604"
                       >
                         <span
@@ -901,7 +901,7 @@ exports[`storybook Storyshots components/TasksTable Execution Tasks Table 1`] =
                         type="button"
                       />
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/task/some_id_3"
                       >
                         <span
@@ -943,7 +943,7 @@ exports[`storybook Storyshots components/TasksTable Execution Tasks Table 1`] =
                       class="ant-table-cell cy-task-table-col-VARIANT"
                     >
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/variant-history/undefined/Windows"
                       >
                         <span
@@ -971,7 +971,7 @@ exports[`storybook Storyshots components/TasksTable Execution Tasks Table 1`] =
                         type="button"
                       />
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/task/some_id_4"
                       >
                         <span
@@ -1013,7 +1013,7 @@ exports[`storybook Storyshots components/TasksTable Execution Tasks Table 1`] =
                       class="ant-table-cell cy-task-table-col-VARIANT"
                     >
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/variant-history/undefined/Windows"
                       >
                         <span
@@ -1137,7 +1137,7 @@ exports[`storybook Storyshots components/TasksTable Version Tasks Table 1`] = `
                         <span
                           class="ant-table-column-title"
                         >
-                          Version Status
+                          Task Status
                         </span>
                         <span
                           class="ant-table-column-sorter ant-table-column-sorter-full"
@@ -1318,7 +1318,7 @@ exports[`storybook Storyshots components/TasksTable Version Tasks Table 1`] = `
                       class="ant-table-cell cy-task-table-col-NAME"
                     >
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/task/some_id"
                       >
                         <span
@@ -1360,7 +1360,7 @@ exports[`storybook Storyshots components/TasksTable Version Tasks Table 1`] = `
                       class="ant-table-cell cy-task-table-col-VARIANT"
                     >
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/variant-history/undefined/ubuntu1604"
                       >
                         <span
@@ -1379,7 +1379,7 @@ exports[`storybook Storyshots components/TasksTable Version Tasks Table 1`] = `
                       class="ant-table-cell cy-task-table-col-NAME"
                     >
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/task/some_id_2"
                       >
                         <span
@@ -1421,7 +1421,7 @@ exports[`storybook Storyshots components/TasksTable Version Tasks Table 1`] = `
                       class="ant-table-cell cy-task-table-col-VARIANT"
                     >
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/variant-history/undefined/ubuntu1604"
                       >
                         <span
@@ -1440,7 +1440,7 @@ exports[`storybook Storyshots components/TasksTable Version Tasks Table 1`] = `
                       class="ant-table-cell cy-task-table-col-NAME"
                     >
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/task/some_id_3"
                       >
                         <span
@@ -1482,7 +1482,7 @@ exports[`storybook Storyshots components/TasksTable Version Tasks Table 1`] = `
                       class="ant-table-cell cy-task-table-col-VARIANT"
                     >
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/variant-history/undefined/Windows"
                       >
                         <span
diff --git a/src/components/TasksTable/index.tsx b/src/components/TasksTable/index.tsx
index 740bb5b2a9..1c79250f83 100644
--- a/src/components/TasksTable/index.tsx
+++ b/src/components/TasksTable/index.tsx
@@ -159,7 +159,7 @@ const getColumnDefs = ({
       })),
   },
   {
-    title: `${isPatch ? "Patch" : "Version"} Status`,
+    title: "Task Status",
     dataIndex: "status",
     key: TaskSortCategory.Status,
     onHeaderCell: () => ({
diff --git a/src/components/TextInputWithGlyph/__snapshots__/TextInputWithGlyph.stories.storyshot b/src/components/TextInputWithGlyph/__snapshots__/TextInputWithGlyph.stories.storyshot
index 32ac884a51..42bd8d89b9 100644
--- a/src/components/TextInputWithGlyph/__snapshots__/TextInputWithGlyph.stories.storyshot
+++ b/src/components/TextInputWithGlyph/__snapshots__/TextInputWithGlyph.stories.storyshot
@@ -12,7 +12,7 @@ exports[`storybook Storyshots components/TextInputWithGlyph Default 1`] = `
         class="leafygreen-ui-a533bt"
       >
         <label
-          class="leafygreen-ui-1vn1hji leafygreen-ui-1k5mcru"
+          class="leafygreen-ui-gr5280"
           for="textinput-12"
         >
           Some search field
diff --git a/src/components/TreeSelect/TreeSelect.tsx b/src/components/TreeSelect/TreeSelect.tsx
index b641e5706b..1f98db242d 100644
--- a/src/components/TreeSelect/TreeSelect.tsx
+++ b/src/components/TreeSelect/TreeSelect.tsx
@@ -136,12 +136,11 @@ const renderCheckboxesHelper = ({
   state: string[];
   tData: TreeDataEntry[];
 }): void => {
-  const ParentCheckboxWrapper = getCheckboxWrapper(0);
   // push parent
   const onChangeFn = (): void =>
     handleOnChange({ state, value: data.value, onChange, tData });
   rows.push(
-    <ParentCheckboxWrapper key={data.key}>
+    <CheckboxWrapper key={data.key} level={0} isAll={data.value === ALL_VALUE}>
       <Checkbox
         className="cy-checkbox"
         onChange={onChangeFn}
@@ -150,16 +149,19 @@ const renderCheckboxesHelper = ({
         bold={false}
         data-cy="checkbox"
       />
-    </ParentCheckboxWrapper>
+    </CheckboxWrapper>
   );
   // then examine children
-  const ChildCheckboxWrapper = getCheckboxWrapper(1);
   if (data.children) {
     data.children.forEach((child) => {
       const onChangeChildFn = (): void =>
         handleOnChange({ state, value: child.value, onChange, tData });
       rows.push(
-        <ChildCheckboxWrapper key={`${data.key}-${child.key}`}>
+        <CheckboxWrapper
+          key={`${data.key}-${child.key}`}
+          level={1}
+          isAll={child.value === ALL_VALUE}
+        >
           <Checkbox
             className="cy-checkbox"
             onChange={onChangeChildFn}
@@ -168,7 +170,7 @@ const renderCheckboxesHelper = ({
             bold={false}
             data-cy="checkbox"
           />
-        </ChildCheckboxWrapper>
+        </CheckboxWrapper>
       );
     });
   }
@@ -317,15 +319,11 @@ const getAllValues = (tData: TreeDataEntry[]): string[] =>
     return accum.concat([currNode.value]).concat(childrenValues);
   }, []);
 
-const getCheckboxWrapper = (
-  level: number
-): React.VFC<{ children: React.ReactNode }> => styled.div`
-  padding-left: ${level}em;
+const CheckboxWrapper = styled.div<{ level: number; isAll: boolean }>`
+  padding-left: ${({ level }) => `${level}em`};
   padding-top: ${size.xxs};
   padding-bottom: ${size.xxs};
-  :first-of-type {
-    border-bottom: 1px solid ${gray.light2};
-  }
+  ${({ isAll }) => isAll && `border-bottom: 1px solid ${gray.light2};`}
 `;
 
 const OptionsWrapper = styled.div`
diff --git a/src/components/TreeSelect/__snapshots__/TreeSelect.stories.storyshot b/src/components/TreeSelect/__snapshots__/TreeSelect.stories.storyshot
index 229bea5faf..dd8a5050fd 100644
--- a/src/components/TreeSelect/__snapshots__/TreeSelect.stories.storyshot
+++ b/src/components/TreeSelect/__snapshots__/TreeSelect.stories.storyshot
@@ -7,7 +7,7 @@ exports[`storybook Storyshots components/TreeSelect Default 1`] = `
     data-cy="tree-select-options"
   >
     <div
-      class="css-u0wfkk-getCheckboxWrapper e1mpj03z3"
+      class="css-j2ntgf-CheckboxWrapper e1mpj03z3"
     >
       <div
         class="leafygreen-ui-55kazc cy-checkbox"
@@ -60,7 +60,7 @@ exports[`storybook Storyshots components/TreeSelect Default 1`] = `
       </div>
     </div>
     <div
-      class="css-u0wfkk-getCheckboxWrapper e1mpj03z3"
+      class="css-6y9iv7-CheckboxWrapper e1mpj03z3"
     >
       <div
         class="leafygreen-ui-55kazc cy-checkbox"
@@ -113,7 +113,7 @@ exports[`storybook Storyshots components/TreeSelect Default 1`] = `
       </div>
     </div>
     <div
-      class="css-1i6181l-getCheckboxWrapper e1mpj03z3"
+      class="css-154o89o-CheckboxWrapper e1mpj03z3"
     >
       <div
         class="leafygreen-ui-55kazc cy-checkbox"
@@ -166,7 +166,7 @@ exports[`storybook Storyshots components/TreeSelect Default 1`] = `
       </div>
     </div>
     <div
-      class="css-1i6181l-getCheckboxWrapper e1mpj03z3"
+      class="css-154o89o-CheckboxWrapper e1mpj03z3"
     >
       <div
         class="leafygreen-ui-55kazc cy-checkbox"
@@ -219,7 +219,7 @@ exports[`storybook Storyshots components/TreeSelect Default 1`] = `
       </div>
     </div>
     <div
-      class="css-1i6181l-getCheckboxWrapper e1mpj03z3"
+      class="css-154o89o-CheckboxWrapper e1mpj03z3"
     >
       <div
         class="leafygreen-ui-55kazc cy-checkbox"
@@ -272,7 +272,7 @@ exports[`storybook Storyshots components/TreeSelect Default 1`] = `
       </div>
     </div>
     <div
-      class="css-u0wfkk-getCheckboxWrapper e1mpj03z3"
+      class="css-6y9iv7-CheckboxWrapper e1mpj03z3"
     >
       <div
         class="leafygreen-ui-55kazc cy-checkbox"
@@ -325,7 +325,7 @@ exports[`storybook Storyshots components/TreeSelect Default 1`] = `
       </div>
     </div>
     <div
-      class="css-u0wfkk-getCheckboxWrapper e1mpj03z3"
+      class="css-6y9iv7-CheckboxWrapper e1mpj03z3"
     >
       <div
         class="leafygreen-ui-55kazc cy-checkbox"
@@ -378,7 +378,7 @@ exports[`storybook Storyshots components/TreeSelect Default 1`] = `
       </div>
     </div>
     <div
-      class="css-u0wfkk-getCheckboxWrapper e1mpj03z3"
+      class="css-6y9iv7-CheckboxWrapper e1mpj03z3"
     >
       <div
         class="leafygreen-ui-55kazc cy-checkbox"
@@ -431,7 +431,7 @@ exports[`storybook Storyshots components/TreeSelect Default 1`] = `
       </div>
     </div>
     <div
-      class="css-u0wfkk-getCheckboxWrapper e1mpj03z3"
+      class="css-6y9iv7-CheckboxWrapper e1mpj03z3"
     >
       <div
         class="leafygreen-ui-55kazc cy-checkbox"
@@ -511,7 +511,7 @@ exports[`storybook Storyshots components/TreeSelect With Dropdown 1`] = `
             class="css-soeq2u-LabelWrapper e1yw4j303"
           >
             <p
-              class="css-197mxpc-OverflowBody e1yw4j300 leafygreen-ui-1yli3c0"
+              class="css-197mxpc-OverflowBody e1yw4j300 leafygreen-ui-1tb6tuo"
               data-cy="dropdown-value"
             >
               Select
diff --git a/src/components/TupleSelect/__snapshots__/TupleSelect.stories.storyshot b/src/components/TupleSelect/__snapshots__/TupleSelect.stories.storyshot
index 1206fe1bf6..b6a1f543e0 100644
--- a/src/components/TupleSelect/__snapshots__/TupleSelect.stories.storyshot
+++ b/src/components/TupleSelect/__snapshots__/TupleSelect.stories.storyshot
@@ -6,7 +6,7 @@ exports[`storybook Storyshots components/TupleSelect Default 1`] = `
     class="css-1ry038z-Container e5gn9hl4"
   >
     <label
-      class="leafygreen-ui-1k5mcru"
+      class="leafygreen-ui-1fi5x3a"
       for="filter-input"
     >
       <div
@@ -128,7 +128,7 @@ exports[`storybook Storyshots components/TupleSelect Default 1`] = `
     </div>
   </div>
   <small
-    class="leafygreen-ui-ppjyot"
+    class="leafygreen-ui-6flbwy"
   >
     The word \`bad\` will fail validation
   </small>
diff --git a/src/components/TupleSelectWithRegexConditional/__snapshots__/TupleSelectWithRegexConditional.stories.storyshot b/src/components/TupleSelectWithRegexConditional/__snapshots__/TupleSelectWithRegexConditional.stories.storyshot
index 1bd9c90aef..408ac7ed26 100644
--- a/src/components/TupleSelectWithRegexConditional/__snapshots__/TupleSelectWithRegexConditional.stories.storyshot
+++ b/src/components/TupleSelectWithRegexConditional/__snapshots__/TupleSelectWithRegexConditional.stories.storyshot
@@ -6,7 +6,7 @@ exports[`storybook Storyshots Components/TupleSelect With Conditional 1`] = `
     class="css-1ry038z-Container e5gn9hl4"
   >
     <label
-      class="leafygreen-ui-1k5mcru"
+      class="leafygreen-ui-1fi5x3a"
       for="filter-input"
     >
       <div
@@ -207,7 +207,7 @@ exports[`storybook Storyshots Components/TupleSelect With Conditional 1`] = `
     </div>
   </div>
   <small
-    class="leafygreen-ui-ppjyot"
+    class="leafygreen-ui-6flbwy"
   >
     The word \`bad\` will fail validation
   </small>
diff --git a/src/components/VersionRestartModal/VersionRestartModal.tsx b/src/components/VersionRestartModal/VersionRestartModal.tsx
index 9de3cc8cfe..7ff1aa869e 100644
--- a/src/components/VersionRestartModal/VersionRestartModal.tsx
+++ b/src/components/VersionRestartModal/VersionRestartModal.tsx
@@ -3,7 +3,7 @@ import { useQuery, useMutation } from "@apollo/client";
 import styled from "@emotion/styled";
 import Checkbox from "@leafygreen-ui/checkbox";
 import { palette } from "@leafygreen-ui/palette";
-import { Body } from "@leafygreen-ui/typography";
+import { Body, BodyProps } from "@leafygreen-ui/typography";
 import { Skeleton } from "antd";
 import { useVersionAnalytics } from "analytics";
 import { Accordion } from "components/Accordion";
@@ -255,7 +255,7 @@ const getTaskIds = (selectedTasks: versionSelectedTasks) =>
     taskIds: selectedArray(tasks),
   }));
 
-const ConfirmationMessage = styled(Body)`
+const ConfirmationMessage = styled(Body)<BodyProps>`
   padding-top: ${size.s};
   padding-bottom: ${size.s};
 `;
diff --git a/src/components/WelcomeModal/CarouselCard.tsx b/src/components/WelcomeModal/CarouselCard.tsx
index 3bd46fffe1..65a71a9fbc 100644
--- a/src/components/WelcomeModal/CarouselCard.tsx
+++ b/src/components/WelcomeModal/CarouselCard.tsx
@@ -1,7 +1,7 @@
 import { useRef, useEffect } from "react";
 import { css } from "@emotion/react";
 import styled from "@emotion/styled";
-import { Body, Subtitle } from "@leafygreen-ui/typography";
+import { Body, BodyProps, Subtitle } from "@leafygreen-ui/typography";
 import { size } from "constants/tokens";
 import { CardType } from "./types";
 
@@ -28,7 +28,6 @@ const CarouselCard: React.VFC<CarouselCardProps> = ({ card, visible }) => {
   }, [visible]);
   return (
     <CardContainer>
-      {/* @ts-expect-error */}
       {title && <StyledTitle>{title}</StyledTitle>}
       {subtitle && <StyledBody weight="medium">{subtitle}</StyledBody>}
       <Body>{description}</Body>
@@ -75,12 +74,12 @@ const CardContainer = styled.div`
   cursor: default;
 `;
 
-const StyledBody = styled(Body)`
+const StyledBody = styled(Body)<BodyProps>`
   margin-bottom: ${size.s};
 `;
 
-// @ts-expect-error
 const StyledTitle = styled(Subtitle)`
   margin-bottom: ${size.s};
 `;
+
 export default CarouselCard;
diff --git a/src/components/WelcomeModal/WelcomeModal.tsx b/src/components/WelcomeModal/WelcomeModal.tsx
index 4c5ec46985..d72a96aac5 100644
--- a/src/components/WelcomeModal/WelcomeModal.tsx
+++ b/src/components/WelcomeModal/WelcomeModal.tsx
@@ -82,7 +82,6 @@ const WelcomeModal: React.VFC<WelcomeModalProps> = ({
           size="large"
           initialFocus=".slick-active"
         >
-          {/* @ts-expect-error */}
           {title && <CardTitle>{title}</CardTitle>}
           <Carousel
             dots={false}
@@ -134,7 +133,6 @@ const StyledLink = styled(Link)`
   margin-right: ${size.s};
 `;
 
-// @ts-expect-error
 const CardTitle = styled(Subtitle)`
   display: flex;
   justify-content: center;
diff --git a/src/components/styles/Layout.tsx b/src/components/styles/Layout.tsx
index c63c2fda71..2f946e797c 100644
--- a/src/components/styles/Layout.tsx
+++ b/src/components/styles/Layout.tsx
@@ -44,10 +44,9 @@ export const PageContent = styled(Content)`
 
 PageSider.defaultProps = { width: 275 };
 
-// @ts-expect-error
 export const PageTitle = styled(H2)`
   margin-bottom: ${size.s};
-` as typeof H2;
+`;
 
 export const TableControlInnerRow = styled.div`
   display: flex;
diff --git a/src/components/styles/Popover.tsx b/src/components/styles/Popover.tsx
index 7836f21149..6a28dc6d8d 100644
--- a/src/components/styles/Popover.tsx
+++ b/src/components/styles/Popover.tsx
@@ -5,9 +5,10 @@ import { size } from "constants/tokens";
 const { white, gray } = palette;
 
 export const PopoverContainer = styled.div`
+  background-color: ${white};
+  border-radius: ${size.s};
+  box-shadow: 0px 2px 4px -1px ${gray.base};
   display: flex;
   flex-direction: column;
-  background-color: ${white};
   padding: ${size.s};
-  box-shadow: 0px 2px 4px -1px ${gray.base};
 `;
diff --git a/src/components/styles/StyledLink.tsx b/src/components/styles/StyledLink.tsx
index 35e6c699d4..25b1cd7292 100644
--- a/src/components/styles/StyledLink.tsx
+++ b/src/components/styles/StyledLink.tsx
@@ -1,4 +1,5 @@
 import { css } from "@emotion/react";
+import styled from "@emotion/styled";
 import { Link as LGLink } from "@leafygreen-ui/typography";
 import { Link } from "react-router-dom";
 
@@ -20,3 +21,13 @@ export const StyledLink = (props) => (
 );
 
 export const StyledRouterLink = (props) => <StyledLink as={Link} {...props} />;
+
+export const ShortenedRouterLink = styled(StyledRouterLink)<{
+  width?: number;
+}>`
+  span {
+    max-width: ${({ width }) => `${width ?? 200}px`};
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+`;
diff --git a/src/components/styles/index.ts b/src/components/styles/index.ts
index 8a519fa509..8584e6f44a 100644
--- a/src/components/styles/index.ts
+++ b/src/components/styles/index.ts
@@ -16,10 +16,15 @@ import {
 } from "./Layout";
 import { SideNav, SideNavGroup, SideNavItem } from "./SideNav";
 import { SiderCard } from "./SiderCard";
-import { StyledLink, StyledRouterLink } from "./StyledLink";
+import {
+  ShortenedRouterLink,
+  StyledLink,
+  StyledRouterLink,
+} from "./StyledLink";
 import { WordBreak, wordBreakCss } from "./Typography";
 
 export {
+  ShortenedRouterLink,
   Divider,
   ErrorMessage,
   FiltersWrapper,
diff --git a/src/constants/triggers.ts b/src/constants/triggers.ts
index 1f51533327..01f25270fe 100644
--- a/src/constants/triggers.ts
+++ b/src/constants/triggers.ts
@@ -1,3 +1,5 @@
+import { TreeDataEntry } from "components/TreeSelect";
+import { NotificationMethods } from "types/subscription";
 import {
   ExtraField,
   ExtraFieldKey,
@@ -379,7 +381,15 @@ export const waterfallTriggers: Trigger = {
 };
 
 export const invalidProjectTriggerSubscriptionCombinations = {
-  "jira-comment": [
+  [NotificationMethods.JIRA_COMMENT]: [
+    ProjectTriggers.FIRST_FAILURE_TASK,
+    ProjectTriggers.ANY_TASK_FAILS,
+    ProjectTriggers.ANY_TASK_FINISHES,
+    ProjectTriggers.PREVIOUS_PASSING_TASK_FAILS,
+    ProjectTriggers.PREVIOUS_PASSING_TEST_FAILS,
+    ProjectTriggers.SUCCESSFUL_TASK_RUNTIME_CHANGES,
+  ],
+  [NotificationMethods.JIRA_ISSUE]: [
     ProjectTriggers.FIRST_FAILURE_TASK,
     ProjectTriggers.ANY_TASK_FAILS,
     ProjectTriggers.ANY_TASK_FINISHES,
@@ -389,6 +399,47 @@ export const invalidProjectTriggerSubscriptionCombinations = {
   ],
 };
 
+export const triggerToCopy = {
+  [TriggerType.OUTCOME]: "Outcome",
+  [TriggerType.FAILURE]: "Failure",
+  [TriggerType.SUCCESS]: "Success",
+  [TriggerType.FAMILY_OUTCOME]: "Outcome",
+  [TriggerType.FAMILY_FAILURE]: "Failure",
+  [TriggerType.FAMILY_SUCCESS]: "Success",
+  [TriggerType.RUNTIME_CHANGE]: "Runtime changes by %",
+  [TriggerType.EXCEEDS_DURATION]: "Runtime exceeds duration",
+  [TriggerType.TASK_STARTED]: "Task started",
+  [TriggerType.TASK_FAILED_OR_BLOCKED]: "Task failed or blocked",
+  [TriggerType.REGRESSION]: "Regression",
+  [TriggerType.TEST_REGRESSION]: "Test regression",
+  [TriggerType.FIRST_FAILURE_BUILD]: "First failure",
+  [TriggerType.FIRST_FAILURE_BUILD]: "First failure in build",
+  [TriggerType.FIRST_FAILURE_VERSION]: "First failure in version",
+  [TriggerType.FIRST_FAILURE_VERSION_NAME]:
+    "First failure in version with name",
+};
+
+export const convertFamilyTrigger = (trigger: string) => {
+  switch (trigger) {
+    case TriggerType.FAMILY_OUTCOME:
+      return TriggerType.OUTCOME;
+    case TriggerType.FAMILY_FAILURE:
+      return TriggerType.FAILURE;
+    case TriggerType.FAMILY_SUCCESS:
+      return TriggerType.SUCCESS;
+    default:
+      return trigger;
+  }
+};
+
+export const triggerTreeData: TreeDataEntry[] = Object.entries(
+  triggerToCopy
+).map(([key, value]) => ({
+  title: value,
+  value: key,
+  key,
+}));
+
 export const allowedSelectors = new Set([
   "object",
   "id",
@@ -401,3 +452,20 @@ export const allowedSelectors = new Set([
   "in-version",
   "in-build",
 ]);
+
+export const resourceTypeToCopy = {
+  [ResourceType.Build]: "Build",
+  [ResourceType.CommitQueue]: "Commit Queue",
+  [ResourceType.Host]: "Host",
+  [ResourceType.Patch]: "Patch",
+  [ResourceType.Task]: "Task",
+  [ResourceType.Version]: "Version",
+};
+
+export const resourceTypeTreeData: TreeDataEntry[] = Object.entries(
+  resourceTypeToCopy
+).map(([key, value]) => ({
+  title: value,
+  value: key,
+  key,
+}));
diff --git a/src/gql/fragments/projectSettings/index.graphql b/src/gql/fragments/projectSettings/index.graphql
index f946cc18d9..a0d47c57d3 100644
--- a/src/gql/fragments/projectSettings/index.graphql
+++ b/src/gql/fragments/projectSettings/index.graphql
@@ -10,6 +10,7 @@
 #import "./projectTriggers.graphql"
 #import "./periodicBuilds.graphql"
 #import "./containers.graphql"
+#import "./viewsAndFilters.graphql"
 
 fragment ProjectSettingsFields on ProjectSettings {
   aliases {
@@ -27,6 +28,7 @@ fragment ProjectSettingsFields on ProjectSettings {
     ...ProjectPeriodicBuildsSettings
     ...ProjectPluginsSettings
     ...ProjectTriggersSettings
+    ...ProjectViewsAndFiltersSettings
     ...ProjectVirtualWorkstationSettings
     repoRefId
   }
diff --git a/src/gql/fragments/projectSettings/periodicBuilds.graphql b/src/gql/fragments/projectSettings/periodicBuilds.graphql
index a2edef7736..48527afd15 100644
--- a/src/gql/fragments/projectSettings/periodicBuilds.graphql
+++ b/src/gql/fragments/projectSettings/periodicBuilds.graphql
@@ -2,6 +2,7 @@ fragment ProjectPeriodicBuildsSettings on Project {
   periodicBuilds {
     alias
     configFile
+    cron
     id
     intervalHours
     message
@@ -13,6 +14,7 @@ fragment RepoPeriodicBuildsSettings on RepoRef {
   periodicBuilds {
     alias
     configFile
+    cron
     id
     intervalHours
     message
diff --git a/src/gql/fragments/projectSettings/viewsAndFilters.graphql b/src/gql/fragments/projectSettings/viewsAndFilters.graphql
new file mode 100644
index 0000000000..3ce72b7722
--- /dev/null
+++ b/src/gql/fragments/projectSettings/viewsAndFilters.graphql
@@ -0,0 +1,8 @@
+fragment ProjectViewsAndFiltersSettings on Project {
+  parsleyFilters {
+    caseSensitive
+    exactMatch
+    expression
+  }
+  projectHealthView
+}
diff --git a/src/gql/generated/types.ts b/src/gql/generated/types.ts
index 6d530d362f..1da737f8e6 100644
--- a/src/gql/generated/types.ts
+++ b/src/gql/generated/types.ts
@@ -1353,8 +1353,8 @@ export type ProjectEvents = {
 };
 
 export enum ProjectHealthView {
-  ProjectHealthViewAll = "PROJECT_HEALTH_VIEW_ALL",
-  ProjectHealthViewFailed = "PROJECT_HEALTH_VIEW_FAILED",
+  All = "ALL",
+  Failed = "FAILED",
 }
 
 export type ProjectInput = {
@@ -2614,40 +2614,34 @@ export type AnnotationFragment = {
   taskExecution: number;
   taskId: string;
   webhookConfigured: boolean;
-  createdIssues?: Maybe<
-    Array<
-      Maybe<{
-        __typename?: "IssueLink";
-        issueKey?: Maybe<string>;
-        url?: Maybe<string>;
-        source?: Maybe<{
-          __typename?: "Source";
-          author: string;
-          requester: string;
-          time: Date;
-        }>;
-      }>
-    >
-  >;
-  issues?: Maybe<
-    Array<
-      Maybe<{
-        __typename?: "IssueLink";
-        issueKey?: Maybe<string>;
-        url?: Maybe<string>;
-        source?: Maybe<{
-          __typename?: "Source";
-          author: string;
-          requester: string;
-          time: Date;
-        }>;
-      }>
-    >
-  >;
-  metadataLinks?: Maybe<
-    Array<Maybe<{ __typename?: "MetadataLink"; text: string; url: string }>>
-  >;
-  note?: Maybe<{
+  createdIssues?: Array<{
+    __typename?: "IssueLink";
+    issueKey?: string | null;
+    url?: string | null;
+    source?: {
+      __typename?: "Source";
+      author: string;
+      requester: string;
+      time: Date;
+    } | null;
+  } | null> | null;
+  issues?: Array<{
+    __typename?: "IssueLink";
+    issueKey?: string | null;
+    url?: string | null;
+    source?: {
+      __typename?: "Source";
+      author: string;
+      requester: string;
+      time: Date;
+    } | null;
+  } | null> | null;
+  metadataLinks?: Array<{
+    __typename?: "MetadataLink";
+    text: string;
+    url: string;
+  } | null> | null;
+  note?: {
     __typename?: "Note";
     message: string;
     source: {
@@ -2656,49 +2650,45 @@ export type AnnotationFragment = {
       requester: string;
       time: Date;
     };
-  }>;
-  suspectedIssues?: Maybe<
-    Array<
-      Maybe<{
-        __typename?: "IssueLink";
-        issueKey?: Maybe<string>;
-        url?: Maybe<string>;
-        source?: Maybe<{
-          __typename?: "Source";
-          author: string;
-          requester: string;
-          time: Date;
-        }>;
-      }>
-    >
-  >;
+  } | null;
+  suspectedIssues?: Array<{
+    __typename?: "IssueLink";
+    issueKey?: string | null;
+    url?: string | null;
+    source?: {
+      __typename?: "Source";
+      author: string;
+      requester: string;
+      time: Date;
+    } | null;
+  } | null> | null;
 };
 
 export type IssueLinkFragment = {
   __typename?: "IssueLink";
-  confidenceScore?: Maybe<number>;
-  issueKey?: Maybe<string>;
-  url?: Maybe<string>;
-  jiraTicket?: Maybe<{
+  confidenceScore?: number | null;
+  issueKey?: string | null;
+  url?: string | null;
+  jiraTicket?: {
     __typename?: "JiraTicket";
     key: string;
     fields: {
       __typename?: "TicketFields";
-      assignedTeam?: Maybe<string>;
-      assigneeDisplayName?: Maybe<string>;
+      assignedTeam?: string | null;
+      assigneeDisplayName?: string | null;
       created: string;
-      resolutionName?: Maybe<string>;
+      resolutionName?: string | null;
       summary: string;
       updated: string;
       status: { __typename?: "JiraStatus"; id: string; name: string };
     };
-  }>;
-  source?: Maybe<{
+  } | null;
+  source?: {
     __typename?: "Source";
     author: string;
     requester: string;
     time: Date;
-  }>;
+  } | null;
 };
 
 export type JiraTicketFragment = {
@@ -2706,10 +2696,10 @@ export type JiraTicketFragment = {
   key: string;
   fields: {
     __typename?: "TicketFields";
-    assignedTeam?: Maybe<string>;
-    assigneeDisplayName?: Maybe<string>;
+    assignedTeam?: string | null;
+    assigneeDisplayName?: string | null;
     created: string;
-    resolutionName?: Maybe<string>;
+    resolutionName?: string | null;
     summary: string;
     updated: string;
     status: { __typename?: "JiraStatus"; id: string; name: string };
@@ -2724,32 +2714,34 @@ export type BaseHostFragment = {
   startedBy: string;
   status: string;
   tag: string;
-  uptime?: Maybe<Date>;
-  user?: Maybe<string>;
+  uptime?: Date | null;
+  user?: string | null;
 };
 
 export type BasePatchFragment = {
   __typename?: "Patch";
   activated: boolean;
-  alias?: Maybe<string>;
+  alias?: string | null;
   author: string;
-  commitQueuePosition?: Maybe<number>;
+  commitQueuePosition?: number | null;
   description: string;
   id: string;
   status: string;
   parameters: Array<{ __typename?: "Parameter"; key: string; value: string }>;
-  variantsTasks: Array<
-    Maybe<{ __typename?: "VariantTask"; name: string; tasks: Array<string> }>
-  >;
+  variantsTasks: Array<{
+    __typename?: "VariantTask";
+    name: string;
+    tasks: Array<string>;
+  } | null>;
 };
 
 export type BaseSpawnHostFragment = {
   __typename?: "Host";
-  availabilityZone?: Maybe<string>;
-  displayName?: Maybe<string>;
-  expiration?: Maybe<Date>;
-  homeVolumeID?: Maybe<string>;
-  instanceType?: Maybe<string>;
+  availabilityZone?: string | null;
+  displayName?: string | null;
+  expiration?: Date | null;
+  homeVolumeID?: string | null;
+  instanceType?: string | null;
   noExpiration: boolean;
   hostUrl: string;
   id: string;
@@ -2757,21 +2749,21 @@ export type BaseSpawnHostFragment = {
   startedBy: string;
   status: string;
   tag: string;
-  uptime?: Maybe<Date>;
-  user?: Maybe<string>;
-  distro?: Maybe<{
+  uptime?: Date | null;
+  user?: string | null;
+  distro?: {
     __typename?: "DistroInfo";
-    id?: Maybe<string>;
-    isVirtualWorkStation?: Maybe<boolean>;
-    isWindows?: Maybe<boolean>;
-    user?: Maybe<string>;
-    workDir?: Maybe<string>;
-  }>;
-  homeVolume?: Maybe<{
+    id?: string | null;
+    isVirtualWorkStation?: boolean | null;
+    isWindows?: boolean | null;
+    user?: string | null;
+    workDir?: string | null;
+  } | null;
+  homeVolume?: {
     __typename?: "Volume";
     displayName: string;
     id: string;
-  }>;
+  } | null;
   instanceTags: Array<{
     __typename?: "InstanceTag";
     canBeModified: boolean;
@@ -2789,11 +2781,11 @@ export type BaseSpawnHostFragment = {
 export type BaseTaskFragment = {
   __typename?: "Task";
   buildVariant: string;
-  buildVariantDisplayName?: Maybe<string>;
+  buildVariantDisplayName?: string | null;
   displayName: string;
   execution: number;
   id: string;
-  revision?: Maybe<string>;
+  revision?: string | null;
   status: string;
 };
 
@@ -2808,9 +2800,9 @@ export type FileDiffsFragment = {
 
 export type LogMessageFragment = {
   __typename?: "LogMessage";
-  message?: Maybe<string>;
-  severity?: Maybe<string>;
-  timestamp?: Maybe<Date>;
+  message?: string | null;
+  severity?: string | null;
+  timestamp?: Date | null;
 };
 
 export type ModuleCodeChangeFragment = {
@@ -2834,39 +2826,41 @@ export type PatchesPagePatchesFragment = {
   patches: Array<{
     __typename?: "Patch";
     activated: boolean;
-    alias?: Maybe<string>;
+    alias?: string | null;
     author: string;
     authorDisplayName: string;
     canEnqueueToCommitQueue: boolean;
-    commitQueuePosition?: Maybe<number>;
-    createTime?: Maybe<Date>;
+    commitQueuePosition?: number | null;
+    createTime?: Date | null;
     description: string;
     id: string;
     projectIdentifier: string;
     status: string;
-    projectMetadata?: Maybe<{
+    projectMetadata?: {
       __typename?: "Project";
       owner: string;
       repo: string;
-    }>;
-    versionFull?: Maybe<{
+    } | null;
+    versionFull?: {
       __typename?: "Version";
       id: string;
       status: string;
-      taskStatusStats?: Maybe<{
+      taskStatusStats?: {
         __typename?: "TaskStats";
-        counts?: Maybe<
-          Array<{ __typename?: "StatusCount"; count: number; status: string }>
-        >;
-      }>;
-    }>;
+        counts?: Array<{
+          __typename?: "StatusCount";
+          count: number;
+          status: string;
+        }> | null;
+      } | null;
+    } | null;
   }>;
 };
 
 export type ProjectAccessSettingsFragment = {
   __typename?: "Project";
-  admins?: Maybe<Array<Maybe<string>>>;
-  restricted?: Maybe<boolean>;
+  admins?: Array<string | null> | null;
+  restricted?: boolean | null;
 };
 
 export type RepoAccessSettingsFragment = {
@@ -2889,49 +2883,45 @@ export type AliasFragment = {
 
 export type ProjectContainerSettingsFragment = {
   __typename?: "Project";
-  containerSizeDefinitions?: Maybe<
-    Array<{
-      __typename?: "ContainerResources";
-      cpu: number;
-      memoryMb: number;
-      name: string;
-    }>
-  >;
+  containerSizeDefinitions?: Array<{
+    __typename?: "ContainerResources";
+    cpu: number;
+    memoryMb: number;
+    name: string;
+  }> | null;
 };
 
 export type RepoContainerSettingsFragment = {
   __typename?: "RepoRef";
-  containerSizeDefinitions?: Maybe<
-    Array<{
-      __typename?: "ContainerResources";
-      cpu: number;
-      memoryMb: number;
-      name: string;
-    }>
-  >;
+  containerSizeDefinitions?: Array<{
+    __typename?: "ContainerResources";
+    cpu: number;
+    memoryMb: number;
+    name: string;
+  }> | null;
 };
 
 export type ProjectGeneralSettingsFragment = {
   __typename?: "Project";
   batchTime: number;
   branch: string;
-  deactivatePrevious?: Maybe<boolean>;
-  disabledStatsCache?: Maybe<boolean>;
-  dispatchingDisabled?: Maybe<boolean>;
+  deactivatePrevious?: boolean | null;
+  disabledStatsCache?: boolean | null;
+  dispatchingDisabled?: boolean | null;
   displayName: string;
-  enabled?: Maybe<boolean>;
+  enabled?: boolean | null;
   owner: string;
-  patchingDisabled?: Maybe<boolean>;
+  patchingDisabled?: boolean | null;
   remotePath: string;
   repo: string;
-  repotrackerDisabled?: Maybe<boolean>;
+  repotrackerDisabled?: boolean | null;
   spawnHostScriptPath: string;
-  stepbackDisabled?: Maybe<boolean>;
-  versionControlEnabled?: Maybe<boolean>;
+  stepbackDisabled?: boolean | null;
+  versionControlEnabled?: boolean | null;
   taskSync: {
     __typename?: "TaskSyncOptions";
-    configEnabled?: Maybe<boolean>;
-    patchEnabled?: Maybe<boolean>;
+    configEnabled?: boolean | null;
+    patchEnabled?: boolean | null;
   };
 };
 
@@ -2959,16 +2949,16 @@ export type RepoGeneralSettingsFragment = {
 
 export type ProjectGithubSettingsFragment = {
   __typename?: "Project";
-  githubChecksEnabled?: Maybe<boolean>;
-  githubTriggerAliases?: Maybe<Array<string>>;
-  gitTagAuthorizedTeams?: Maybe<Array<string>>;
-  gitTagAuthorizedUsers?: Maybe<Array<string>>;
-  gitTagVersionsEnabled?: Maybe<boolean>;
-  manualPrTestingEnabled?: Maybe<boolean>;
-  prTestingEnabled?: Maybe<boolean>;
+  githubChecksEnabled?: boolean | null;
+  githubTriggerAliases?: Array<string> | null;
+  gitTagAuthorizedTeams?: Array<string> | null;
+  gitTagAuthorizedUsers?: Array<string> | null;
+  gitTagVersionsEnabled?: boolean | null;
+  manualPrTestingEnabled?: boolean | null;
+  prTestingEnabled?: boolean | null;
   commitQueue: {
     __typename?: "CommitQueueParams";
-    enabled?: Maybe<boolean>;
+    enabled?: boolean | null;
     mergeMethod: string;
     message: string;
   };
@@ -2977,9 +2967,9 @@ export type ProjectGithubSettingsFragment = {
 export type RepoGithubSettingsFragment = {
   __typename?: "RepoRef";
   githubChecksEnabled: boolean;
-  githubTriggerAliases?: Maybe<Array<string>>;
-  gitTagAuthorizedTeams?: Maybe<Array<string>>;
-  gitTagAuthorizedUsers?: Maybe<Array<string>>;
+  githubTriggerAliases?: Array<string> | null;
+  gitTagAuthorizedTeams?: Array<string> | null;
+  gitTagAuthorizedUsers?: Array<string> | null;
   gitTagVersionsEnabled: boolean;
   manualPrTestingEnabled: boolean;
   prTestingEnabled: boolean;
@@ -2994,33 +2984,33 @@ export type RepoGithubSettingsFragment = {
 export type ProjectGithubCommitQueueFragment = {
   __typename?: "ProjectSettings";
   githubWebhooksEnabled: boolean;
-  projectRef?: Maybe<{
+  projectRef?: {
     __typename?: "Project";
-    githubChecksEnabled?: Maybe<boolean>;
-    githubTriggerAliases?: Maybe<Array<string>>;
-    gitTagAuthorizedTeams?: Maybe<Array<string>>;
-    gitTagAuthorizedUsers?: Maybe<Array<string>>;
-    gitTagVersionsEnabled?: Maybe<boolean>;
-    manualPrTestingEnabled?: Maybe<boolean>;
-    prTestingEnabled?: Maybe<boolean>;
+    githubChecksEnabled?: boolean | null;
+    githubTriggerAliases?: Array<string> | null;
+    gitTagAuthorizedTeams?: Array<string> | null;
+    gitTagAuthorizedUsers?: Array<string> | null;
+    gitTagVersionsEnabled?: boolean | null;
+    manualPrTestingEnabled?: boolean | null;
+    prTestingEnabled?: boolean | null;
     commitQueue: {
       __typename?: "CommitQueueParams";
-      enabled?: Maybe<boolean>;
+      enabled?: boolean | null;
       mergeMethod: string;
       message: string;
     };
-  }>;
+  } | null;
 };
 
 export type RepoGithubCommitQueueFragment = {
   __typename?: "RepoSettings";
   githubWebhooksEnabled: boolean;
-  projectRef?: Maybe<{
+  projectRef?: {
     __typename?: "RepoRef";
     githubChecksEnabled: boolean;
-    githubTriggerAliases?: Maybe<Array<string>>;
-    gitTagAuthorizedTeams?: Maybe<Array<string>>;
-    gitTagAuthorizedUsers?: Maybe<Array<string>>;
+    githubTriggerAliases?: Array<string> | null;
+    gitTagAuthorizedTeams?: Array<string> | null;
+    gitTagAuthorizedUsers?: Array<string> | null;
     gitTagVersionsEnabled: boolean;
     manualPrTestingEnabled: boolean;
     prTestingEnabled: boolean;
@@ -3030,135 +3020,125 @@ export type RepoGithubCommitQueueFragment = {
       mergeMethod: string;
       message: string;
     };
-  }>;
+  } | null;
 };
 
 export type ProjectEventGithubCommitQueueFragment = {
   __typename?: "ProjectEventSettings";
   githubWebhooksEnabled: boolean;
-  projectRef?: Maybe<{
+  projectRef?: {
     __typename?: "Project";
-    githubChecksEnabled?: Maybe<boolean>;
-    githubTriggerAliases?: Maybe<Array<string>>;
-    gitTagAuthorizedTeams?: Maybe<Array<string>>;
-    gitTagAuthorizedUsers?: Maybe<Array<string>>;
-    gitTagVersionsEnabled?: Maybe<boolean>;
-    manualPrTestingEnabled?: Maybe<boolean>;
-    prTestingEnabled?: Maybe<boolean>;
+    githubChecksEnabled?: boolean | null;
+    githubTriggerAliases?: Array<string> | null;
+    gitTagAuthorizedTeams?: Array<string> | null;
+    gitTagAuthorizedUsers?: Array<string> | null;
+    gitTagVersionsEnabled?: boolean | null;
+    manualPrTestingEnabled?: boolean | null;
+    prTestingEnabled?: boolean | null;
     commitQueue: {
       __typename?: "CommitQueueParams";
-      enabled?: Maybe<boolean>;
+      enabled?: boolean | null;
       mergeMethod: string;
       message: string;
     };
-  }>;
+  } | null;
 };
 
 export type ProjectSettingsFieldsFragment = {
   __typename?: "ProjectSettings";
   githubWebhooksEnabled: boolean;
-  aliases?: Maybe<
-    Array<{
-      __typename?: "ProjectAlias";
-      alias: string;
-      gitTag: string;
-      id: string;
-      remotePath: string;
-      task: string;
-      taskTags: Array<string>;
-      variant: string;
-      variantTags: Array<string>;
-    }>
-  >;
-  projectRef?: Maybe<{
+  aliases?: Array<{
+    __typename?: "ProjectAlias";
+    alias: string;
+    gitTag: string;
+    id: string;
+    remotePath: string;
+    task: string;
+    taskTags: Array<string>;
+    variant: string;
+    variantTags: Array<string>;
+  }> | null;
+  projectRef?: {
     __typename?: "Project";
     id: string;
     identifier: string;
     repoRefId: string;
-    admins?: Maybe<Array<Maybe<string>>>;
-    restricted?: Maybe<boolean>;
+    admins?: Array<string | null> | null;
+    restricted?: boolean | null;
     batchTime: number;
     branch: string;
-    deactivatePrevious?: Maybe<boolean>;
-    disabledStatsCache?: Maybe<boolean>;
-    dispatchingDisabled?: Maybe<boolean>;
+    deactivatePrevious?: boolean | null;
+    disabledStatsCache?: boolean | null;
+    dispatchingDisabled?: boolean | null;
     displayName: string;
-    enabled?: Maybe<boolean>;
+    enabled?: boolean | null;
     owner: string;
-    patchingDisabled?: Maybe<boolean>;
+    patchingDisabled?: boolean | null;
     remotePath: string;
     repo: string;
-    repotrackerDisabled?: Maybe<boolean>;
+    repotrackerDisabled?: boolean | null;
     spawnHostScriptPath: string;
-    stepbackDisabled?: Maybe<boolean>;
-    versionControlEnabled?: Maybe<boolean>;
-    notifyOnBuildFailure?: Maybe<boolean>;
-    githubTriggerAliases?: Maybe<Array<string>>;
-    perfEnabled?: Maybe<boolean>;
-    githubChecksEnabled?: Maybe<boolean>;
-    gitTagAuthorizedTeams?: Maybe<Array<string>>;
-    gitTagAuthorizedUsers?: Maybe<Array<string>>;
-    gitTagVersionsEnabled?: Maybe<boolean>;
-    manualPrTestingEnabled?: Maybe<boolean>;
-    prTestingEnabled?: Maybe<boolean>;
-    containerSizeDefinitions?: Maybe<
-      Array<{
-        __typename?: "ContainerResources";
-        cpu: number;
-        memoryMb: number;
-        name: string;
-      }>
-    >;
+    stepbackDisabled?: boolean | null;
+    versionControlEnabled?: boolean | null;
+    notifyOnBuildFailure?: boolean | null;
+    githubTriggerAliases?: Array<string> | null;
+    perfEnabled?: boolean | null;
+    projectHealthView: ProjectHealthView;
+    githubChecksEnabled?: boolean | null;
+    gitTagAuthorizedTeams?: Array<string> | null;
+    gitTagAuthorizedUsers?: Array<string> | null;
+    gitTagVersionsEnabled?: boolean | null;
+    manualPrTestingEnabled?: boolean | null;
+    prTestingEnabled?: boolean | null;
+    containerSizeDefinitions?: Array<{
+      __typename?: "ContainerResources";
+      cpu: number;
+      memoryMb: number;
+      name: string;
+    }> | null;
     taskSync: {
       __typename?: "TaskSyncOptions";
-      configEnabled?: Maybe<boolean>;
-      patchEnabled?: Maybe<boolean>;
+      configEnabled?: boolean | null;
+      patchEnabled?: boolean | null;
     };
-    banner?: Maybe<{
+    banner?: {
       __typename?: "ProjectBanner";
       text: string;
       theme: BannerTheme;
-    }>;
-    patchTriggerAliases?: Maybe<
-      Array<{
-        __typename?: "PatchTriggerAlias";
-        alias: string;
-        childProjectIdentifier: string;
-        parentAsModule?: Maybe<string>;
-        status?: Maybe<string>;
-        taskSpecifiers?: Maybe<
-          Array<{
-            __typename?: "TaskSpecifier";
-            patchAlias: string;
-            taskRegex: string;
-            variantRegex: string;
-          }>
-        >;
-      }>
-    >;
-    periodicBuilds?: Maybe<
-      Array<{
-        __typename?: "PeriodicBuild";
-        alias: string;
-        configFile: string;
-        id: string;
-        intervalHours: number;
-        message: string;
-        nextRunTime: Date;
-      }>
-    >;
+    } | null;
+    patchTriggerAliases?: Array<{
+      __typename?: "PatchTriggerAlias";
+      alias: string;
+      childProjectIdentifier: string;
+      parentAsModule?: string | null;
+      status?: string | null;
+      taskSpecifiers?: Array<{
+        __typename?: "TaskSpecifier";
+        patchAlias: string;
+        taskRegex: string;
+        variantRegex: string;
+      }> | null;
+    }> | null;
+    periodicBuilds?: Array<{
+      __typename?: "PeriodicBuild";
+      alias: string;
+      configFile: string;
+      cron: string;
+      id: string;
+      intervalHours: number;
+      message: string;
+      nextRunTime: Date;
+    }> | null;
     buildBaronSettings: {
       __typename?: "BuildBaronSettings";
       ticketCreateProject: string;
-      ticketSearchProjects?: Maybe<Array<string>>;
+      ticketSearchProjects?: Array<string> | null;
     };
-    externalLinks?: Maybe<
-      Array<{
-        __typename?: "ExternalLink";
-        displayName: string;
-        urlTemplate: string;
-      }>
-    >;
+    externalLinks?: Array<{
+      __typename?: "ExternalLink";
+      displayName: string;
+      urlTemplate: string;
+    }> | null;
     taskAnnotationSettings: {
       __typename?: "TaskAnnotationSettings";
       fileTicketWebhook: {
@@ -3166,125 +3146,123 @@ export type ProjectSettingsFieldsFragment = {
         endpoint: string;
         secret: string;
       };
-      jiraCustomFields?: Maybe<
-        Array<{ __typename?: "JiraField"; displayText: string; field: string }>
-      >;
+      jiraCustomFields?: Array<{
+        __typename?: "JiraField";
+        displayText: string;
+        field: string;
+      }> | null;
     };
-    triggers?: Maybe<
-      Array<{
-        __typename?: "TriggerAlias";
-        alias: string;
-        buildVariantRegex: string;
-        configFile: string;
-        dateCutoff?: Maybe<number>;
-        level: string;
-        project: string;
-        status: string;
-        taskRegex: string;
-      }>
-    >;
+    triggers?: Array<{
+      __typename?: "TriggerAlias";
+      alias: string;
+      buildVariantRegex: string;
+      configFile: string;
+      dateCutoff?: number | null;
+      level: string;
+      project: string;
+      status: string;
+      taskRegex: string;
+    }> | null;
+    parsleyFilters?: Array<{
+      __typename?: "ParsleyFilter";
+      caseSensitive: boolean;
+      exactMatch: boolean;
+      expression: string;
+    }> | null;
     workstationConfig: {
       __typename?: "WorkstationConfig";
-      gitClone?: Maybe<boolean>;
-      setupCommands?: Maybe<
-        Array<{
-          __typename?: "WorkstationSetupCommand";
-          command: string;
-          directory: string;
-        }>
-      >;
+      gitClone?: boolean | null;
+      setupCommands?: Array<{
+        __typename?: "WorkstationSetupCommand";
+        command: string;
+        directory: string;
+      }> | null;
     };
     commitQueue: {
       __typename?: "CommitQueueParams";
-      enabled?: Maybe<boolean>;
+      enabled?: boolean | null;
       mergeMethod: string;
       message: string;
     };
-  }>;
-  subscriptions?: Maybe<
-    Array<{
-      __typename?: "GeneralSubscription";
-      id: string;
-      ownerType: string;
-      resourceType: string;
-      trigger: string;
-      triggerData?: Maybe<{ [key: string]: any }>;
-      regexSelectors: Array<{
-        __typename?: "Selector";
-        data: string;
-        type: string;
-      }>;
-      selectors: Array<{ __typename?: "Selector"; data: string; type: string }>;
-      subscriber?: Maybe<{
-        __typename?: "SubscriberWrapper";
-        type: string;
-        subscriber: {
-          __typename?: "Subscriber";
-          emailSubscriber?: Maybe<string>;
-          jiraCommentSubscriber?: Maybe<string>;
-          slackSubscriber?: Maybe<string>;
-          githubCheckSubscriber?: Maybe<{
-            __typename?: "GithubCheckSubscriber";
-            owner: string;
-            ref: string;
-            repo: string;
-          }>;
-          githubPRSubscriber?: Maybe<{
-            __typename?: "GithubPRSubscriber";
-            owner: string;
-            prNumber?: Maybe<number>;
-            ref: string;
-            repo: string;
-          }>;
-          jiraIssueSubscriber?: Maybe<{
-            __typename?: "JiraIssueSubscriber";
-            issueType: string;
-            project: string;
-          }>;
-          webhookSubscriber?: Maybe<{
-            __typename?: "WebhookSubscriber";
-            minDelayMs: number;
-            retries: number;
-            secret: string;
-            timeoutMs: number;
-            url: string;
-            headers: Array<
-              Maybe<{
-                __typename?: "WebhookHeader";
-                key: string;
-                value: string;
-              }>
-            >;
-          }>;
-        };
-      }>;
-    }>
-  >;
-  vars?: Maybe<{
+  } | null;
+  subscriptions?: Array<{
+    __typename?: "GeneralSubscription";
+    id: string;
+    ownerType: string;
+    resourceType: string;
+    trigger: string;
+    triggerData?: { [key: string]: any } | null;
+    regexSelectors: Array<{
+      __typename?: "Selector";
+      data: string;
+      type: string;
+    }>;
+    selectors: Array<{ __typename?: "Selector"; data: string; type: string }>;
+    subscriber?: {
+      __typename?: "SubscriberWrapper";
+      type: string;
+      subscriber: {
+        __typename?: "Subscriber";
+        emailSubscriber?: string | null;
+        jiraCommentSubscriber?: string | null;
+        slackSubscriber?: string | null;
+        githubCheckSubscriber?: {
+          __typename?: "GithubCheckSubscriber";
+          owner: string;
+          ref: string;
+          repo: string;
+        } | null;
+        githubPRSubscriber?: {
+          __typename?: "GithubPRSubscriber";
+          owner: string;
+          prNumber?: number | null;
+          ref: string;
+          repo: string;
+        } | null;
+        jiraIssueSubscriber?: {
+          __typename?: "JiraIssueSubscriber";
+          issueType: string;
+          project: string;
+        } | null;
+        webhookSubscriber?: {
+          __typename?: "WebhookSubscriber";
+          minDelayMs: number;
+          retries: number;
+          secret: string;
+          timeoutMs: number;
+          url: string;
+          headers: Array<{
+            __typename?: "WebhookHeader";
+            key: string;
+            value: string;
+          } | null>;
+        } | null;
+      };
+    } | null;
+  }> | null;
+  vars?: {
     __typename?: "ProjectVars";
     adminOnlyVars: Array<string>;
     privateVars: Array<string>;
-    vars?: Maybe<{ [key: string]: any }>;
-  }>;
+    vars?: { [key: string]: any } | null;
+  } | null;
 };
 
 export type RepoSettingsFieldsFragment = {
   __typename?: "RepoSettings";
   githubWebhooksEnabled: boolean;
-  aliases?: Maybe<
-    Array<{
-      __typename?: "ProjectAlias";
-      alias: string;
-      gitTag: string;
-      id: string;
-      remotePath: string;
-      task: string;
-      taskTags: Array<string>;
-      variant: string;
-      variantTags: Array<string>;
-    }>
-  >;
-  projectRef?: Maybe<{
+  aliases?: Array<{
+    __typename?: "ProjectAlias";
+    alias: string;
+    gitTag: string;
+    id: string;
+    remotePath: string;
+    task: string;
+    taskTags: Array<string>;
+    variant: string;
+    variantTags: Array<string>;
+  }> | null;
+  projectRef?: {
     __typename?: "RepoRef";
     displayName: string;
     id: string;
@@ -3303,67 +3281,58 @@ export type RepoSettingsFieldsFragment = {
     stepbackDisabled: boolean;
     versionControlEnabled: boolean;
     notifyOnBuildFailure: boolean;
-    githubTriggerAliases?: Maybe<Array<string>>;
+    githubTriggerAliases?: Array<string> | null;
     perfEnabled: boolean;
     githubChecksEnabled: boolean;
-    gitTagAuthorizedTeams?: Maybe<Array<string>>;
-    gitTagAuthorizedUsers?: Maybe<Array<string>>;
+    gitTagAuthorizedTeams?: Array<string> | null;
+    gitTagAuthorizedUsers?: Array<string> | null;
     gitTagVersionsEnabled: boolean;
     manualPrTestingEnabled: boolean;
     prTestingEnabled: boolean;
-    containerSizeDefinitions?: Maybe<
-      Array<{
-        __typename?: "ContainerResources";
-        cpu: number;
-        memoryMb: number;
-        name: string;
-      }>
-    >;
+    containerSizeDefinitions?: Array<{
+      __typename?: "ContainerResources";
+      cpu: number;
+      memoryMb: number;
+      name: string;
+    }> | null;
     taskSync: {
       __typename?: "RepoTaskSyncOptions";
       configEnabled: boolean;
       patchEnabled: boolean;
     };
-    patchTriggerAliases?: Maybe<
-      Array<{
-        __typename?: "PatchTriggerAlias";
-        alias: string;
-        childProjectIdentifier: string;
-        parentAsModule?: Maybe<string>;
-        status?: Maybe<string>;
-        taskSpecifiers?: Maybe<
-          Array<{
-            __typename?: "TaskSpecifier";
-            patchAlias: string;
-            taskRegex: string;
-            variantRegex: string;
-          }>
-        >;
-      }>
-    >;
-    periodicBuilds?: Maybe<
-      Array<{
-        __typename?: "PeriodicBuild";
-        alias: string;
-        configFile: string;
-        id: string;
-        intervalHours: number;
-        message: string;
-        nextRunTime: Date;
-      }>
-    >;
+    patchTriggerAliases?: Array<{
+      __typename?: "PatchTriggerAlias";
+      alias: string;
+      childProjectIdentifier: string;
+      parentAsModule?: string | null;
+      status?: string | null;
+      taskSpecifiers?: Array<{
+        __typename?: "TaskSpecifier";
+        patchAlias: string;
+        taskRegex: string;
+        variantRegex: string;
+      }> | null;
+    }> | null;
+    periodicBuilds?: Array<{
+      __typename?: "PeriodicBuild";
+      alias: string;
+      configFile: string;
+      cron: string;
+      id: string;
+      intervalHours: number;
+      message: string;
+      nextRunTime: Date;
+    }> | null;
     buildBaronSettings: {
       __typename?: "BuildBaronSettings";
       ticketCreateProject: string;
-      ticketSearchProjects?: Maybe<Array<string>>;
+      ticketSearchProjects?: Array<string> | null;
     };
-    externalLinks?: Maybe<
-      Array<{
-        __typename?: "ExternalLink";
-        displayName: string;
-        urlTemplate: string;
-      }>
-    >;
+    externalLinks?: Array<{
+      __typename?: "ExternalLink";
+      displayName: string;
+      urlTemplate: string;
+    }> | null;
     taskAnnotationSettings: {
       __typename?: "TaskAnnotationSettings";
       fileTicketWebhook: {
@@ -3371,16 +3340,18 @@ export type RepoSettingsFieldsFragment = {
         endpoint: string;
         secret: string;
       };
-      jiraCustomFields?: Maybe<
-        Array<{ __typename?: "JiraField"; displayText: string; field: string }>
-      >;
+      jiraCustomFields?: Array<{
+        __typename?: "JiraField";
+        displayText: string;
+        field: string;
+      }> | null;
     };
     triggers: Array<{
       __typename?: "TriggerAlias";
       alias: string;
       buildVariantRegex: string;
       configFile: string;
-      dateCutoff?: Maybe<number>;
+      dateCutoff?: number | null;
       level: string;
       project: string;
       status: string;
@@ -3389,13 +3360,11 @@ export type RepoSettingsFieldsFragment = {
     workstationConfig: {
       __typename?: "RepoWorkstationConfig";
       gitClone: boolean;
-      setupCommands?: Maybe<
-        Array<{
-          __typename?: "WorkstationSetupCommand";
-          command: string;
-          directory: string;
-        }>
-      >;
+      setupCommands?: Array<{
+        __typename?: "WorkstationSetupCommand";
+        command: string;
+        directory: string;
+      }> | null;
     };
     commitQueue: {
       __typename?: "RepoCommitQueueParams";
@@ -3403,82 +3372,78 @@ export type RepoSettingsFieldsFragment = {
       mergeMethod: string;
       message: string;
     };
-  }>;
-  subscriptions?: Maybe<
-    Array<{
-      __typename?: "GeneralSubscription";
-      id: string;
-      ownerType: string;
-      resourceType: string;
-      trigger: string;
-      triggerData?: Maybe<{ [key: string]: any }>;
-      regexSelectors: Array<{
-        __typename?: "Selector";
-        data: string;
-        type: string;
-      }>;
-      selectors: Array<{ __typename?: "Selector"; data: string; type: string }>;
-      subscriber?: Maybe<{
-        __typename?: "SubscriberWrapper";
-        type: string;
-        subscriber: {
-          __typename?: "Subscriber";
-          emailSubscriber?: Maybe<string>;
-          jiraCommentSubscriber?: Maybe<string>;
-          slackSubscriber?: Maybe<string>;
-          githubCheckSubscriber?: Maybe<{
-            __typename?: "GithubCheckSubscriber";
-            owner: string;
-            ref: string;
-            repo: string;
-          }>;
-          githubPRSubscriber?: Maybe<{
-            __typename?: "GithubPRSubscriber";
-            owner: string;
-            prNumber?: Maybe<number>;
-            ref: string;
-            repo: string;
-          }>;
-          jiraIssueSubscriber?: Maybe<{
-            __typename?: "JiraIssueSubscriber";
-            issueType: string;
-            project: string;
-          }>;
-          webhookSubscriber?: Maybe<{
-            __typename?: "WebhookSubscriber";
-            minDelayMs: number;
-            retries: number;
-            secret: string;
-            timeoutMs: number;
-            url: string;
-            headers: Array<
-              Maybe<{
-                __typename?: "WebhookHeader";
-                key: string;
-                value: string;
-              }>
-            >;
-          }>;
-        };
-      }>;
-    }>
-  >;
-  vars?: Maybe<{
+  } | null;
+  subscriptions?: Array<{
+    __typename?: "GeneralSubscription";
+    id: string;
+    ownerType: string;
+    resourceType: string;
+    trigger: string;
+    triggerData?: { [key: string]: any } | null;
+    regexSelectors: Array<{
+      __typename?: "Selector";
+      data: string;
+      type: string;
+    }>;
+    selectors: Array<{ __typename?: "Selector"; data: string; type: string }>;
+    subscriber?: {
+      __typename?: "SubscriberWrapper";
+      type: string;
+      subscriber: {
+        __typename?: "Subscriber";
+        emailSubscriber?: string | null;
+        jiraCommentSubscriber?: string | null;
+        slackSubscriber?: string | null;
+        githubCheckSubscriber?: {
+          __typename?: "GithubCheckSubscriber";
+          owner: string;
+          ref: string;
+          repo: string;
+        } | null;
+        githubPRSubscriber?: {
+          __typename?: "GithubPRSubscriber";
+          owner: string;
+          prNumber?: number | null;
+          ref: string;
+          repo: string;
+        } | null;
+        jiraIssueSubscriber?: {
+          __typename?: "JiraIssueSubscriber";
+          issueType: string;
+          project: string;
+        } | null;
+        webhookSubscriber?: {
+          __typename?: "WebhookSubscriber";
+          minDelayMs: number;
+          retries: number;
+          secret: string;
+          timeoutMs: number;
+          url: string;
+          headers: Array<{
+            __typename?: "WebhookHeader";
+            key: string;
+            value: string;
+          } | null>;
+        } | null;
+      };
+    } | null;
+  }> | null;
+  vars?: {
     __typename?: "ProjectVars";
     adminOnlyVars: Array<string>;
     privateVars: Array<string>;
-    vars?: Maybe<{ [key: string]: any }>;
-  }>;
+    vars?: { [key: string]: any } | null;
+  } | null;
 };
 
 export type ProjectNotificationSettingsFragment = {
   __typename?: "Project";
-  notifyOnBuildFailure?: Maybe<boolean>;
-  banner?: Maybe<{
+  notifyOnBuildFailure?: boolean | null;
+  banner?: {
     __typename?: "ProjectBanner";
     text: string;
     theme: BannerTheme;
-  }>;
+  } | null;
 };
 
 export type RepoNotificationSettingsFragment = {
@@ -3492,143 +3457,133 @@ export type SubscriptionsFragment = {
   ownerType: string;
   resourceType: string;
   trigger: string;
-  triggerData?: Maybe<{ [key: string]: any }>;
+  triggerData?: { [key: string]: any } | null;
   regexSelectors: Array<{
     __typename?: "Selector";
     data: string;
     type: string;
   }>;
   selectors: Array<{ __typename?: "Selector"; data: string; type: string }>;
-  subscriber?: Maybe<{
+  subscriber?: {
     __typename?: "SubscriberWrapper";
     type: string;
     subscriber: {
       __typename?: "Subscriber";
-      emailSubscriber?: Maybe<string>;
-      jiraCommentSubscriber?: Maybe<string>;
-      slackSubscriber?: Maybe<string>;
-      githubCheckSubscriber?: Maybe<{
+      emailSubscriber?: string | null;
+      jiraCommentSubscriber?: string | null;
+      slackSubscriber?: string | null;
+      githubCheckSubscriber?: {
         __typename?: "GithubCheckSubscriber";
         owner: string;
         ref: string;
         repo: string;
-      }>;
-      githubPRSubscriber?: Maybe<{
+      } | null;
+      githubPRSubscriber?: {
         __typename?: "GithubPRSubscriber";
         owner: string;
-        prNumber?: Maybe<number>;
+        prNumber?: number | null;
         ref: string;
         repo: string;
-      }>;
-      jiraIssueSubscriber?: Maybe<{
+      } | null;
+      jiraIssueSubscriber?: {
         __typename?: "JiraIssueSubscriber";
         issueType: string;
         project: string;
-      }>;
-      webhookSubscriber?: Maybe<{
+      } | null;
+      webhookSubscriber?: {
         __typename?: "WebhookSubscriber";
         minDelayMs: number;
         retries: number;
         secret: string;
         timeoutMs: number;
         url: string;
-        headers: Array<
-          Maybe<{ __typename?: "WebhookHeader"; key: string; value: string }>
-        >;
-      }>;
+        headers: Array<{
+          __typename?: "WebhookHeader";
+          key: string;
+          value: string;
+        } | null>;
+      } | null;
     };
-  }>;
+  } | null;
 };
 
 export type ProjectPatchAliasSettingsFragment = {
   __typename?: "Project";
-  githubTriggerAliases?: Maybe<Array<string>>;
-  patchTriggerAliases?: Maybe<
-    Array<{
-      __typename?: "PatchTriggerAlias";
-      alias: string;
-      childProjectIdentifier: string;
-      parentAsModule?: Maybe<string>;
-      status?: Maybe<string>;
-      taskSpecifiers?: Maybe<
-        Array<{
-          __typename?: "TaskSpecifier";
-          patchAlias: string;
-          taskRegex: string;
-          variantRegex: string;
-        }>
-      >;
-    }>
-  >;
+  githubTriggerAliases?: Array<string> | null;
+  patchTriggerAliases?: Array<{
+    __typename?: "PatchTriggerAlias";
+    alias: string;
+    childProjectIdentifier: string;
+    parentAsModule?: string | null;
+    status?: string | null;
+    taskSpecifiers?: Array<{
+      __typename?: "TaskSpecifier";
+      patchAlias: string;
+      taskRegex: string;
+      variantRegex: string;
+    }> | null;
+  }> | null;
 };
 
 export type RepoPatchAliasSettingsFragment = {
   __typename?: "RepoRef";
-  githubTriggerAliases?: Maybe<Array<string>>;
-  patchTriggerAliases?: Maybe<
-    Array<{
-      __typename?: "PatchTriggerAlias";
-      alias: string;
-      childProjectIdentifier: string;
-      parentAsModule?: Maybe<string>;
-      status?: Maybe<string>;
-      taskSpecifiers?: Maybe<
-        Array<{
-          __typename?: "TaskSpecifier";
-          patchAlias: string;
-          taskRegex: string;
-          variantRegex: string;
-        }>
-      >;
-    }>
-  >;
+  githubTriggerAliases?: Array<string> | null;
+  patchTriggerAliases?: Array<{
+    __typename?: "PatchTriggerAlias";
+    alias: string;
+    childProjectIdentifier: string;
+    parentAsModule?: string | null;
+    status?: string | null;
+    taskSpecifiers?: Array<{
+      __typename?: "TaskSpecifier";
+      patchAlias: string;
+      taskRegex: string;
+      variantRegex: string;
+    }> | null;
+  }> | null;
 };
 
 export type ProjectPeriodicBuildsSettingsFragment = {
   __typename?: "Project";
-  periodicBuilds?: Maybe<
-    Array<{
-      __typename?: "PeriodicBuild";
-      alias: string;
-      configFile: string;
-      id: string;
-      intervalHours: number;
-      message: string;
-      nextRunTime: Date;
-    }>
-  >;
+  periodicBuilds?: Array<{
+    __typename?: "PeriodicBuild";
+    alias: string;
+    configFile: string;
+    cron: string;
+    id: string;
+    intervalHours: number;
+    message: string;
+    nextRunTime: Date;
+  }> | null;
 };
 
 export type RepoPeriodicBuildsSettingsFragment = {
   __typename?: "RepoRef";
-  periodicBuilds?: Maybe<
-    Array<{
-      __typename?: "PeriodicBuild";
-      alias: string;
-      configFile: string;
-      id: string;
-      intervalHours: number;
-      message: string;
-      nextRunTime: Date;
-    }>
-  >;
+  periodicBuilds?: Array<{
+    __typename?: "PeriodicBuild";
+    alias: string;
+    configFile: string;
+    cron: string;
+    id: string;
+    intervalHours: number;
+    message: string;
+    nextRunTime: Date;
+  }> | null;
 };
 
 export type ProjectPluginsSettingsFragment = {
   __typename?: "Project";
-  perfEnabled?: Maybe<boolean>;
+  perfEnabled?: boolean | null;
   buildBaronSettings: {
     __typename?: "BuildBaronSettings";
     ticketCreateProject: string;
-    ticketSearchProjects?: Maybe<Array<string>>;
+    ticketSearchProjects?: Array<string> | null;
   };
-  externalLinks?: Maybe<
-    Array<{
-      __typename?: "ExternalLink";
-      displayName: string;
-      urlTemplate: string;
-    }>
-  >;
+  externalLinks?: Array<{
+    __typename?: "ExternalLink";
+    displayName: string;
+    urlTemplate: string;
+  }> | null;
   taskAnnotationSettings: {
     __typename?: "TaskAnnotationSettings";
     fileTicketWebhook: {
@@ -3636,9 +3591,11 @@ export type ProjectPluginsSettingsFragment = {
       endpoint: string;
       secret: string;
     };
-    jiraCustomFields?: Maybe<
-      Array<{ __typename?: "JiraField"; displayText: string; field: string }>
-    >;
+    jiraCustomFields?: Array<{
+      __typename?: "JiraField";
+      displayText: string;
+      field: string;
+    }> | null;
   };
 };
 
@@ -3648,15 +3605,13 @@ export type RepoPluginsSettingsFragment = {
   buildBaronSettings: {
     __typename?: "BuildBaronSettings";
     ticketCreateProject: string;
-    ticketSearchProjects?: Maybe<Array<string>>;
+    ticketSearchProjects?: Array<string> | null;
   };
-  externalLinks?: Maybe<
-    Array<{
-      __typename?: "ExternalLink";
-      displayName: string;
-      urlTemplate: string;
-    }>
-  >;
+  externalLinks?: Array<{
+    __typename?: "ExternalLink";
+    displayName: string;
+    urlTemplate: string;
+  }> | null;
   taskAnnotationSettings: {
     __typename?: "TaskAnnotationSettings";
     fileTicketWebhook: {
@@ -3664,110 +3619,103 @@ export type RepoPluginsSettingsFragment = {
       endpoint: string;
       secret: string;
     };
-    jiraCustomFields?: Maybe<
-      Array<{ __typename?: "JiraField"; displayText: string; field: string }>
-    >;
+    jiraCustomFields?: Array<{
+      __typename?: "JiraField";
+      displayText: string;
+      field: string;
+    }> | null;
   };
 };
 
 export type ProjectEventSettingsFragment = {
   __typename?: "ProjectEventSettings";
   githubWebhooksEnabled: boolean;
-  aliases?: Maybe<
-    Array<{
-      __typename?: "ProjectAlias";
-      alias: string;
-      gitTag: string;
-      id: string;
-      remotePath: string;
-      task: string;
-      taskTags: Array<string>;
-      variant: string;
-      variantTags: Array<string>;
-    }>
-  >;
-  projectRef?: Maybe<{
+  aliases?: Array<{
+    __typename?: "ProjectAlias";
+    alias: string;
+    gitTag: string;
+    id: string;
+    remotePath: string;
+    task: string;
+    taskTags: Array<string>;
+    variant: string;
+    variantTags: Array<string>;
+  }> | null;
+  projectRef?: {
     __typename?: "Project";
-    hidden?: Maybe<boolean>;
+    hidden?: boolean | null;
     identifier: string;
     repoRefId: string;
-    tracksPushEvents?: Maybe<boolean>;
-    versionControlEnabled?: Maybe<boolean>;
-    admins?: Maybe<Array<Maybe<string>>>;
-    restricted?: Maybe<boolean>;
+    tracksPushEvents?: boolean | null;
+    versionControlEnabled?: boolean | null;
+    admins?: Array<string | null> | null;
+    restricted?: boolean | null;
     batchTime: number;
     branch: string;
-    deactivatePrevious?: Maybe<boolean>;
-    disabledStatsCache?: Maybe<boolean>;
-    dispatchingDisabled?: Maybe<boolean>;
+    deactivatePrevious?: boolean | null;
+    disabledStatsCache?: boolean | null;
+    dispatchingDisabled?: boolean | null;
     displayName: string;
-    enabled?: Maybe<boolean>;
+    enabled?: boolean | null;
     owner: string;
-    patchingDisabled?: Maybe<boolean>;
+    patchingDisabled?: boolean | null;
     remotePath: string;
     repo: string;
-    repotrackerDisabled?: Maybe<boolean>;
+    repotrackerDisabled?: boolean | null;
     spawnHostScriptPath: string;
-    stepbackDisabled?: Maybe<boolean>;
-    notifyOnBuildFailure?: Maybe<boolean>;
-    githubTriggerAliases?: Maybe<Array<string>>;
-    perfEnabled?: Maybe<boolean>;
-    githubChecksEnabled?: Maybe<boolean>;
-    gitTagAuthorizedTeams?: Maybe<Array<string>>;
-    gitTagAuthorizedUsers?: Maybe<Array<string>>;
-    gitTagVersionsEnabled?: Maybe<boolean>;
-    manualPrTestingEnabled?: Maybe<boolean>;
-    prTestingEnabled?: Maybe<boolean>;
+    stepbackDisabled?: boolean | null;
+    notifyOnBuildFailure?: boolean | null;
+    githubTriggerAliases?: Array<string> | null;
+    perfEnabled?: boolean | null;
+    githubChecksEnabled?: boolean | null;
+    gitTagAuthorizedTeams?: Array<string> | null;
+    gitTagAuthorizedUsers?: Array<string> | null;
+    gitTagVersionsEnabled?: boolean | null;
+    manualPrTestingEnabled?: boolean | null;
+    prTestingEnabled?: boolean | null;
     taskSync: {
       __typename?: "TaskSyncOptions";
-      configEnabled?: Maybe<boolean>;
-      patchEnabled?: Maybe<boolean>;
+      configEnabled?: boolean | null;
+      patchEnabled?: boolean | null;
     };
-    banner?: Maybe<{
+    banner?: {
       __typename?: "ProjectBanner";
       text: string;
       theme: BannerTheme;
-    }>;
-    patchTriggerAliases?: Maybe<
-      Array<{
-        __typename?: "PatchTriggerAlias";
-        alias: string;
-        childProjectIdentifier: string;
-        parentAsModule?: Maybe<string>;
-        status?: Maybe<string>;
-        taskSpecifiers?: Maybe<
-          Array<{
-            __typename?: "TaskSpecifier";
-            patchAlias: string;
-            taskRegex: string;
-            variantRegex: string;
-          }>
-        >;
-      }>
-    >;
-    periodicBuilds?: Maybe<
-      Array<{
-        __typename?: "PeriodicBuild";
-        alias: string;
-        configFile: string;
-        id: string;
-        intervalHours: number;
-        message: string;
-        nextRunTime: Date;
-      }>
-    >;
+    } | null;
+    patchTriggerAliases?: Array<{
+      __typename?: "PatchTriggerAlias";
+      alias: string;
+      childProjectIdentifier: string;
+      parentAsModule?: string | null;
+      status?: string | null;
+      taskSpecifiers?: Array<{
+        __typename?: "TaskSpecifier";
+        patchAlias: string;
+        taskRegex: string;
+        variantRegex: string;
+      }> | null;
+    }> | null;
+    periodicBuilds?: Array<{
+      __typename?: "PeriodicBuild";
+      alias: string;
+      configFile: string;
+      cron: string;
+      id: string;
+      intervalHours: number;
+      message: string;
+      nextRunTime: Date;
+    }> | null;
     buildBaronSettings: {
       __typename?: "BuildBaronSettings";
       ticketCreateProject: string;
-      ticketSearchProjects?: Maybe<Array<string>>;
+      ticketSearchProjects?: Array<string> | null;
     };
-    externalLinks?: Maybe<
-      Array<{
-        __typename?: "ExternalLink";
-        displayName: string;
-        urlTemplate: string;
-      }>
-    >;
+    externalLinks?: Array<{
+      __typename?: "ExternalLink";
+      displayName: string;
+      urlTemplate: string;
+    }> | null;
     taskAnnotationSettings: {
       __typename?: "TaskAnnotationSettings";
       fileTicketWebhook: {
@@ -3775,123 +3723,115 @@ export type ProjectEventSettingsFragment = {
         endpoint: string;
         secret: string;
       };
-      jiraCustomFields?: Maybe<
-        Array<{ __typename?: "JiraField"; displayText: string; field: string }>
-      >;
+      jiraCustomFields?: Array<{
+        __typename?: "JiraField";
+        displayText: string;
+        field: string;
+      }> | null;
     };
-    triggers?: Maybe<
-      Array<{
-        __typename?: "TriggerAlias";
-        alias: string;
-        buildVariantRegex: string;
-        configFile: string;
-        dateCutoff?: Maybe<number>;
-        level: string;
-        project: string;
-        status: string;
-        taskRegex: string;
-      }>
-    >;
+    triggers?: Array<{
+      __typename?: "TriggerAlias";
+      alias: string;
+      buildVariantRegex: string;
+      configFile: string;
+      dateCutoff?: number | null;
+      level: string;
+      project: string;
+      status: string;
+      taskRegex: string;
+    }> | null;
     workstationConfig: {
       __typename?: "WorkstationConfig";
-      gitClone?: Maybe<boolean>;
-      setupCommands?: Maybe<
-        Array<{
-          __typename?: "WorkstationSetupCommand";
-          command: string;
-          directory: string;
-        }>
-      >;
+      gitClone?: boolean | null;
+      setupCommands?: Array<{
+        __typename?: "WorkstationSetupCommand";
+        command: string;
+        directory: string;
+      }> | null;
     };
     commitQueue: {
       __typename?: "CommitQueueParams";
-      enabled?: Maybe<boolean>;
+      enabled?: boolean | null;
       mergeMethod: string;
-      message: string;
-    };
-  }>;
-  subscriptions?: Maybe<
-    Array<{
-      __typename?: "GeneralSubscription";
-      id: string;
-      ownerType: string;
-      resourceType: string;
-      trigger: string;
-      triggerData?: Maybe<{ [key: string]: any }>;
-      regexSelectors: Array<{
-        __typename?: "Selector";
-        data: string;
-        type: string;
-      }>;
-      selectors: Array<{ __typename?: "Selector"; data: string; type: string }>;
-      subscriber?: Maybe<{
-        __typename?: "SubscriberWrapper";
-        type: string;
-        subscriber: {
-          __typename?: "Subscriber";
-          emailSubscriber?: Maybe<string>;
-          jiraCommentSubscriber?: Maybe<string>;
-          slackSubscriber?: Maybe<string>;
-          githubCheckSubscriber?: Maybe<{
-            __typename?: "GithubCheckSubscriber";
-            owner: string;
-            ref: string;
-            repo: string;
-          }>;
-          githubPRSubscriber?: Maybe<{
-            __typename?: "GithubPRSubscriber";
-            owner: string;
-            prNumber?: Maybe<number>;
-            ref: string;
-            repo: string;
-          }>;
-          jiraIssueSubscriber?: Maybe<{
-            __typename?: "JiraIssueSubscriber";
-            issueType: string;
-            project: string;
-          }>;
-          webhookSubscriber?: Maybe<{
-            __typename?: "WebhookSubscriber";
-            minDelayMs: number;
-            retries: number;
-            secret: string;
-            timeoutMs: number;
-            url: string;
-            headers: Array<
-              Maybe<{
-                __typename?: "WebhookHeader";
-                key: string;
-                value: string;
-              }>
-            >;
-          }>;
-        };
-      }>;
-    }>
-  >;
-  vars?: Maybe<{
+      message: string;
+    };
+  } | null;
+  subscriptions?: Array<{
+    __typename?: "GeneralSubscription";
+    id: string;
+    ownerType: string;
+    resourceType: string;
+    trigger: string;
+    triggerData?: { [key: string]: any } | null;
+    regexSelectors: Array<{
+      __typename?: "Selector";
+      data: string;
+      type: string;
+    }>;
+    selectors: Array<{ __typename?: "Selector"; data: string; type: string }>;
+    subscriber?: {
+      __typename?: "SubscriberWrapper";
+      type: string;
+      subscriber: {
+        __typename?: "Subscriber";
+        emailSubscriber?: string | null;
+        jiraCommentSubscriber?: string | null;
+        slackSubscriber?: string | null;
+        githubCheckSubscriber?: {
+          __typename?: "GithubCheckSubscriber";
+          owner: string;
+          ref: string;
+          repo: string;
+        } | null;
+        githubPRSubscriber?: {
+          __typename?: "GithubPRSubscriber";
+          owner: string;
+          prNumber?: number | null;
+          ref: string;
+          repo: string;
+        } | null;
+        jiraIssueSubscriber?: {
+          __typename?: "JiraIssueSubscriber";
+          issueType: string;
+          project: string;
+        } | null;
+        webhookSubscriber?: {
+          __typename?: "WebhookSubscriber";
+          minDelayMs: number;
+          retries: number;
+          secret: string;
+          timeoutMs: number;
+          url: string;
+          headers: Array<{
+            __typename?: "WebhookHeader";
+            key: string;
+            value: string;
+          } | null>;
+        } | null;
+      };
+    } | null;
+  }> | null;
+  vars?: {
     __typename?: "ProjectVars";
     adminOnlyVars: Array<string>;
     privateVars: Array<string>;
-    vars?: Maybe<{ [key: string]: any }>;
-  }>;
+    vars?: { [key: string]: any } | null;
+  } | null;
 };
 
 export type ProjectTriggersSettingsFragment = {
   __typename?: "Project";
-  triggers?: Maybe<
-    Array<{
-      __typename?: "TriggerAlias";
-      alias: string;
-      buildVariantRegex: string;
-      configFile: string;
-      dateCutoff?: Maybe<number>;
-      level: string;
-      project: string;
-      status: string;
-      taskRegex: string;
-    }>
-  >;
+  triggers?: Array<{
+    __typename?: "TriggerAlias";
+    alias: string;
+    buildVariantRegex: string;
+    configFile: string;
+    dateCutoff?: number | null;
+    level: string;
+    project: string;
+    status: string;
+    taskRegex: string;
+  }> | null;
 };
 
 export type RepoTriggersSettingsFragment = {
@@ -3901,7 +3841,7 @@ export type RepoTriggersSettingsFragment = {
     alias: string;
     buildVariantRegex: string;
     configFile: string;
-    dateCutoff?: Maybe<number>;
+    dateCutoff?: number | null;
     level: string;
     project: string;
     status: string;
@@ -3913,21 +3853,30 @@ export type VariablesFragment = {
   __typename?: "ProjectVars";
   adminOnlyVars: Array<string>;
   privateVars: Array<string>;
-  vars?: Maybe<{ [key: string]: any }>;
+  vars?: { [key: string]: any } | null;
+};
+
+export type ProjectViewsAndFiltersSettingsFragment = {
+  __typename?: "Project";
+  projectHealthView: ProjectHealthView;
+  parsleyFilters?: Array<{
+    __typename?: "ParsleyFilter";
+    caseSensitive: boolean;
+    exactMatch: boolean;
+    expression: string;
+  }> | null;
 };
 
 export type ProjectVirtualWorkstationSettingsFragment = {
   __typename?: "Project";
   workstationConfig: {
     __typename?: "WorkstationConfig";
-    gitClone?: Maybe<boolean>;
-    setupCommands?: Maybe<
-      Array<{
-        __typename?: "WorkstationSetupCommand";
-        command: string;
-        directory: string;
-      }>
-    >;
+    gitClone?: boolean | null;
+    setupCommands?: Array<{
+      __typename?: "WorkstationSetupCommand";
+      command: string;
+      directory: string;
+    }> | null;
   };
 };
 
@@ -3936,27 +3885,25 @@ export type RepoVirtualWorkstationSettingsFragment = {
   workstationConfig: {
     __typename?: "RepoWorkstationConfig";
     gitClone: boolean;
-    setupCommands?: Maybe<
-      Array<{
-        __typename?: "WorkstationSetupCommand";
-        command: string;
-        directory: string;
-      }>
-    >;
+    setupCommands?: Array<{
+      __typename?: "WorkstationSetupCommand";
+      command: string;
+      directory: string;
+    }> | null;
   };
 };
 
 export type UpstreamProjectFragment = {
   __typename?: "Version";
-  upstreamProject?: Maybe<{
+  upstreamProject?: {
     __typename?: "UpstreamProject";
     project: string;
     repo: string;
     triggerID: string;
     triggerType: string;
-    task?: Maybe<{ __typename?: "Task"; execution: number; id: string }>;
-    version?: Maybe<{ __typename?: "Version"; id: string }>;
-  }>;
+    task?: { __typename?: "Task"; execution: number; id: string } | null;
+    version?: { __typename?: "Version"; id: string } | null;
+  } | null;
 };
 
 export type AbortTaskMutationVariables = Exact<{
@@ -3967,13 +3914,13 @@ export type AbortTaskMutation = {
   __typename?: "Mutation";
   abortTask: {
     __typename?: "Task";
-    priority?: Maybe<number>;
+    priority?: number | null;
     buildVariant: string;
-    buildVariantDisplayName?: Maybe<string>;
+    buildVariantDisplayName?: string | null;
     displayName: string;
     execution: number;
     id: string;
-    revision?: Maybe<string>;
+    revision?: string | null;
     status: string;
   };
 };
@@ -4098,7 +4045,7 @@ export type DefaultSectionToRepoMutationVariables = Exact<{
 
 export type DefaultSectionToRepoMutation = {
   __typename?: "Mutation";
-  defaultSectionToRepo?: Maybe<string>;
+  defaultSectionToRepo?: string | null;
 };
 
 export type DeleteProjectMutationVariables = Exact<{
@@ -4110,6 +4057,15 @@ export type DeleteProjectMutation = {
   deleteProject: boolean;
 };
 
+export type DeleteSubscriptionsMutationVariables = Exact<{
+  subscriptionIds: Array<Scalars["String"]>;
+}>;
+
+export type DeleteSubscriptionsMutation = {
+  __typename?: "Mutation";
+  deleteSubscriptions: number;
+};
+
 export type DetachProjectFromRepoMutationVariables = Exact<{
   projectId: Scalars["String"];
 }>;
@@ -4158,11 +4114,11 @@ export type EditSpawnHostMutation = {
   __typename?: "Mutation";
   editSpawnHost: {
     __typename?: "Host";
-    availabilityZone?: Maybe<string>;
-    displayName?: Maybe<string>;
-    expiration?: Maybe<Date>;
-    homeVolumeID?: Maybe<string>;
-    instanceType?: Maybe<string>;
+    availabilityZone?: string | null;
+    displayName?: string | null;
+    expiration?: Date | null;
+    homeVolumeID?: string | null;
+    instanceType?: string | null;
     noExpiration: boolean;
     hostUrl: string;
     id: string;
@@ -4170,21 +4126,21 @@ export type EditSpawnHostMutation = {
     startedBy: string;
     status: string;
     tag: string;
-    uptime?: Maybe<Date>;
-    user?: Maybe<string>;
-    distro?: Maybe<{
+    uptime?: Date | null;
+    user?: string | null;
+    distro?: {
       __typename?: "DistroInfo";
-      id?: Maybe<string>;
-      isVirtualWorkStation?: Maybe<boolean>;
-      isWindows?: Maybe<boolean>;
-      user?: Maybe<string>;
-      workDir?: Maybe<string>;
-    }>;
-    homeVolume?: Maybe<{
+      id?: string | null;
+      isVirtualWorkStation?: boolean | null;
+      isWindows?: boolean | null;
+      user?: string | null;
+      workDir?: string | null;
+    } | null;
+    homeVolume?: {
       __typename?: "Volume";
       displayName: string;
       id: string;
-    }>;
+    } | null;
     instanceTags: Array<{
       __typename?: "InstanceTag";
       canBeModified: boolean;
@@ -4311,7 +4267,7 @@ export type RemoveItemFromCommitQueueMutationVariables = Exact<{
 
 export type RemoveItemFromCommitQueueMutation = {
   __typename?: "Mutation";
-  removeItemFromCommitQueue?: Maybe<string>;
+  removeItemFromCommitQueue?: string | null;
 };
 
 export type RemovePublicKeyMutationVariables = Exact<{
@@ -4366,10 +4322,10 @@ export type RestartTaskMutation = {
     execution: number;
     latestExecution: number;
     buildVariant: string;
-    buildVariantDisplayName?: Maybe<string>;
+    buildVariantDisplayName?: string | null;
     displayName: string;
     id: string;
-    revision?: Maybe<string>;
+    revision?: string | null;
     status: string;
   };
 };
@@ -4382,22 +4338,22 @@ export type RestartVersionsMutationVariables = Exact<{
 
 export type RestartVersionsMutation = {
   __typename?: "Mutation";
-  restartVersions?: Maybe<
-    Array<{
-      __typename?: "Version";
+  restartVersions?: Array<{
+    __typename?: "Version";
+    id: string;
+    status: string;
+    taskStatuses: Array<string>;
+    patch?: {
+      __typename?: "Patch";
       id: string;
       status: string;
-      taskStatuses: Array<string>;
-      patch?: Maybe<{
+      childPatches?: Array<{
         __typename?: "Patch";
         id: string;
         status: string;
-        childPatches?: Maybe<
-          Array<{ __typename?: "Patch"; id: string; status: string }>
-        >;
-      }>;
-    }>
-  >;
+      }> | null;
+    } | null;
+  }> | null;
 };
 
 export type SaveProjectSettingsForSectionMutationVariables = Exact<{
@@ -4409,11 +4365,11 @@ export type SaveProjectSettingsForSectionMutation = {
   __typename?: "Mutation";
   saveProjectSettingsForSection: {
     __typename?: "ProjectSettings";
-    projectRef?: Maybe<{
+    projectRef?: {
       __typename?: "Project";
       id: string;
       identifier: string;
-    }>;
+    } | null;
   };
 };
 
@@ -4426,7 +4382,7 @@ export type SaveRepoSettingsForSectionMutation = {
   __typename?: "Mutation";
   saveRepoSettingsForSection: {
     __typename?: "RepoSettings";
-    projectRef?: Maybe<{ __typename?: "RepoRef"; id: string }>;
+    projectRef?: { __typename?: "RepoRef"; id: string } | null;
   };
 };
 
@@ -4451,17 +4407,19 @@ export type SchedulePatchMutation = {
     tasks: Array<string>;
     variants: Array<string>;
     activated: boolean;
-    alias?: Maybe<string>;
+    alias?: string | null;
     author: string;
-    commitQueuePosition?: Maybe<number>;
+    commitQueuePosition?: number | null;
     description: string;
     id: string;
     status: string;
-    versionFull?: Maybe<{ __typename?: "Version"; id: string }>;
+    versionFull?: { __typename?: "Version"; id: string } | null;
     parameters: Array<{ __typename?: "Parameter"; key: string; value: string }>;
-    variantsTasks: Array<
-      Maybe<{ __typename?: "VariantTask"; name: string; tasks: Array<string> }>
-    >;
+    variantsTasks: Array<{
+      __typename?: "VariantTask";
+      name: string;
+      tasks: Array<string>;
+    } | null>;
   };
 };
 
@@ -4474,11 +4432,11 @@ export type ScheduleTasksMutation = {
   scheduleTasks: Array<{
     __typename?: "Task";
     buildVariant: string;
-    buildVariantDisplayName?: Maybe<string>;
+    buildVariantDisplayName?: string | null;
     displayName: string;
     execution: number;
     id: string;
-    revision?: Maybe<string>;
+    revision?: string | null;
     status: string;
   }>;
 };
@@ -4489,14 +4447,12 @@ export type ScheduleUndispatchedBaseTasksMutationVariables = Exact<{
 
 export type ScheduleUndispatchedBaseTasksMutation = {
   __typename?: "Mutation";
-  scheduleUndispatchedBaseTasks?: Maybe<
-    Array<{
-      __typename?: "Task";
-      execution: number;
-      id: string;
-      status: string;
-    }>
-  >;
+  scheduleUndispatchedBaseTasks?: Array<{
+    __typename?: "Task";
+    execution: number;
+    id: string;
+    status: string;
+  }> | null;
 };
 
 export type SetPatchPriorityMutationVariables = Exact<{
@@ -4506,7 +4462,7 @@ export type SetPatchPriorityMutationVariables = Exact<{
 
 export type SetPatchPriorityMutation = {
   __typename?: "Mutation";
-  setPatchPriority?: Maybe<string>;
+  setPatchPriority?: string | null;
 };
 
 export type SetPatchVisibilityMutationVariables = Exact<{
@@ -4530,7 +4486,7 @@ export type SetTaskPriorityMutation = {
     __typename?: "Task";
     execution: number;
     id: string;
-    priority?: Maybe<number>;
+    priority?: number | null;
   };
 };
 
@@ -4559,7 +4515,7 @@ export type UnschedulePatchTasksMutationVariables = Exact<{
 
 export type UnschedulePatchTasksMutation = {
   __typename?: "Mutation";
-  unschedulePatchTasks?: Maybe<string>;
+  unschedulePatchTasks?: string | null;
 };
 
 export type UnscheduleTaskMutationVariables = Exact<{
@@ -4582,6 +4538,31 @@ export type UpdateHostStatusMutation = {
   updateHostStatus: number;
 };
 
+export type UpdatePatchDescriptionMutationVariables = Exact<{
+  patchId: Scalars["String"];
+  description: Scalars["String"];
+}>;
+
+export type UpdatePatchDescriptionMutation = {
+  __typename?: "Mutation";
+  schedulePatch: {
+    __typename?: "Patch";
+    activated: boolean;
+    alias?: string | null;
+    author: string;
+    commitQueuePosition?: number | null;
+    description: string;
+    id: string;
+    status: string;
+    parameters: Array<{ __typename?: "Parameter"; key: string; value: string }>;
+    variantsTasks: Array<{
+      __typename?: "VariantTask";
+      name: string;
+      tasks: Array<string>;
+    } | null>;
+  };
+};
+
 export type UpdatePublicKeyMutationVariables = Exact<{
   targetKeyName: Scalars["String"];
   updateInfo: PublicKeyInput;
@@ -4628,7 +4609,7 @@ export type AwsRegionsQueryVariables = Exact<{ [key: string]: never }>;
 
 export type AwsRegionsQuery = {
   __typename?: "Query";
-  awsRegions?: Maybe<Array<string>>;
+  awsRegions?: Array<string> | null;
 };
 
 export type DistroTaskQueueQueryVariables = Exact<{
@@ -4656,7 +4637,7 @@ export type FailedTaskStatusIconTooltipQueryVariables = Exact<{
 
 export type FailedTaskStatusIconTooltipQuery = {
   __typename?: "Query";
-  task?: Maybe<{
+  task?: {
     __typename?: "Task";
     execution: number;
     id: string;
@@ -4669,7 +4650,7 @@ export type FailedTaskStatusIconTooltipQuery = {
         testFile: string;
       }>;
     };
-  }>;
+  } | null;
 };
 
 export type AgentLogsQueryVariables = Exact<{
@@ -4679,7 +4660,7 @@ export type AgentLogsQueryVariables = Exact<{
 
 export type AgentLogsQuery = {
   __typename?: "Query";
-  task?: Maybe<{
+  task?: {
     __typename?: "Task";
     execution: number;
     id: string;
@@ -4687,12 +4668,12 @@ export type AgentLogsQuery = {
       __typename?: "TaskLogs";
       agentLogs: Array<{
         __typename?: "LogMessage";
-        message?: Maybe<string>;
-        severity?: Maybe<string>;
-        timestamp?: Maybe<Date>;
+        message?: string | null;
+        severity?: string | null;
+        timestamp?: Date | null;
       }>;
     };
-  }>;
+  } | null;
 };
 
 export type AllLogsQueryVariables = Exact<{
@@ -4702,7 +4683,7 @@ export type AllLogsQueryVariables = Exact<{
 
 export type AllLogsQuery = {
   __typename?: "Query";
-  task?: Maybe<{
+  task?: {
     __typename?: "Task";
     execution: number;
     id: string;
@@ -4710,12 +4691,12 @@ export type AllLogsQuery = {
       __typename?: "TaskLogs";
       allLogs: Array<{
         __typename?: "LogMessage";
-        message?: Maybe<string>;
-        severity?: Maybe<string>;
-        timestamp?: Maybe<Date>;
+        message?: string | null;
+        severity?: string | null;
+        timestamp?: Date | null;
       }>;
     };
-  }>;
+  } | null;
 };
 
 export type AnnotationEventDataQueryVariables = Exact<{
@@ -4725,50 +4706,44 @@ export type AnnotationEventDataQueryVariables = Exact<{
 
 export type AnnotationEventDataQuery = {
   __typename?: "Query";
-  task?: Maybe<{
+  task?: {
     __typename?: "Task";
     execution: number;
     id: string;
-    annotation?: Maybe<{
+    annotation?: {
       __typename?: "Annotation";
       id: string;
       taskExecution: number;
       taskId: string;
       webhookConfigured: boolean;
-      createdIssues?: Maybe<
-        Array<
-          Maybe<{
-            __typename?: "IssueLink";
-            issueKey?: Maybe<string>;
-            url?: Maybe<string>;
-            source?: Maybe<{
-              __typename?: "Source";
-              author: string;
-              requester: string;
-              time: Date;
-            }>;
-          }>
-        >
-      >;
-      issues?: Maybe<
-        Array<
-          Maybe<{
-            __typename?: "IssueLink";
-            issueKey?: Maybe<string>;
-            url?: Maybe<string>;
-            source?: Maybe<{
-              __typename?: "Source";
-              author: string;
-              requester: string;
-              time: Date;
-            }>;
-          }>
-        >
-      >;
-      metadataLinks?: Maybe<
-        Array<Maybe<{ __typename?: "MetadataLink"; text: string; url: string }>>
-      >;
-      note?: Maybe<{
+      createdIssues?: Array<{
+        __typename?: "IssueLink";
+        issueKey?: string | null;
+        url?: string | null;
+        source?: {
+          __typename?: "Source";
+          author: string;
+          requester: string;
+          time: Date;
+        } | null;
+      } | null> | null;
+      issues?: Array<{
+        __typename?: "IssueLink";
+        issueKey?: string | null;
+        url?: string | null;
+        source?: {
+          __typename?: "Source";
+          author: string;
+          requester: string;
+          time: Date;
+        } | null;
+      } | null> | null;
+      metadataLinks?: Array<{
+        __typename?: "MetadataLink";
+        text: string;
+        url: string;
+      } | null> | null;
+      note?: {
         __typename?: "Note";
         message: string;
         source: {
@@ -4777,24 +4752,20 @@ export type AnnotationEventDataQuery = {
           requester: string;
           time: Date;
         };
-      }>;
-      suspectedIssues?: Maybe<
-        Array<
-          Maybe<{
-            __typename?: "IssueLink";
-            issueKey?: Maybe<string>;
-            url?: Maybe<string>;
-            source?: Maybe<{
-              __typename?: "Source";
-              author: string;
-              requester: string;
-              time: Date;
-            }>;
-          }>
-        >
-      >;
-    }>;
-  }>;
+      } | null;
+      suspectedIssues?: Array<{
+        __typename?: "IssueLink";
+        issueKey?: string | null;
+        url?: string | null;
+        source?: {
+          __typename?: "Source";
+          author: string;
+          requester: string;
+          time: Date;
+        } | null;
+      } | null> | null;
+    } | null;
+  } | null;
 };
 
 export type BaseVersionAndTaskQueryVariables = Exact<{
@@ -4803,30 +4774,30 @@ export type BaseVersionAndTaskQueryVariables = Exact<{
 
 export type BaseVersionAndTaskQuery = {
   __typename?: "Query";
-  task?: Maybe<{
+  task?: {
     __typename?: "Task";
     buildVariant: string;
     displayName: string;
     execution: number;
     id: string;
-    baseTask?: Maybe<{
+    baseTask?: {
       __typename?: "Task";
       execution: number;
       id: string;
       status: string;
-    }>;
+    } | null;
     versionMetadata: {
       __typename?: "Version";
       id: string;
       isPatch: boolean;
-      baseVersion?: Maybe<{
+      baseVersion?: {
         __typename?: "Version";
         id: string;
         order: number;
         projectIdentifier: string;
-      }>;
+      } | null;
     };
-  }>;
+  } | null;
 };
 
 export type BuildBaronConfiguredQueryVariables = Exact<{
@@ -4850,7 +4821,7 @@ export type BuildBaronQuery = {
     __typename?: "BuildBaron";
     bbTicketCreationDefined: boolean;
     buildBaronConfigured: boolean;
-    searchReturnInfo?: Maybe<{
+    searchReturnInfo?: {
       __typename?: "SearchReturnInfo";
       featuresURL: string;
       search: string;
@@ -4860,15 +4831,15 @@ export type BuildBaronQuery = {
         key: string;
         fields: {
           __typename?: "TicketFields";
-          assigneeDisplayName?: Maybe<string>;
+          assigneeDisplayName?: string | null;
           created: string;
-          resolutionName?: Maybe<string>;
+          resolutionName?: string | null;
           summary: string;
           updated: string;
           status: { __typename?: "JiraStatus"; id: string; name: string };
         };
       }>;
-    }>;
+    } | null;
   };
 };
 
@@ -4881,18 +4852,16 @@ export type BuildVariantStatsQuery = {
   version: {
     __typename?: "Version";
     id: string;
-    buildVariantStats?: Maybe<
-      Array<{
-        __typename?: "GroupedTaskStatusCount";
-        displayName: string;
-        variant: string;
-        statusCounts: Array<{
-          __typename?: "StatusCount";
-          count: number;
-          status: string;
-        }>;
-      }>
-    >;
+    buildVariantStats?: Array<{
+      __typename?: "GroupedTaskStatusCount";
+      displayName: string;
+      variant: string;
+      statusCounts: Array<{
+        __typename?: "StatusCount";
+        count: number;
+        status: string;
+      }>;
+    }> | null;
   };
 };
 
@@ -4903,15 +4872,11 @@ export type BuildVariantsForTaskNameQueryVariables = Exact<{
 
 export type BuildVariantsForTaskNameQuery = {
   __typename?: "Query";
-  buildVariantsForTaskName?: Maybe<
-    Array<
-      Maybe<{
-        __typename?: "BuildVariantTuple";
-        buildVariant: string;
-        displayName: string;
-      }>
-    >
-  >;
+  buildVariantsForTaskName?: Array<{
+    __typename?: "BuildVariantTuple";
+    buildVariant: string;
+    displayName: string;
+  } | null> | null;
 };
 
 export type BuildVariantsWithChildrenQueryVariables = Exact<{
@@ -4923,58 +4888,38 @@ export type BuildVariantsWithChildrenQuery = {
   version: {
     __typename?: "Version";
     id: string;
-    buildVariants?: Maybe<
-      Array<
-        Maybe<{
-          __typename?: "GroupedBuildVariant";
+    buildVariants?: Array<{
+      __typename?: "GroupedBuildVariant";
+      displayName: string;
+      variant: string;
+      tasks?: Array<{
+        __typename?: "Task";
+        baseStatus?: string | null;
+        displayName: string;
+        execution: number;
+        id: string;
+        status: string;
+      } | null> | null;
+    } | null> | null;
+    childVersions?: Array<{
+      __typename?: "Version";
+      id: string;
+      project: string;
+      projectIdentifier: string;
+      buildVariants?: Array<{
+        __typename?: "GroupedBuildVariant";
+        displayName: string;
+        variant: string;
+        tasks?: Array<{
+          __typename?: "Task";
+          baseStatus?: string | null;
           displayName: string;
-          variant: string;
-          tasks?: Maybe<
-            Array<
-              Maybe<{
-                __typename?: "Task";
-                baseStatus?: Maybe<string>;
-                displayName: string;
-                execution: number;
-                id: string;
-                status: string;
-              }>
-            >
-          >;
-        }>
-      >
-    >;
-    childVersions?: Maybe<
-      Array<
-        Maybe<{
-          __typename?: "Version";
+          execution: number;
           id: string;
-          project: string;
-          projectIdentifier: string;
-          buildVariants?: Maybe<
-            Array<
-              Maybe<{
-                __typename?: "GroupedBuildVariant";
-                displayName: string;
-                variant: string;
-                tasks?: Maybe<
-                  Array<
-                    Maybe<{
-                      __typename?: "Task";
-                      baseStatus?: Maybe<string>;
-                      displayName: string;
-                      execution: number;
-                      id: string;
-                      status: string;
-                    }>
-                  >
-                >;
-              }>
-            >
-          >;
-        }>
-      >
-    >;
+          status: string;
+        } | null> | null;
+      } | null> | null;
+    } | null> | null;
   };
 };
 
@@ -4982,19 +4927,17 @@ export type ClientConfigQueryVariables = Exact<{ [key: string]: never }>;
 
 export type ClientConfigQuery = {
   __typename?: "Query";
-  clientConfig?: Maybe<{
+  clientConfig?: {
     __typename?: "ClientConfig";
-    latestRevision?: Maybe<string>;
-    clientBinaries?: Maybe<
-      Array<{
-        __typename?: "ClientBinary";
-        arch?: Maybe<string>;
-        displayName?: Maybe<string>;
-        os?: Maybe<string>;
-        url?: Maybe<string>;
-      }>
-    >;
-  }>;
+    latestRevision?: string | null;
+    clientBinaries?: Array<{
+      __typename?: "ClientBinary";
+      arch?: string | null;
+      displayName?: string | null;
+      os?: string | null;
+      url?: string | null;
+    }> | null;
+  } | null;
 };
 
 export type CodeChangesQueryVariables = Exact<{
@@ -5031,39 +4974,37 @@ export type CommitQueueQuery = {
   __typename?: "Query";
   commitQueue: {
     __typename?: "CommitQueue";
-    message?: Maybe<string>;
-    owner?: Maybe<string>;
-    projectId?: Maybe<string>;
-    repo?: Maybe<string>;
-    queue?: Maybe<
-      Array<{
-        __typename?: "CommitQueueItem";
-        enqueueTime?: Maybe<Date>;
-        issue?: Maybe<string>;
-        patch?: Maybe<{
-          __typename?: "Patch";
-          activated: boolean;
-          author: string;
-          description: string;
-          id: string;
-          moduleCodeChanges: Array<{
-            __typename?: "ModuleCodeChange";
-            branchName: string;
-            htmlLink: string;
-            rawLink: string;
-            fileDiffs: Array<{
-              __typename?: "FileDiff";
-              additions: number;
-              deletions: number;
-              description: string;
-              diffLink: string;
-              fileName: string;
-            }>;
+    message?: string | null;
+    owner?: string | null;
+    projectId?: string | null;
+    repo?: string | null;
+    queue?: Array<{
+      __typename?: "CommitQueueItem";
+      enqueueTime?: Date | null;
+      issue?: string | null;
+      patch?: {
+        __typename?: "Patch";
+        activated: boolean;
+        author: string;
+        description: string;
+        id: string;
+        moduleCodeChanges: Array<{
+          __typename?: "ModuleCodeChange";
+          branchName: string;
+          htmlLink: string;
+          rawLink: string;
+          fileDiffs: Array<{
+            __typename?: "FileDiff";
+            additions: number;
+            deletions: number;
+            description: string;
+            diffLink: string;
+            fileName: string;
           }>;
-          versionFull?: Maybe<{ __typename?: "Version"; id: string }>;
         }>;
-      }>
-    >;
+        versionFull?: { __typename?: "Version"; id: string } | null;
+      } | null;
+    }> | null;
   };
 };
 
@@ -5078,9 +5019,9 @@ export type CreatedTicketsQuery = {
     key: string;
     fields: {
       __typename?: "TicketFields";
-      assigneeDisplayName?: Maybe<string>;
+      assigneeDisplayName?: string | null;
       created: string;
-      resolutionName?: Maybe<string>;
+      resolutionName?: string | null;
       summary: string;
       updated: string;
       status: { __typename?: "JiraStatus"; id: string; name: string };
@@ -5095,14 +5036,14 @@ export type DisplayTaskQueryVariables = Exact<{
 
 export type DisplayTaskQuery = {
   __typename?: "Query";
-  task?: Maybe<{
+  task?: {
     __typename?: "Task";
     displayName: string;
     execution: number;
-    executionTasks?: Maybe<Array<string>>;
+    executionTasks?: Array<string> | null;
     id: string;
-    displayTask?: Maybe<{ __typename?: "Task"; execution: number; id: string }>;
-  }>;
+    displayTask?: { __typename?: "Task"; execution: number; id: string } | null;
+  } | null;
 };
 
 export type DistrosQueryVariables = Exact<{
@@ -5111,23 +5052,21 @@ export type DistrosQueryVariables = Exact<{
 
 export type DistrosQuery = {
   __typename?: "Query";
-  distros: Array<
-    Maybe<{
-      __typename?: "Distro";
-      isVirtualWorkStation: boolean;
-      name?: Maybe<string>;
-    }>
-  >;
+  distros: Array<{
+    __typename?: "Distro";
+    isVirtualWorkStation: boolean;
+    name?: string | null;
+  } | null>;
 };
 
 export type GithubOrgsQueryVariables = Exact<{ [key: string]: never }>;
 
 export type GithubOrgsQuery = {
   __typename?: "Query";
-  spruceConfig?: Maybe<{
+  spruceConfig?: {
     __typename?: "SpruceConfig";
     githubOrgs: Array<string>;
-  }>;
+  } | null;
 };
 
 export type GithubProjectConflictsQueryVariables = Exact<{
@@ -5138,9 +5077,9 @@ export type GithubProjectConflictsQuery = {
   __typename?: "Query";
   githubProjectConflicts: {
     __typename?: "GithubProjectConflicts";
-    commitCheckIdentifiers?: Maybe<Array<string>>;
-    commitQueueIdentifiers?: Maybe<Array<string>>;
-    prTestingIdentifiers?: Maybe<Array<string>>;
+    commitCheckIdentifiers?: Array<string> | null;
+    commitQueueIdentifiers?: Array<string> | null;
+    prTestingIdentifiers?: Array<string> | null;
   };
 };
 
@@ -5164,12 +5103,12 @@ export type HostEventsQuery = {
     count: number;
     eventLogEntries: Array<{
       __typename?: "HostEventLogEntry";
-      eventType?: Maybe<string>;
+      eventType?: string | null;
       id: string;
       processedAt: Date;
       resourceId: string;
       resourceType: string;
-      timestamp?: Maybe<Date>;
+      timestamp?: Date | null;
       data: {
         __typename?: "HostEventLogData";
         agentBuild: string;
@@ -5177,6 +5116,7 @@ export type HostEventsQuery = {
         duration: number;
         execution: string;
         hostname: string;
+        jasperRevision: string;
         logs: string;
         monitorOp: string;
         newStatus: string;
@@ -5198,30 +5138,30 @@ export type HostQueryVariables = Exact<{
 
 export type HostQuery = {
   __typename?: "Query";
-  host?: Maybe<{
+  host?: {
     __typename?: "Host";
-    ami?: Maybe<string>;
-    distroId?: Maybe<string>;
-    lastCommunicationTime?: Maybe<Date>;
+    ami?: string | null;
+    distroId?: string | null;
+    lastCommunicationTime?: Date | null;
     hostUrl: string;
     id: string;
     provider: string;
     startedBy: string;
     status: string;
     tag: string;
-    uptime?: Maybe<Date>;
-    user?: Maybe<string>;
-    distro?: Maybe<{
+    uptime?: Date | null;
+    user?: string | null;
+    distro?: {
       __typename?: "DistroInfo";
-      bootstrapMethod?: Maybe<string>;
-      id?: Maybe<string>;
-    }>;
-    runningTask?: Maybe<{
+      bootstrapMethod?: string | null;
+      id?: string | null;
+    } | null;
+    runningTask?: {
       __typename?: "TaskInfo";
-      id?: Maybe<string>;
-      name?: Maybe<string>;
-    }>;
-  }>;
+      id?: string | null;
+      name?: string | null;
+    } | null;
+  } | null;
 };
 
 export type InstanceTypesQueryVariables = Exact<{ [key: string]: never }>;
@@ -5240,7 +5180,7 @@ export type IsPatchConfiguredQuery = {
   patch: {
     __typename?: "Patch";
     activated: boolean;
-    alias?: Maybe<string>;
+    alias?: string | null;
     id: string;
     projectID: string;
   };
@@ -5253,45 +5193,41 @@ export type CustomCreatedIssuesQueryVariables = Exact<{
 
 export type CustomCreatedIssuesQuery = {
   __typename?: "Query";
-  task?: Maybe<{
+  task?: {
     __typename?: "Task";
     execution: number;
     id: string;
-    annotation?: Maybe<{
+    annotation?: {
       __typename?: "Annotation";
       id: string;
-      createdIssues?: Maybe<
-        Array<
-          Maybe<{
-            __typename?: "IssueLink";
-            confidenceScore?: Maybe<number>;
-            issueKey?: Maybe<string>;
-            url?: Maybe<string>;
-            jiraTicket?: Maybe<{
-              __typename?: "JiraTicket";
-              key: string;
-              fields: {
-                __typename?: "TicketFields";
-                assignedTeam?: Maybe<string>;
-                assigneeDisplayName?: Maybe<string>;
-                created: string;
-                resolutionName?: Maybe<string>;
-                summary: string;
-                updated: string;
-                status: { __typename?: "JiraStatus"; id: string; name: string };
-              };
-            }>;
-            source?: Maybe<{
-              __typename?: "Source";
-              author: string;
-              requester: string;
-              time: Date;
-            }>;
-          }>
-        >
-      >;
-    }>;
-  }>;
+      createdIssues?: Array<{
+        __typename?: "IssueLink";
+        confidenceScore?: number | null;
+        issueKey?: string | null;
+        url?: string | null;
+        jiraTicket?: {
+          __typename?: "JiraTicket";
+          key: string;
+          fields: {
+            __typename?: "TicketFields";
+            assignedTeam?: string | null;
+            assigneeDisplayName?: string | null;
+            created: string;
+            resolutionName?: string | null;
+            summary: string;
+            updated: string;
+            status: { __typename?: "JiraStatus"; id: string; name: string };
+          };
+        } | null;
+        source?: {
+          __typename?: "Source";
+          author: string;
+          requester: string;
+          time: Date;
+        } | null;
+      } | null> | null;
+    } | null;
+  } | null;
 };
 
 export type IssuesQueryVariables = Exact<{
@@ -5301,45 +5237,41 @@ export type IssuesQueryVariables = Exact<{
 
 export type IssuesQuery = {
   __typename?: "Query";
-  task?: Maybe<{
+  task?: {
     __typename?: "Task";
     execution: number;
     id: string;
-    annotation?: Maybe<{
+    annotation?: {
       __typename?: "Annotation";
       id: string;
-      issues?: Maybe<
-        Array<
-          Maybe<{
-            __typename?: "IssueLink";
-            confidenceScore?: Maybe<number>;
-            issueKey?: Maybe<string>;
-            url?: Maybe<string>;
-            jiraTicket?: Maybe<{
-              __typename?: "JiraTicket";
-              key: string;
-              fields: {
-                __typename?: "TicketFields";
-                assignedTeam?: Maybe<string>;
-                assigneeDisplayName?: Maybe<string>;
-                created: string;
-                resolutionName?: Maybe<string>;
-                summary: string;
-                updated: string;
-                status: { __typename?: "JiraStatus"; id: string; name: string };
-              };
-            }>;
-            source?: Maybe<{
-              __typename?: "Source";
-              author: string;
-              requester: string;
-              time: Date;
-            }>;
-          }>
-        >
-      >;
-    }>;
-  }>;
+      issues?: Array<{
+        __typename?: "IssueLink";
+        confidenceScore?: number | null;
+        issueKey?: string | null;
+        url?: string | null;
+        jiraTicket?: {
+          __typename?: "JiraTicket";
+          key: string;
+          fields: {
+            __typename?: "TicketFields";
+            assignedTeam?: string | null;
+            assigneeDisplayName?: string | null;
+            created: string;
+            resolutionName?: string | null;
+            summary: string;
+            updated: string;
+            status: { __typename?: "JiraStatus"; id: string; name: string };
+          };
+        } | null;
+        source?: {
+          __typename?: "Source";
+          author: string;
+          requester: string;
+          time: Date;
+        } | null;
+      } | null> | null;
+    } | null;
+  } | null;
 };
 
 export type SuspectedIssuesQueryVariables = Exact<{
@@ -5349,45 +5281,41 @@ export type SuspectedIssuesQueryVariables = Exact<{
 
 export type SuspectedIssuesQuery = {
   __typename?: "Query";
-  task?: Maybe<{
+  task?: {
     __typename?: "Task";
     execution: number;
     id: string;
-    annotation?: Maybe<{
+    annotation?: {
       __typename?: "Annotation";
       id: string;
-      suspectedIssues?: Maybe<
-        Array<
-          Maybe<{
-            __typename?: "IssueLink";
-            confidenceScore?: Maybe<number>;
-            issueKey?: Maybe<string>;
-            url?: Maybe<string>;
-            jiraTicket?: Maybe<{
-              __typename?: "JiraTicket";
-              key: string;
-              fields: {
-                __typename?: "TicketFields";
-                assignedTeam?: Maybe<string>;
-                assigneeDisplayName?: Maybe<string>;
-                created: string;
-                resolutionName?: Maybe<string>;
-                summary: string;
-                updated: string;
-                status: { __typename?: "JiraStatus"; id: string; name: string };
-              };
-            }>;
-            source?: Maybe<{
-              __typename?: "Source";
-              author: string;
-              requester: string;
-              time: Date;
-            }>;
-          }>
-        >
-      >;
-    }>;
-  }>;
+      suspectedIssues?: Array<{
+        __typename?: "IssueLink";
+        confidenceScore?: number | null;
+        issueKey?: string | null;
+        url?: string | null;
+        jiraTicket?: {
+          __typename?: "JiraTicket";
+          key: string;
+          fields: {
+            __typename?: "TicketFields";
+            assignedTeam?: string | null;
+            assigneeDisplayName?: string | null;
+            created: string;
+            resolutionName?: string | null;
+            summary: string;
+            updated: string;
+            status: { __typename?: "JiraStatus"; id: string; name: string };
+          };
+        } | null;
+        source?: {
+          __typename?: "Source";
+          author: string;
+          requester: string;
+          time: Date;
+        } | null;
+      } | null> | null;
+    } | null;
+  } | null;
 };
 
 export type LastMainlineCommitQueryVariables = Exact<{
@@ -5398,33 +5326,25 @@ export type LastMainlineCommitQueryVariables = Exact<{
 
 export type LastMainlineCommitQuery = {
   __typename?: "Query";
-  mainlineCommits?: Maybe<{
+  mainlineCommits?: {
     __typename?: "MainlineCommits";
     versions: Array<{
       __typename?: "MainlineCommitVersion";
-      version?: Maybe<{
+      version?: {
         __typename?: "Version";
         id: string;
-        buildVariants?: Maybe<
-          Array<
-            Maybe<{
-              __typename?: "GroupedBuildVariant";
-              tasks?: Maybe<
-                Array<
-                  Maybe<{
-                    __typename?: "Task";
-                    execution: number;
-                    id: string;
-                    status: string;
-                  }>
-                >
-              >;
-            }>
-          >
-        >;
-      }>;
+        buildVariants?: Array<{
+          __typename?: "GroupedBuildVariant";
+          tasks?: Array<{
+            __typename?: "Task";
+            execution: number;
+            id: string;
+            status: string;
+          } | null> | null;
+        } | null> | null;
+      } | null;
     }>;
-  }>;
+  } | null;
 };
 
 export type LogkeeperBuildMetadataQueryVariables = Exact<{
@@ -5451,37 +5371,13 @@ export type MainlineCommitsForHistoryQueryVariables = Exact<{
 
 export type MainlineCommitsForHistoryQuery = {
   __typename?: "Query";
-  mainlineCommits?: Maybe<{
+  mainlineCommits?: {
     __typename?: "MainlineCommits";
-    nextPageOrderNumber?: Maybe<number>;
-    prevPageOrderNumber?: Maybe<number>;
+    nextPageOrderNumber?: number | null;
+    prevPageOrderNumber?: number | null;
     versions: Array<{
       __typename?: "MainlineCommitVersion";
-      rolledUpVersions?: Maybe<
-        Array<{
-          __typename?: "Version";
-          author: string;
-          createTime: Date;
-          id: string;
-          message: string;
-          order: number;
-          revision: string;
-          upstreamProject?: Maybe<{
-            __typename?: "UpstreamProject";
-            project: string;
-            repo: string;
-            triggerID: string;
-            triggerType: string;
-            task?: Maybe<{
-              __typename?: "Task";
-              execution: number;
-              id: string;
-            }>;
-            version?: Maybe<{ __typename?: "Version"; id: string }>;
-          }>;
-        }>
-      >;
-      version?: Maybe<{
+      rolledUpVersions?: Array<{
         __typename?: "Version";
         author: string;
         createTime: Date;
@@ -5489,38 +5385,48 @@ export type MainlineCommitsForHistoryQuery = {
         message: string;
         order: number;
         revision: string;
-        buildVariants?: Maybe<
-          Array<
-            Maybe<{
-              __typename?: "GroupedBuildVariant";
-              displayName: string;
-              variant: string;
-              tasks?: Maybe<
-                Array<
-                  Maybe<{
-                    __typename?: "Task";
-                    displayName: string;
-                    execution: number;
-                    id: string;
-                    status: string;
-                  }>
-                >
-              >;
-            }>
-          >
-        >;
-        upstreamProject?: Maybe<{
+        upstreamProject?: {
           __typename?: "UpstreamProject";
           project: string;
           repo: string;
           triggerID: string;
           triggerType: string;
-          task?: Maybe<{ __typename?: "Task"; execution: number; id: string }>;
-          version?: Maybe<{ __typename?: "Version"; id: string }>;
-        }>;
-      }>;
+          task?: { __typename?: "Task"; execution: number; id: string } | null;
+          version?: { __typename?: "Version"; id: string } | null;
+        } | null;
+      }> | null;
+      version?: {
+        __typename?: "Version";
+        author: string;
+        createTime: Date;
+        id: string;
+        message: string;
+        order: number;
+        revision: string;
+        buildVariants?: Array<{
+          __typename?: "GroupedBuildVariant";
+          displayName: string;
+          variant: string;
+          tasks?: Array<{
+            __typename?: "Task";
+            displayName: string;
+            execution: number;
+            id: string;
+            status: string;
+          } | null> | null;
+        } | null> | null;
+        upstreamProject?: {
+          __typename?: "UpstreamProject";
+          project: string;
+          repo: string;
+          triggerID: string;
+          triggerType: string;
+          task?: { __typename?: "Task"; execution: number; id: string } | null;
+          version?: { __typename?: "Version"; id: string } | null;
+        } | null;
+      } | null;
     }>;
-  }>;
+  } | null;
 };
 
 export type MainlineCommitsQueryVariables = Exact<{
@@ -5533,37 +5439,31 @@ export type MainlineCommitsQueryVariables = Exact<{
 
 export type MainlineCommitsQuery = {
   __typename?: "Query";
-  mainlineCommits?: Maybe<{
+  mainlineCommits?: {
     __typename?: "MainlineCommits";
-    nextPageOrderNumber?: Maybe<number>;
-    prevPageOrderNumber?: Maybe<number>;
+    nextPageOrderNumber?: number | null;
+    prevPageOrderNumber?: number | null;
     versions: Array<{
       __typename?: "MainlineCommitVersion";
-      rolledUpVersions?: Maybe<
-        Array<{
-          __typename?: "Version";
-          author: string;
-          createTime: Date;
-          id: string;
-          message: string;
-          order: number;
-          revision: string;
-          upstreamProject?: Maybe<{
-            __typename?: "UpstreamProject";
-            project: string;
-            repo: string;
-            triggerID: string;
-            triggerType: string;
-            task?: Maybe<{
-              __typename?: "Task";
-              execution: number;
-              id: string;
-            }>;
-            version?: Maybe<{ __typename?: "Version"; id: string }>;
-          }>;
-        }>
-      >;
-      version?: Maybe<{
+      rolledUpVersions?: Array<{
+        __typename?: "Version";
+        author: string;
+        createTime: Date;
+        id: string;
+        message: string;
+        order: number;
+        revision: string;
+        upstreamProject?: {
+          __typename?: "UpstreamProject";
+          project: string;
+          repo: string;
+          triggerID: string;
+          triggerType: string;
+          task?: { __typename?: "Task"; execution: number; id: string } | null;
+          version?: { __typename?: "Version"; id: string } | null;
+        } | null;
+      }> | null;
+      version?: {
         __typename?: "Version";
         author: string;
         createTime: Date;
@@ -5572,59 +5472,51 @@ export type MainlineCommitsQuery = {
         order: number;
         projectIdentifier: string;
         revision: string;
-        buildVariants?: Maybe<
-          Array<
-            Maybe<{
-              __typename?: "GroupedBuildVariant";
-              displayName: string;
-              variant: string;
-              tasks?: Maybe<
-                Array<
-                  Maybe<{
-                    __typename?: "Task";
-                    displayName: string;
-                    execution: number;
-                    failedTestCount: number;
-                    id: string;
-                    status: string;
-                    timeTaken?: Maybe<number>;
-                  }>
-                >
-              >;
-            }>
-          >
-        >;
-        buildVariantStats?: Maybe<
-          Array<{
-            __typename?: "GroupedTaskStatusCount";
+        buildVariants?: Array<{
+          __typename?: "GroupedBuildVariant";
+          displayName: string;
+          variant: string;
+          tasks?: Array<{
+            __typename?: "Task";
             displayName: string;
-            variant: string;
-            statusCounts: Array<{
-              __typename?: "StatusCount";
-              count: number;
-              status: string;
-            }>;
-          }>
-        >;
-        taskStatusStats?: Maybe<{
+            execution: number;
+            failedTestCount: number;
+            id: string;
+            status: string;
+            timeTaken?: number | null;
+          } | null> | null;
+        } | null> | null;
+        buildVariantStats?: Array<{
+          __typename?: "GroupedTaskStatusCount";
+          displayName: string;
+          variant: string;
+          statusCounts: Array<{
+            __typename?: "StatusCount";
+            count: number;
+            status: string;
+          }>;
+        }> | null;
+        taskStatusStats?: {
           __typename?: "TaskStats";
-          eta?: Maybe<Date>;
-          counts?: Maybe<
-            Array<{ __typename?: "StatusCount"; count: number; status: string }>
-          >;
-        }>;
-        upstreamProject?: Maybe<{
+          eta?: Date | null;
+          counts?: Array<{
+            __typename?: "StatusCount";
+            count: number;
+            status: string;
+          }> | null;
+        } | null;
+        upstreamProject?: {
           __typename?: "UpstreamProject";
           project: string;
           repo: string;
           triggerID: string;
           triggerType: string;
-          task?: Maybe<{ __typename?: "Task"; execution: number; id: string }>;
-          version?: Maybe<{ __typename?: "Version"; id: string }>;
-        }>;
-      }>;
+          task?: { __typename?: "Task"; execution: number; id: string } | null;
+          version?: { __typename?: "Version"; id: string } | null;
+        } | null;
+      } | null;
     }>;
-  }>;
+  } | null;
 };
 
 export type MyHostsQueryVariables = Exact<{ [key: string]: never }>;
@@ -5633,11 +5525,11 @@ export type MyHostsQuery = {
   __typename?: "Query";
   myHosts: Array<{
     __typename?: "Host";
-    availabilityZone?: Maybe<string>;
-    displayName?: Maybe<string>;
-    expiration?: Maybe<Date>;
-    homeVolumeID?: Maybe<string>;
-    instanceType?: Maybe<string>;
+    availabilityZone?: string | null;
+    displayName?: string | null;
+    expiration?: Date | null;
+    homeVolumeID?: string | null;
+    instanceType?: string | null;
     noExpiration: boolean;
     hostUrl: string;
     id: string;
@@ -5645,21 +5537,21 @@ export type MyHostsQuery = {
     startedBy: string;
     status: string;
     tag: string;
-    uptime?: Maybe<Date>;
-    user?: Maybe<string>;
-    distro?: Maybe<{
+    uptime?: Date | null;
+    user?: string | null;
+    distro?: {
       __typename?: "DistroInfo";
-      id?: Maybe<string>;
-      isVirtualWorkStation?: Maybe<boolean>;
-      isWindows?: Maybe<boolean>;
-      user?: Maybe<string>;
-      workDir?: Maybe<string>;
-    }>;
-    homeVolume?: Maybe<{
+      id?: string | null;
+      isVirtualWorkStation?: boolean | null;
+      isWindows?: boolean | null;
+      user?: string | null;
+      workDir?: string | null;
+    } | null;
+    homeVolume?: {
       __typename?: "Volume";
       displayName: string;
       id: string;
-    }>;
+    } | null;
     instanceTags: Array<{
       __typename?: "InstanceTag";
       canBeModified: boolean;
@@ -5683,10 +5575,10 @@ export type MyVolumesQuery = {
     __typename?: "Volume";
     availabilityZone: string;
     createdBy: string;
-    creationTime?: Maybe<Date>;
-    deviceName?: Maybe<string>;
+    creationTime?: Date | null;
+    deviceName?: string | null;
     displayName: string;
-    expiration?: Maybe<Date>;
+    expiration?: Date | null;
     homeVolume: boolean;
     hostID: string;
     id: string;
@@ -5694,12 +5586,12 @@ export type MyVolumesQuery = {
     noExpiration: boolean;
     size: number;
     type: string;
-    host?: Maybe<{
+    host?: {
       __typename?: "Host";
-      displayName?: Maybe<string>;
+      displayName?: string | null;
       id: string;
       noExpiration: boolean;
-    }>;
+    } | null;
   }>;
 };
 
@@ -5723,29 +5615,27 @@ export type ConfigurePatchQuery = {
     __typename?: "Patch";
     projectIdentifier: string;
     activated: boolean;
-    alias?: Maybe<string>;
+    alias?: string | null;
     author: string;
-    commitQueuePosition?: Maybe<number>;
+    commitQueuePosition?: number | null;
     description: string;
     id: string;
     status: string;
-    childPatchAliases?: Maybe<
-      Array<{ __typename?: "ChildPatchAlias"; alias: string; patchId: string }>
-    >;
-    childPatches?: Maybe<
-      Array<{
-        __typename?: "Patch";
-        id: string;
-        projectIdentifier: string;
-        variantsTasks: Array<
-          Maybe<{
-            __typename?: "VariantTask";
-            name: string;
-            tasks: Array<string>;
-          }>
-        >;
-      }>
-    >;
+    childPatchAliases?: Array<{
+      __typename?: "ChildPatchAlias";
+      alias: string;
+      patchId: string;
+    }> | null;
+    childPatches?: Array<{
+      __typename?: "Patch";
+      id: string;
+      projectIdentifier: string;
+      variantsTasks: Array<{
+        __typename?: "VariantTask";
+        name: string;
+        tasks: Array<string>;
+      } | null>;
+    }> | null;
     patchTriggerAliases: Array<{
       __typename?: "PatchTriggerAlias";
       alias: string;
@@ -5757,7 +5647,7 @@ export type ConfigurePatchQuery = {
         tasks: Array<string>;
       }>;
     }>;
-    project?: Maybe<{
+    project?: {
       __typename?: "PatchProject";
       variants: Array<{
         __typename?: "ProjectBuildVariant";
@@ -5765,12 +5655,14 @@ export type ConfigurePatchQuery = {
         name: string;
         tasks: Array<string>;
       }>;
-    }>;
-    time?: Maybe<{ __typename?: "PatchTime"; submittedAt: string }>;
+    } | null;
+    time?: { __typename?: "PatchTime"; submittedAt: string } | null;
     parameters: Array<{ __typename?: "Parameter"; key: string; value: string }>;
-    variantsTasks: Array<
-      Maybe<{ __typename?: "VariantTask"; name: string; tasks: Array<string> }>
-    >;
+    variantsTasks: Array<{
+      __typename?: "VariantTask";
+      name: string;
+      tasks: Array<string>;
+    } | null>;
   };
 };
 
@@ -5801,17 +5693,19 @@ export type PatchQuery = {
     projectID: string;
     projectIdentifier: string;
     activated: boolean;
-    alias?: Maybe<string>;
+    alias?: string | null;
     author: string;
-    commitQueuePosition?: Maybe<number>;
+    commitQueuePosition?: number | null;
     description: string;
     id: string;
     status: string;
-    versionFull?: Maybe<{ __typename?: "Version"; id: string }>;
+    versionFull?: { __typename?: "Version"; id: string } | null;
     parameters: Array<{ __typename?: "Parameter"; key: string; value: string }>;
-    variantsTasks: Array<
-      Maybe<{ __typename?: "VariantTask"; name: string; tasks: Array<string> }>
-    >;
+    variantsTasks: Array<{
+      __typename?: "VariantTask";
+      name: string;
+      tasks: Array<string>;
+    } | null>;
   };
 };
 
@@ -5831,26 +5725,26 @@ export type PodEventsQuery = {
       count: number;
       eventLogEntries: Array<{
         __typename?: "PodEventLogEntry";
-        eventType?: Maybe<string>;
+        eventType?: string | null;
         id: string;
         processedAt: Date;
         resourceId: string;
         resourceType: string;
-        timestamp?: Maybe<Date>;
+        timestamp?: Date | null;
         data: {
           __typename?: "PodEventLogData";
-          newStatus?: Maybe<string>;
-          oldStatus?: Maybe<string>;
-          reason?: Maybe<string>;
-          taskExecution?: Maybe<number>;
-          taskID?: Maybe<string>;
-          taskStatus?: Maybe<string>;
-          task?: Maybe<{
+          newStatus?: string | null;
+          oldStatus?: string | null;
+          reason?: string | null;
+          taskExecution?: number | null;
+          taskID?: string | null;
+          taskStatus?: string | null;
+          task?: {
             __typename?: "Task";
             displayName: string;
             execution: number;
             id: string;
-          }>;
+          } | null;
         };
       }>;
     };
@@ -5868,12 +5762,12 @@ export type PodQuery = {
     id: string;
     status: string;
     type: string;
-    task?: Maybe<{
+    task?: {
       __typename?: "Task";
       displayName: string;
       execution: number;
       id: string;
-    }>;
+    } | null;
     taskContainerCreationOpts: {
       __typename?: "TaskContainerCreationOpts";
       arch: string;
@@ -5895,11 +5789,11 @@ export type ProjectBannerQuery = {
   project: {
     __typename?: "Project";
     id: string;
-    banner?: Maybe<{
+    banner?: {
       __typename?: "ProjectBanner";
       text: string;
       theme: BannerTheme;
-    }>;
+    } | null;
   };
 };
 
@@ -5918,104 +5812,95 @@ export type ProjectEventLogsQuery = {
       __typename?: "ProjectEventLogEntry";
       timestamp: Date;
       user: string;
-      after?: Maybe<{
+      after?: {
         __typename?: "ProjectEventSettings";
         githubWebhooksEnabled: boolean;
-        aliases?: Maybe<
-          Array<{
-            __typename?: "ProjectAlias";
-            alias: string;
-            gitTag: string;
-            id: string;
-            remotePath: string;
-            task: string;
-            taskTags: Array<string>;
-            variant: string;
-            variantTags: Array<string>;
-          }>
-        >;
-        projectRef?: Maybe<{
+        aliases?: Array<{
+          __typename?: "ProjectAlias";
+          alias: string;
+          gitTag: string;
+          id: string;
+          remotePath: string;
+          task: string;
+          taskTags: Array<string>;
+          variant: string;
+          variantTags: Array<string>;
+        }> | null;
+        projectRef?: {
           __typename?: "Project";
-          hidden?: Maybe<boolean>;
+          hidden?: boolean | null;
           identifier: string;
           repoRefId: string;
-          tracksPushEvents?: Maybe<boolean>;
-          versionControlEnabled?: Maybe<boolean>;
-          admins?: Maybe<Array<Maybe<string>>>;
-          restricted?: Maybe<boolean>;
+          tracksPushEvents?: boolean | null;
+          versionControlEnabled?: boolean | null;
+          admins?: Array<string | null> | null;
+          restricted?: boolean | null;
           batchTime: number;
           branch: string;
-          deactivatePrevious?: Maybe<boolean>;
-          disabledStatsCache?: Maybe<boolean>;
-          dispatchingDisabled?: Maybe<boolean>;
+          deactivatePrevious?: boolean | null;
+          disabledStatsCache?: boolean | null;
+          dispatchingDisabled?: boolean | null;
           displayName: string;
-          enabled?: Maybe<boolean>;
+          enabled?: boolean | null;
           owner: string;
-          patchingDisabled?: Maybe<boolean>;
+          patchingDisabled?: boolean | null;
           remotePath: string;
           repo: string;
-          repotrackerDisabled?: Maybe<boolean>;
+          repotrackerDisabled?: boolean | null;
           spawnHostScriptPath: string;
-          stepbackDisabled?: Maybe<boolean>;
-          notifyOnBuildFailure?: Maybe<boolean>;
-          githubTriggerAliases?: Maybe<Array<string>>;
-          perfEnabled?: Maybe<boolean>;
-          githubChecksEnabled?: Maybe<boolean>;
-          gitTagAuthorizedTeams?: Maybe<Array<string>>;
-          gitTagAuthorizedUsers?: Maybe<Array<string>>;
-          gitTagVersionsEnabled?: Maybe<boolean>;
-          manualPrTestingEnabled?: Maybe<boolean>;
-          prTestingEnabled?: Maybe<boolean>;
+          stepbackDisabled?: boolean | null;
+          notifyOnBuildFailure?: boolean | null;
+          githubTriggerAliases?: Array<string> | null;
+          perfEnabled?: boolean | null;
+          githubChecksEnabled?: boolean | null;
+          gitTagAuthorizedTeams?: Array<string> | null;
+          gitTagAuthorizedUsers?: Array<string> | null;
+          gitTagVersionsEnabled?: boolean | null;
+          manualPrTestingEnabled?: boolean | null;
+          prTestingEnabled?: boolean | null;
           taskSync: {
             __typename?: "TaskSyncOptions";
-            configEnabled?: Maybe<boolean>;
-            patchEnabled?: Maybe<boolean>;
+            configEnabled?: boolean | null;
+            patchEnabled?: boolean | null;
           };
-          banner?: Maybe<{
+          banner?: {
             __typename?: "ProjectBanner";
             text: string;
             theme: BannerTheme;
-          }>;
-          patchTriggerAliases?: Maybe<
-            Array<{
-              __typename?: "PatchTriggerAlias";
-              alias: string;
-              childProjectIdentifier: string;
-              parentAsModule?: Maybe<string>;
-              status?: Maybe<string>;
-              taskSpecifiers?: Maybe<
-                Array<{
-                  __typename?: "TaskSpecifier";
-                  patchAlias: string;
-                  taskRegex: string;
-                  variantRegex: string;
-                }>
-              >;
-            }>
-          >;
-          periodicBuilds?: Maybe<
-            Array<{
-              __typename?: "PeriodicBuild";
-              alias: string;
-              configFile: string;
-              id: string;
-              intervalHours: number;
-              message: string;
-              nextRunTime: Date;
-            }>
-          >;
+          } | null;
+          patchTriggerAliases?: Array<{
+            __typename?: "PatchTriggerAlias";
+            alias: string;
+            childProjectIdentifier: string;
+            parentAsModule?: string | null;
+            status?: string | null;
+            taskSpecifiers?: Array<{
+              __typename?: "TaskSpecifier";
+              patchAlias: string;
+              taskRegex: string;
+              variantRegex: string;
+            }> | null;
+          }> | null;
+          periodicBuilds?: Array<{
+            __typename?: "PeriodicBuild";
+            alias: string;
+            configFile: string;
+            cron: string;
+            id: string;
+            intervalHours: number;
+            message: string;
+            nextRunTime: Date;
+          }> | null;
           buildBaronSettings: {
             __typename?: "BuildBaronSettings";
             ticketCreateProject: string;
-            ticketSearchProjects?: Maybe<Array<string>>;
+            ticketSearchProjects?: Array<string> | null;
           };
-          externalLinks?: Maybe<
-            Array<{
-              __typename?: "ExternalLink";
-              displayName: string;
-              urlTemplate: string;
-            }>
-          >;
+          externalLinks?: Array<{
+            __typename?: "ExternalLink";
+            displayName: string;
+            urlTemplate: string;
+          }> | null;
           taskAnnotationSettings: {
             __typename?: "TaskAnnotationSettings";
             fileTicketWebhook: {
@@ -6023,213 +5908,194 @@ export type ProjectEventLogsQuery = {
               endpoint: string;
               secret: string;
             };
-            jiraCustomFields?: Maybe<
-              Array<{
-                __typename?: "JiraField";
-                displayText: string;
-                field: string;
-              }>
-            >;
+            jiraCustomFields?: Array<{
+              __typename?: "JiraField";
+              displayText: string;
+              field: string;
+            }> | null;
           };
-          triggers?: Maybe<
-            Array<{
-              __typename?: "TriggerAlias";
-              alias: string;
-              buildVariantRegex: string;
-              configFile: string;
-              dateCutoff?: Maybe<number>;
-              level: string;
-              project: string;
-              status: string;
-              taskRegex: string;
-            }>
-          >;
+          triggers?: Array<{
+            __typename?: "TriggerAlias";
+            alias: string;
+            buildVariantRegex: string;
+            configFile: string;
+            dateCutoff?: number | null;
+            level: string;
+            project: string;
+            status: string;
+            taskRegex: string;
+          }> | null;
           workstationConfig: {
             __typename?: "WorkstationConfig";
-            gitClone?: Maybe<boolean>;
-            setupCommands?: Maybe<
-              Array<{
-                __typename?: "WorkstationSetupCommand";
-                command: string;
-                directory: string;
-              }>
-            >;
+            gitClone?: boolean | null;
+            setupCommands?: Array<{
+              __typename?: "WorkstationSetupCommand";
+              command: string;
+              directory: string;
+            }> | null;
           };
           commitQueue: {
             __typename?: "CommitQueueParams";
-            enabled?: Maybe<boolean>;
+            enabled?: boolean | null;
             mergeMethod: string;
             message: string;
           };
-        }>;
-        subscriptions?: Maybe<
-          Array<{
-            __typename?: "GeneralSubscription";
-            id: string;
-            ownerType: string;
-            resourceType: string;
-            trigger: string;
-            triggerData?: Maybe<{ [key: string]: any }>;
-            regexSelectors: Array<{
-              __typename?: "Selector";
-              data: string;
-              type: string;
-            }>;
-            selectors: Array<{
-              __typename?: "Selector";
-              data: string;
-              type: string;
-            }>;
-            subscriber?: Maybe<{
-              __typename?: "SubscriberWrapper";
-              type: string;
-              subscriber: {
-                __typename?: "Subscriber";
-                emailSubscriber?: Maybe<string>;
-                jiraCommentSubscriber?: Maybe<string>;
-                slackSubscriber?: Maybe<string>;
-                githubCheckSubscriber?: Maybe<{
-                  __typename?: "GithubCheckSubscriber";
-                  owner: string;
-                  ref: string;
-                  repo: string;
-                }>;
-                githubPRSubscriber?: Maybe<{
-                  __typename?: "GithubPRSubscriber";
-                  owner: string;
-                  prNumber?: Maybe<number>;
-                  ref: string;
-                  repo: string;
-                }>;
-                jiraIssueSubscriber?: Maybe<{
-                  __typename?: "JiraIssueSubscriber";
-                  issueType: string;
-                  project: string;
-                }>;
-                webhookSubscriber?: Maybe<{
-                  __typename?: "WebhookSubscriber";
-                  minDelayMs: number;
-                  retries: number;
-                  secret: string;
-                  timeoutMs: number;
-                  url: string;
-                  headers: Array<
-                    Maybe<{
-                      __typename?: "WebhookHeader";
-                      key: string;
-                      value: string;
-                    }>
-                  >;
-                }>;
-              };
-            }>;
-          }>
-        >;
-        vars?: Maybe<{
+        } | null;
+        subscriptions?: Array<{
+          __typename?: "GeneralSubscription";
+          id: string;
+          ownerType: string;
+          resourceType: string;
+          trigger: string;
+          triggerData?: { [key: string]: any } | null;
+          regexSelectors: Array<{
+            __typename?: "Selector";
+            data: string;
+            type: string;
+          }>;
+          selectors: Array<{
+            __typename?: "Selector";
+            data: string;
+            type: string;
+          }>;
+          subscriber?: {
+            __typename?: "SubscriberWrapper";
+            type: string;
+            subscriber: {
+              __typename?: "Subscriber";
+              emailSubscriber?: string | null;
+              jiraCommentSubscriber?: string | null;
+              slackSubscriber?: string | null;
+              githubCheckSubscriber?: {
+                __typename?: "GithubCheckSubscriber";
+                owner: string;
+                ref: string;
+                repo: string;
+              } | null;
+              githubPRSubscriber?: {
+                __typename?: "GithubPRSubscriber";
+                owner: string;
+                prNumber?: number | null;
+                ref: string;
+                repo: string;
+              } | null;
+              jiraIssueSubscriber?: {
+                __typename?: "JiraIssueSubscriber";
+                issueType: string;
+                project: string;
+              } | null;
+              webhookSubscriber?: {
+                __typename?: "WebhookSubscriber";
+                minDelayMs: number;
+                retries: number;
+                secret: string;
+                timeoutMs: number;
+                url: string;
+                headers: Array<{
+                  __typename?: "WebhookHeader";
+                  key: string;
+                  value: string;
+                } | null>;
+              } | null;
+            };
+          } | null;
+        }> | null;
+        vars?: {
           __typename?: "ProjectVars";
           adminOnlyVars: Array<string>;
           privateVars: Array<string>;
-          vars?: Maybe<{ [key: string]: any }>;
-        }>;
-      }>;
-      before?: Maybe<{
+          vars?: { [key: string]: any } | null;
+        } | null;
+      } | null;
+      before?: {
         __typename?: "ProjectEventSettings";
         githubWebhooksEnabled: boolean;
-        aliases?: Maybe<
-          Array<{
-            __typename?: "ProjectAlias";
-            alias: string;
-            gitTag: string;
-            id: string;
-            remotePath: string;
-            task: string;
-            taskTags: Array<string>;
-            variant: string;
-            variantTags: Array<string>;
-          }>
-        >;
-        projectRef?: Maybe<{
+        aliases?: Array<{
+          __typename?: "ProjectAlias";
+          alias: string;
+          gitTag: string;
+          id: string;
+          remotePath: string;
+          task: string;
+          taskTags: Array<string>;
+          variant: string;
+          variantTags: Array<string>;
+        }> | null;
+        projectRef?: {
           __typename?: "Project";
-          hidden?: Maybe<boolean>;
+          hidden?: boolean | null;
           identifier: string;
           repoRefId: string;
-          tracksPushEvents?: Maybe<boolean>;
-          versionControlEnabled?: Maybe<boolean>;
-          admins?: Maybe<Array<Maybe<string>>>;
-          restricted?: Maybe<boolean>;
+          tracksPushEvents?: boolean | null;
+          versionControlEnabled?: boolean | null;
+          admins?: Array<string | null> | null;
+          restricted?: boolean | null;
           batchTime: number;
           branch: string;
-          deactivatePrevious?: Maybe<boolean>;
-          disabledStatsCache?: Maybe<boolean>;
-          dispatchingDisabled?: Maybe<boolean>;
+          deactivatePrevious?: boolean | null;
+          disabledStatsCache?: boolean | null;
+          dispatchingDisabled?: boolean | null;
           displayName: string;
-          enabled?: Maybe<boolean>;
+          enabled?: boolean | null;
           owner: string;
-          patchingDisabled?: Maybe<boolean>;
+          patchingDisabled?: boolean | null;
           remotePath: string;
           repo: string;
-          repotrackerDisabled?: Maybe<boolean>;
+          repotrackerDisabled?: boolean | null;
           spawnHostScriptPath: string;
-          stepbackDisabled?: Maybe<boolean>;
-          notifyOnBuildFailure?: Maybe<boolean>;
-          githubTriggerAliases?: Maybe<Array<string>>;
-          perfEnabled?: Maybe<boolean>;
-          githubChecksEnabled?: Maybe<boolean>;
-          gitTagAuthorizedTeams?: Maybe<Array<string>>;
-          gitTagAuthorizedUsers?: Maybe<Array<string>>;
-          gitTagVersionsEnabled?: Maybe<boolean>;
-          manualPrTestingEnabled?: Maybe<boolean>;
-          prTestingEnabled?: Maybe<boolean>;
+          stepbackDisabled?: boolean | null;
+          notifyOnBuildFailure?: boolean | null;
+          githubTriggerAliases?: Array<string> | null;
+          perfEnabled?: boolean | null;
+          githubChecksEnabled?: boolean | null;
+          gitTagAuthorizedTeams?: Array<string> | null;
+          gitTagAuthorizedUsers?: Array<string> | null;
+          gitTagVersionsEnabled?: boolean | null;
+          manualPrTestingEnabled?: boolean | null;
+          prTestingEnabled?: boolean | null;
           taskSync: {
             __typename?: "TaskSyncOptions";
-            configEnabled?: Maybe<boolean>;
-            patchEnabled?: Maybe<boolean>;
+            configEnabled?: boolean | null;
+            patchEnabled?: boolean | null;
           };
-          banner?: Maybe<{
+          banner?: {
             __typename?: "ProjectBanner";
             text: string;
             theme: BannerTheme;
-          }>;
-          patchTriggerAliases?: Maybe<
-            Array<{
-              __typename?: "PatchTriggerAlias";
-              alias: string;
-              childProjectIdentifier: string;
-              parentAsModule?: Maybe<string>;
-              status?: Maybe<string>;
-              taskSpecifiers?: Maybe<
-                Array<{
-                  __typename?: "TaskSpecifier";
-                  patchAlias: string;
-                  taskRegex: string;
-                  variantRegex: string;
-                }>
-              >;
-            }>
-          >;
-          periodicBuilds?: Maybe<
-            Array<{
-              __typename?: "PeriodicBuild";
-              alias: string;
-              configFile: string;
-              id: string;
-              intervalHours: number;
-              message: string;
-              nextRunTime: Date;
-            }>
-          >;
+          } | null;
+          patchTriggerAliases?: Array<{
+            __typename?: "PatchTriggerAlias";
+            alias: string;
+            childProjectIdentifier: string;
+            parentAsModule?: string | null;
+            status?: string | null;
+            taskSpecifiers?: Array<{
+              __typename?: "TaskSpecifier";
+              patchAlias: string;
+              taskRegex: string;
+              variantRegex: string;
+            }> | null;
+          }> | null;
+          periodicBuilds?: Array<{
+            __typename?: "PeriodicBuild";
+            alias: string;
+            configFile: string;
+            cron: string;
+            id: string;
+            intervalHours: number;
+            message: string;
+            nextRunTime: Date;
+          }> | null;
           buildBaronSettings: {
             __typename?: "BuildBaronSettings";
             ticketCreateProject: string;
-            ticketSearchProjects?: Maybe<Array<string>>;
+            ticketSearchProjects?: Array<string> | null;
           };
-          externalLinks?: Maybe<
-            Array<{
-              __typename?: "ExternalLink";
-              displayName: string;
-              urlTemplate: string;
-            }>
-          >;
+          externalLinks?: Array<{
+            __typename?: "ExternalLink";
+            displayName: string;
+            urlTemplate: string;
+          }> | null;
           taskAnnotationSettings: {
             __typename?: "TaskAnnotationSettings";
             fileTicketWebhook: {
@@ -6237,115 +6103,105 @@ export type ProjectEventLogsQuery = {
               endpoint: string;
               secret: string;
             };
-            jiraCustomFields?: Maybe<
-              Array<{
-                __typename?: "JiraField";
-                displayText: string;
-                field: string;
-              }>
-            >;
+            jiraCustomFields?: Array<{
+              __typename?: "JiraField";
+              displayText: string;
+              field: string;
+            }> | null;
           };
-          triggers?: Maybe<
-            Array<{
-              __typename?: "TriggerAlias";
-              alias: string;
-              buildVariantRegex: string;
-              configFile: string;
-              dateCutoff?: Maybe<number>;
-              level: string;
-              project: string;
-              status: string;
-              taskRegex: string;
-            }>
-          >;
+          triggers?: Array<{
+            __typename?: "TriggerAlias";
+            alias: string;
+            buildVariantRegex: string;
+            configFile: string;
+            dateCutoff?: number | null;
+            level: string;
+            project: string;
+            status: string;
+            taskRegex: string;
+          }> | null;
           workstationConfig: {
             __typename?: "WorkstationConfig";
-            gitClone?: Maybe<boolean>;
-            setupCommands?: Maybe<
-              Array<{
-                __typename?: "WorkstationSetupCommand";
-                command: string;
-                directory: string;
-              }>
-            >;
+            gitClone?: boolean | null;
+            setupCommands?: Array<{
+              __typename?: "WorkstationSetupCommand";
+              command: string;
+              directory: string;
+            }> | null;
           };
           commitQueue: {
             __typename?: "CommitQueueParams";
-            enabled?: Maybe<boolean>;
+            enabled?: boolean | null;
             mergeMethod: string;
             message: string;
           };
-        }>;
-        subscriptions?: Maybe<
-          Array<{
-            __typename?: "GeneralSubscription";
-            id: string;
-            ownerType: string;
-            resourceType: string;
-            trigger: string;
-            triggerData?: Maybe<{ [key: string]: any }>;
-            regexSelectors: Array<{
-              __typename?: "Selector";
-              data: string;
-              type: string;
-            }>;
-            selectors: Array<{
-              __typename?: "Selector";
-              data: string;
-              type: string;
-            }>;
-            subscriber?: Maybe<{
-              __typename?: "SubscriberWrapper";
-              type: string;
-              subscriber: {
-                __typename?: "Subscriber";
-                emailSubscriber?: Maybe<string>;
-                jiraCommentSubscriber?: Maybe<string>;
-                slackSubscriber?: Maybe<string>;
-                githubCheckSubscriber?: Maybe<{
-                  __typename?: "GithubCheckSubscriber";
-                  owner: string;
-                  ref: string;
-                  repo: string;
-                }>;
-                githubPRSubscriber?: Maybe<{
-                  __typename?: "GithubPRSubscriber";
-                  owner: string;
-                  prNumber?: Maybe<number>;
-                  ref: string;
-                  repo: string;
-                }>;
-                jiraIssueSubscriber?: Maybe<{
-                  __typename?: "JiraIssueSubscriber";
-                  issueType: string;
-                  project: string;
-                }>;
-                webhookSubscriber?: Maybe<{
-                  __typename?: "WebhookSubscriber";
-                  minDelayMs: number;
-                  retries: number;
-                  secret: string;
-                  timeoutMs: number;
-                  url: string;
-                  headers: Array<
-                    Maybe<{
-                      __typename?: "WebhookHeader";
-                      key: string;
-                      value: string;
-                    }>
-                  >;
-                }>;
-              };
-            }>;
-          }>
-        >;
-        vars?: Maybe<{
+        } | null;
+        subscriptions?: Array<{
+          __typename?: "GeneralSubscription";
+          id: string;
+          ownerType: string;
+          resourceType: string;
+          trigger: string;
+          triggerData?: { [key: string]: any } | null;
+          regexSelectors: Array<{
+            __typename?: "Selector";
+            data: string;
+            type: string;
+          }>;
+          selectors: Array<{
+            __typename?: "Selector";
+            data: string;
+            type: string;
+          }>;
+          subscriber?: {
+            __typename?: "SubscriberWrapper";
+            type: string;
+            subscriber: {
+              __typename?: "Subscriber";
+              emailSubscriber?: string | null;
+              jiraCommentSubscriber?: string | null;
+              slackSubscriber?: string | null;
+              githubCheckSubscriber?: {
+                __typename?: "GithubCheckSubscriber";
+                owner: string;
+                ref: string;
+                repo: string;
+              } | null;
+              githubPRSubscriber?: {
+                __typename?: "GithubPRSubscriber";
+                owner: string;
+                prNumber?: number | null;
+                ref: string;
+                repo: string;
+              } | null;
+              jiraIssueSubscriber?: {
+                __typename?: "JiraIssueSubscriber";
+                issueType: string;
+                project: string;
+              } | null;
+              webhookSubscriber?: {
+                __typename?: "WebhookSubscriber";
+                minDelayMs: number;
+                retries: number;
+                secret: string;
+                timeoutMs: number;
+                url: string;
+                headers: Array<{
+                  __typename?: "WebhookHeader";
+                  key: string;
+                  value: string;
+                } | null>;
+              } | null;
+            };
+          } | null;
+        }> | null;
+        vars?: {
           __typename?: "ProjectVars";
           adminOnlyVars: Array<string>;
           privateVars: Array<string>;
-          vars?: Maybe<{ [key: string]: any }>;
-        }>;
-      }>;
+          vars?: { [key: string]: any } | null;
+        } | null;
+      } | null;
     }>;
   };
 };
@@ -6359,108 +6215,98 @@ export type ProjectSettingsQuery = {
   projectSettings: {
     __typename?: "ProjectSettings";
     githubWebhooksEnabled: boolean;
-    aliases?: Maybe<
-      Array<{
-        __typename?: "ProjectAlias";
-        alias: string;
-        gitTag: string;
-        id: string;
-        remotePath: string;
-        task: string;
-        taskTags: Array<string>;
-        variant: string;
-        variantTags: Array<string>;
-      }>
-    >;
-    projectRef?: Maybe<{
+    aliases?: Array<{
+      __typename?: "ProjectAlias";
+      alias: string;
+      gitTag: string;
+      id: string;
+      remotePath: string;
+      task: string;
+      taskTags: Array<string>;
+      variant: string;
+      variantTags: Array<string>;
+    }> | null;
+    projectRef?: {
       __typename?: "Project";
       id: string;
       identifier: string;
       repoRefId: string;
-      admins?: Maybe<Array<Maybe<string>>>;
-      restricted?: Maybe<boolean>;
+      admins?: Array<string | null> | null;
+      restricted?: boolean | null;
       batchTime: number;
       branch: string;
-      deactivatePrevious?: Maybe<boolean>;
-      disabledStatsCache?: Maybe<boolean>;
-      dispatchingDisabled?: Maybe<boolean>;
+      deactivatePrevious?: boolean | null;
+      disabledStatsCache?: boolean | null;
+      dispatchingDisabled?: boolean | null;
       displayName: string;
-      enabled?: Maybe<boolean>;
+      enabled?: boolean | null;
       owner: string;
-      patchingDisabled?: Maybe<boolean>;
+      patchingDisabled?: boolean | null;
       remotePath: string;
       repo: string;
-      repotrackerDisabled?: Maybe<boolean>;
+      repotrackerDisabled?: boolean | null;
       spawnHostScriptPath: string;
-      stepbackDisabled?: Maybe<boolean>;
-      versionControlEnabled?: Maybe<boolean>;
-      notifyOnBuildFailure?: Maybe<boolean>;
-      githubTriggerAliases?: Maybe<Array<string>>;
-      perfEnabled?: Maybe<boolean>;
-      githubChecksEnabled?: Maybe<boolean>;
-      gitTagAuthorizedTeams?: Maybe<Array<string>>;
-      gitTagAuthorizedUsers?: Maybe<Array<string>>;
-      gitTagVersionsEnabled?: Maybe<boolean>;
-      manualPrTestingEnabled?: Maybe<boolean>;
-      prTestingEnabled?: Maybe<boolean>;
-      containerSizeDefinitions?: Maybe<
-        Array<{
-          __typename?: "ContainerResources";
-          cpu: number;
-          memoryMb: number;
-          name: string;
-        }>
-      >;
+      stepbackDisabled?: boolean | null;
+      versionControlEnabled?: boolean | null;
+      notifyOnBuildFailure?: boolean | null;
+      githubTriggerAliases?: Array<string> | null;
+      perfEnabled?: boolean | null;
+      projectHealthView: ProjectHealthView;
+      githubChecksEnabled?: boolean | null;
+      gitTagAuthorizedTeams?: Array<string> | null;
+      gitTagAuthorizedUsers?: Array<string> | null;
+      gitTagVersionsEnabled?: boolean | null;
+      manualPrTestingEnabled?: boolean | null;
+      prTestingEnabled?: boolean | null;
+      containerSizeDefinitions?: Array<{
+        __typename?: "ContainerResources";
+        cpu: number;
+        memoryMb: number;
+        name: string;
+      }> | null;
       taskSync: {
         __typename?: "TaskSyncOptions";
-        configEnabled?: Maybe<boolean>;
-        patchEnabled?: Maybe<boolean>;
+        configEnabled?: boolean | null;
+        patchEnabled?: boolean | null;
       };
-      banner?: Maybe<{
+      banner?: {
         __typename?: "ProjectBanner";
         text: string;
         theme: BannerTheme;
-      }>;
-      patchTriggerAliases?: Maybe<
-        Array<{
-          __typename?: "PatchTriggerAlias";
-          alias: string;
-          childProjectIdentifier: string;
-          parentAsModule?: Maybe<string>;
-          status?: Maybe<string>;
-          taskSpecifiers?: Maybe<
-            Array<{
-              __typename?: "TaskSpecifier";
-              patchAlias: string;
-              taskRegex: string;
-              variantRegex: string;
-            }>
-          >;
-        }>
-      >;
-      periodicBuilds?: Maybe<
-        Array<{
-          __typename?: "PeriodicBuild";
-          alias: string;
-          configFile: string;
-          id: string;
-          intervalHours: number;
-          message: string;
-          nextRunTime: Date;
-        }>
-      >;
+      } | null;
+      patchTriggerAliases?: Array<{
+        __typename?: "PatchTriggerAlias";
+        alias: string;
+        childProjectIdentifier: string;
+        parentAsModule?: string | null;
+        status?: string | null;
+        taskSpecifiers?: Array<{
+          __typename?: "TaskSpecifier";
+          patchAlias: string;
+          taskRegex: string;
+          variantRegex: string;
+        }> | null;
+      }> | null;
+      periodicBuilds?: Array<{
+        __typename?: "PeriodicBuild";
+        alias: string;
+        configFile: string;
+        cron: string;
+        id: string;
+        intervalHours: number;
+        message: string;
+        nextRunTime: Date;
+      }> | null;
       buildBaronSettings: {
         __typename?: "BuildBaronSettings";
         ticketCreateProject: string;
-        ticketSearchProjects?: Maybe<Array<string>>;
+        ticketSearchProjects?: Array<string> | null;
       };
-      externalLinks?: Maybe<
-        Array<{
-          __typename?: "ExternalLink";
-          displayName: string;
-          urlTemplate: string;
-        }>
-      >;
+      externalLinks?: Array<{
+        __typename?: "ExternalLink";
+        displayName: string;
+        urlTemplate: string;
+      }> | null;
       taskAnnotationSettings: {
         __typename?: "TaskAnnotationSettings";
         fileTicketWebhook: {
@@ -6468,114 +6314,106 @@ export type ProjectSettingsQuery = {
           endpoint: string;
           secret: string;
         };
-        jiraCustomFields?: Maybe<
-          Array<{
-            __typename?: "JiraField";
-            displayText: string;
-            field: string;
-          }>
-        >;
+        jiraCustomFields?: Array<{
+          __typename?: "JiraField";
+          displayText: string;
+          field: string;
+        }> | null;
       };
-      triggers?: Maybe<
-        Array<{
-          __typename?: "TriggerAlias";
-          alias: string;
-          buildVariantRegex: string;
-          configFile: string;
-          dateCutoff?: Maybe<number>;
-          level: string;
-          project: string;
-          status: string;
-          taskRegex: string;
-        }>
-      >;
+      triggers?: Array<{
+        __typename?: "TriggerAlias";
+        alias: string;
+        buildVariantRegex: string;
+        configFile: string;
+        dateCutoff?: number | null;
+        level: string;
+        project: string;
+        status: string;
+        taskRegex: string;
+      }> | null;
+      parsleyFilters?: Array<{
+        __typename?: "ParsleyFilter";
+        caseSensitive: boolean;
+        exactMatch: boolean;
+        expression: string;
+      }> | null;
       workstationConfig: {
         __typename?: "WorkstationConfig";
-        gitClone?: Maybe<boolean>;
-        setupCommands?: Maybe<
-          Array<{
-            __typename?: "WorkstationSetupCommand";
-            command: string;
-            directory: string;
-          }>
-        >;
+        gitClone?: boolean | null;
+        setupCommands?: Array<{
+          __typename?: "WorkstationSetupCommand";
+          command: string;
+          directory: string;
+        }> | null;
       };
       commitQueue: {
         __typename?: "CommitQueueParams";
-        enabled?: Maybe<boolean>;
+        enabled?: boolean | null;
         mergeMethod: string;
         message: string;
       };
-    }>;
-    subscriptions?: Maybe<
-      Array<{
-        __typename?: "GeneralSubscription";
-        id: string;
-        ownerType: string;
-        resourceType: string;
-        trigger: string;
-        triggerData?: Maybe<{ [key: string]: any }>;
-        regexSelectors: Array<{
-          __typename?: "Selector";
-          data: string;
-          type: string;
-        }>;
-        selectors: Array<{
-          __typename?: "Selector";
-          data: string;
-          type: string;
-        }>;
-        subscriber?: Maybe<{
-          __typename?: "SubscriberWrapper";
-          type: string;
-          subscriber: {
-            __typename?: "Subscriber";
-            emailSubscriber?: Maybe<string>;
-            jiraCommentSubscriber?: Maybe<string>;
-            slackSubscriber?: Maybe<string>;
-            githubCheckSubscriber?: Maybe<{
-              __typename?: "GithubCheckSubscriber";
-              owner: string;
-              ref: string;
-              repo: string;
-            }>;
-            githubPRSubscriber?: Maybe<{
-              __typename?: "GithubPRSubscriber";
-              owner: string;
-              prNumber?: Maybe<number>;
-              ref: string;
-              repo: string;
-            }>;
-            jiraIssueSubscriber?: Maybe<{
-              __typename?: "JiraIssueSubscriber";
-              issueType: string;
-              project: string;
-            }>;
-            webhookSubscriber?: Maybe<{
-              __typename?: "WebhookSubscriber";
-              minDelayMs: number;
-              retries: number;
-              secret: string;
-              timeoutMs: number;
-              url: string;
-              headers: Array<
-                Maybe<{
-                  __typename?: "WebhookHeader";
-                  key: string;
-                  value: string;
-                }>
-              >;
-            }>;
-          };
-        }>;
-      }>
-    >;
-    vars?: Maybe<{
+    } | null;
+    subscriptions?: Array<{
+      __typename?: "GeneralSubscription";
+      id: string;
+      ownerType: string;
+      resourceType: string;
+      trigger: string;
+      triggerData?: { [key: string]: any } | null;
+      regexSelectors: Array<{
+        __typename?: "Selector";
+        data: string;
+        type: string;
+      }>;
+      selectors: Array<{ __typename?: "Selector"; data: string; type: string }>;
+      subscriber?: {
+        __typename?: "SubscriberWrapper";
+        type: string;
+        subscriber: {
+          __typename?: "Subscriber";
+          emailSubscriber?: string | null;
+          jiraCommentSubscriber?: string | null;
+          slackSubscriber?: string | null;
+          githubCheckSubscriber?: {
+            __typename?: "GithubCheckSubscriber";
+            owner: string;
+            ref: string;
+            repo: string;
+          } | null;
+          githubPRSubscriber?: {
+            __typename?: "GithubPRSubscriber";
+            owner: string;
+            prNumber?: number | null;
+            ref: string;
+            repo: string;
+          } | null;
+          jiraIssueSubscriber?: {
+            __typename?: "JiraIssueSubscriber";
+            issueType: string;
+            project: string;
+          } | null;
+          webhookSubscriber?: {
+            __typename?: "WebhookSubscriber";
+            minDelayMs: number;
+            retries: number;
+            secret: string;
+            timeoutMs: number;
+            url: string;
+            headers: Array<{
+              __typename?: "WebhookHeader";
+              key: string;
+              value: string;
+            } | null>;
+          } | null;
+        };
+      } | null;
+    }> | null;
+    vars?: {
       __typename?: "ProjectVars";
       adminOnlyVars: Array<string>;
       privateVars: Array<string>;
-      vars?: Maybe<{ [key: string]: any }>;
-    }>;
+      vars?: { [key: string]: any } | null;
+    } | null;
   };
 };
 
@@ -6583,21 +6421,19 @@ export type ProjectsQueryVariables = Exact<{ [key: string]: never }>;
 
 export type ProjectsQuery = {
   __typename?: "Query";
-  projects: Array<
-    Maybe<{
-      __typename?: "GroupedProjects";
-      groupDisplayName: string;
-      projects: Array<{
-        __typename?: "Project";
-        displayName: string;
-        id: string;
-        identifier: string;
-        isFavorite: boolean;
-        owner: string;
-        repo: string;
-      }>;
-    }>
-  >;
+  projects: Array<{
+    __typename?: "GroupedProjects";
+    groupDisplayName: string;
+    projects: Array<{
+      __typename?: "Project";
+      displayName: string;
+      id: string;
+      identifier: string;
+      isFavorite: boolean;
+      owner: string;
+      repo: string;
+    }>;
+  } | null>;
 };
 
 export type MyPublicKeysQueryVariables = Exact<{ [key: string]: never }>;
@@ -6622,104 +6458,95 @@ export type RepoEventLogsQuery = {
       __typename?: "ProjectEventLogEntry";
       timestamp: Date;
       user: string;
-      after?: Maybe<{
+      after?: {
         __typename?: "ProjectEventSettings";
         githubWebhooksEnabled: boolean;
-        aliases?: Maybe<
-          Array<{
-            __typename?: "ProjectAlias";
-            alias: string;
-            gitTag: string;
-            id: string;
-            remotePath: string;
-            task: string;
-            taskTags: Array<string>;
-            variant: string;
-            variantTags: Array<string>;
-          }>
-        >;
-        projectRef?: Maybe<{
+        aliases?: Array<{
+          __typename?: "ProjectAlias";
+          alias: string;
+          gitTag: string;
+          id: string;
+          remotePath: string;
+          task: string;
+          taskTags: Array<string>;
+          variant: string;
+          variantTags: Array<string>;
+        }> | null;
+        projectRef?: {
           __typename?: "Project";
-          hidden?: Maybe<boolean>;
+          hidden?: boolean | null;
           identifier: string;
           repoRefId: string;
-          tracksPushEvents?: Maybe<boolean>;
-          versionControlEnabled?: Maybe<boolean>;
-          admins?: Maybe<Array<Maybe<string>>>;
-          restricted?: Maybe<boolean>;
+          tracksPushEvents?: boolean | null;
+          versionControlEnabled?: boolean | null;
+          admins?: Array<string | null> | null;
+          restricted?: boolean | null;
           batchTime: number;
           branch: string;
-          deactivatePrevious?: Maybe<boolean>;
-          disabledStatsCache?: Maybe<boolean>;
-          dispatchingDisabled?: Maybe<boolean>;
+          deactivatePrevious?: boolean | null;
+          disabledStatsCache?: boolean | null;
+          dispatchingDisabled?: boolean | null;
           displayName: string;
-          enabled?: Maybe<boolean>;
+          enabled?: boolean | null;
           owner: string;
-          patchingDisabled?: Maybe<boolean>;
+          patchingDisabled?: boolean | null;
           remotePath: string;
           repo: string;
-          repotrackerDisabled?: Maybe<boolean>;
+          repotrackerDisabled?: boolean | null;
           spawnHostScriptPath: string;
-          stepbackDisabled?: Maybe<boolean>;
-          notifyOnBuildFailure?: Maybe<boolean>;
-          githubTriggerAliases?: Maybe<Array<string>>;
-          perfEnabled?: Maybe<boolean>;
-          githubChecksEnabled?: Maybe<boolean>;
-          gitTagAuthorizedTeams?: Maybe<Array<string>>;
-          gitTagAuthorizedUsers?: Maybe<Array<string>>;
-          gitTagVersionsEnabled?: Maybe<boolean>;
-          manualPrTestingEnabled?: Maybe<boolean>;
-          prTestingEnabled?: Maybe<boolean>;
+          stepbackDisabled?: boolean | null;
+          notifyOnBuildFailure?: boolean | null;
+          githubTriggerAliases?: Array<string> | null;
+          perfEnabled?: boolean | null;
+          githubChecksEnabled?: boolean | null;
+          gitTagAuthorizedTeams?: Array<string> | null;
+          gitTagAuthorizedUsers?: Array<string> | null;
+          gitTagVersionsEnabled?: boolean | null;
+          manualPrTestingEnabled?: boolean | null;
+          prTestingEnabled?: boolean | null;
           taskSync: {
             __typename?: "TaskSyncOptions";
-            configEnabled?: Maybe<boolean>;
-            patchEnabled?: Maybe<boolean>;
+            configEnabled?: boolean | null;
+            patchEnabled?: boolean | null;
           };
-          banner?: Maybe<{
+          banner?: {
             __typename?: "ProjectBanner";
             text: string;
             theme: BannerTheme;
-          }>;
-          patchTriggerAliases?: Maybe<
-            Array<{
-              __typename?: "PatchTriggerAlias";
-              alias: string;
-              childProjectIdentifier: string;
-              parentAsModule?: Maybe<string>;
-              status?: Maybe<string>;
-              taskSpecifiers?: Maybe<
-                Array<{
-                  __typename?: "TaskSpecifier";
-                  patchAlias: string;
-                  taskRegex: string;
-                  variantRegex: string;
-                }>
-              >;
-            }>
-          >;
-          periodicBuilds?: Maybe<
-            Array<{
-              __typename?: "PeriodicBuild";
-              alias: string;
-              configFile: string;
-              id: string;
-              intervalHours: number;
-              message: string;
-              nextRunTime: Date;
-            }>
-          >;
+          } | null;
+          patchTriggerAliases?: Array<{
+            __typename?: "PatchTriggerAlias";
+            alias: string;
+            childProjectIdentifier: string;
+            parentAsModule?: string | null;
+            status?: string | null;
+            taskSpecifiers?: Array<{
+              __typename?: "TaskSpecifier";
+              patchAlias: string;
+              taskRegex: string;
+              variantRegex: string;
+            }> | null;
+          }> | null;
+          periodicBuilds?: Array<{
+            __typename?: "PeriodicBuild";
+            alias: string;
+            configFile: string;
+            cron: string;
+            id: string;
+            intervalHours: number;
+            message: string;
+            nextRunTime: Date;
+          }> | null;
           buildBaronSettings: {
             __typename?: "BuildBaronSettings";
             ticketCreateProject: string;
-            ticketSearchProjects?: Maybe<Array<string>>;
+            ticketSearchProjects?: Array<string> | null;
           };
-          externalLinks?: Maybe<
-            Array<{
-              __typename?: "ExternalLink";
-              displayName: string;
-              urlTemplate: string;
-            }>
-          >;
+          externalLinks?: Array<{
+            __typename?: "ExternalLink";
+            displayName: string;
+            urlTemplate: string;
+          }> | null;
           taskAnnotationSettings: {
             __typename?: "TaskAnnotationSettings";
             fileTicketWebhook: {
@@ -6727,213 +6554,194 @@ export type RepoEventLogsQuery = {
               endpoint: string;
               secret: string;
             };
-            jiraCustomFields?: Maybe<
-              Array<{
-                __typename?: "JiraField";
-                displayText: string;
-                field: string;
-              }>
-            >;
+            jiraCustomFields?: Array<{
+              __typename?: "JiraField";
+              displayText: string;
+              field: string;
+            }> | null;
           };
-          triggers?: Maybe<
-            Array<{
-              __typename?: "TriggerAlias";
-              alias: string;
-              buildVariantRegex: string;
-              configFile: string;
-              dateCutoff?: Maybe<number>;
-              level: string;
-              project: string;
-              status: string;
-              taskRegex: string;
-            }>
-          >;
+          triggers?: Array<{
+            __typename?: "TriggerAlias";
+            alias: string;
+            buildVariantRegex: string;
+            configFile: string;
+            dateCutoff?: number | null;
+            level: string;
+            project: string;
+            status: string;
+            taskRegex: string;
+          }> | null;
           workstationConfig: {
             __typename?: "WorkstationConfig";
-            gitClone?: Maybe<boolean>;
-            setupCommands?: Maybe<
-              Array<{
-                __typename?: "WorkstationSetupCommand";
-                command: string;
-                directory: string;
-              }>
-            >;
+            gitClone?: boolean | null;
+            setupCommands?: Array<{
+              __typename?: "WorkstationSetupCommand";
+              command: string;
+              directory: string;
+            }> | null;
           };
           commitQueue: {
             __typename?: "CommitQueueParams";
-            enabled?: Maybe<boolean>;
+            enabled?: boolean | null;
             mergeMethod: string;
             message: string;
           };
-        }>;
-        subscriptions?: Maybe<
-          Array<{
-            __typename?: "GeneralSubscription";
-            id: string;
-            ownerType: string;
-            resourceType: string;
-            trigger: string;
-            triggerData?: Maybe<{ [key: string]: any }>;
-            regexSelectors: Array<{
-              __typename?: "Selector";
-              data: string;
-              type: string;
-            }>;
-            selectors: Array<{
-              __typename?: "Selector";
-              data: string;
-              type: string;
-            }>;
-            subscriber?: Maybe<{
-              __typename?: "SubscriberWrapper";
-              type: string;
-              subscriber: {
-                __typename?: "Subscriber";
-                emailSubscriber?: Maybe<string>;
-                jiraCommentSubscriber?: Maybe<string>;
-                slackSubscriber?: Maybe<string>;
-                githubCheckSubscriber?: Maybe<{
-                  __typename?: "GithubCheckSubscriber";
-                  owner: string;
-                  ref: string;
-                  repo: string;
-                }>;
-                githubPRSubscriber?: Maybe<{
-                  __typename?: "GithubPRSubscriber";
-                  owner: string;
-                  prNumber?: Maybe<number>;
-                  ref: string;
-                  repo: string;
-                }>;
-                jiraIssueSubscriber?: Maybe<{
-                  __typename?: "JiraIssueSubscriber";
-                  issueType: string;
-                  project: string;
-                }>;
-                webhookSubscriber?: Maybe<{
-                  __typename?: "WebhookSubscriber";
-                  minDelayMs: number;
-                  retries: number;
-                  secret: string;
-                  timeoutMs: number;
-                  url: string;
-                  headers: Array<
-                    Maybe<{
-                      __typename?: "WebhookHeader";
-                      key: string;
-                      value: string;
-                    }>
-                  >;
-                }>;
-              };
-            }>;
-          }>
-        >;
-        vars?: Maybe<{
+        } | null;
+        subscriptions?: Array<{
+          __typename?: "GeneralSubscription";
+          id: string;
+          ownerType: string;
+          resourceType: string;
+          trigger: string;
+          triggerData?: { [key: string]: any } | null;
+          regexSelectors: Array<{
+            __typename?: "Selector";
+            data: string;
+            type: string;
+          }>;
+          selectors: Array<{
+            __typename?: "Selector";
+            data: string;
+            type: string;
+          }>;
+          subscriber?: {
+            __typename?: "SubscriberWrapper";
+            type: string;
+            subscriber: {
+              __typename?: "Subscriber";
+              emailSubscriber?: string | null;
+              jiraCommentSubscriber?: string | null;
+              slackSubscriber?: string | null;
+              githubCheckSubscriber?: {
+                __typename?: "GithubCheckSubscriber";
+                owner: string;
+                ref: string;
+                repo: string;
+              } | null;
+              githubPRSubscriber?: {
+                __typename?: "GithubPRSubscriber";
+                owner: string;
+                prNumber?: number | null;
+                ref: string;
+                repo: string;
+              } | null;
+              jiraIssueSubscriber?: {
+                __typename?: "JiraIssueSubscriber";
+                issueType: string;
+                project: string;
+              } | null;
+              webhookSubscriber?: {
+                __typename?: "WebhookSubscriber";
+                minDelayMs: number;
+                retries: number;
+                secret: string;
+                timeoutMs: number;
+                url: string;
+                headers: Array<{
+                  __typename?: "WebhookHeader";
+                  key: string;
+                  value: string;
+                } | null>;
+              } | null;
+            };
+          } | null;
+        }> | null;
+        vars?: {
           __typename?: "ProjectVars";
           adminOnlyVars: Array<string>;
           privateVars: Array<string>;
-          vars?: Maybe<{ [key: string]: any }>;
-        }>;
-      }>;
-      before?: Maybe<{
+          vars?: { [key: string]: any } | null;
+        } | null;
+      } | null;
+      before?: {
         __typename?: "ProjectEventSettings";
         githubWebhooksEnabled: boolean;
-        aliases?: Maybe<
-          Array<{
-            __typename?: "ProjectAlias";
-            alias: string;
-            gitTag: string;
-            id: string;
-            remotePath: string;
-            task: string;
-            taskTags: Array<string>;
-            variant: string;
-            variantTags: Array<string>;
-          }>
-        >;
-        projectRef?: Maybe<{
+        aliases?: Array<{
+          __typename?: "ProjectAlias";
+          alias: string;
+          gitTag: string;
+          id: string;
+          remotePath: string;
+          task: string;
+          taskTags: Array<string>;
+          variant: string;
+          variantTags: Array<string>;
+        }> | null;
+        projectRef?: {
           __typename?: "Project";
-          hidden?: Maybe<boolean>;
+          hidden?: boolean | null;
           identifier: string;
           repoRefId: string;
-          tracksPushEvents?: Maybe<boolean>;
-          versionControlEnabled?: Maybe<boolean>;
-          admins?: Maybe<Array<Maybe<string>>>;
-          restricted?: Maybe<boolean>;
+          tracksPushEvents?: boolean | null;
+          versionControlEnabled?: boolean | null;
+          admins?: Array<string | null> | null;
+          restricted?: boolean | null;
           batchTime: number;
           branch: string;
-          deactivatePrevious?: Maybe<boolean>;
-          disabledStatsCache?: Maybe<boolean>;
-          dispatchingDisabled?: Maybe<boolean>;
+          deactivatePrevious?: boolean | null;
+          disabledStatsCache?: boolean | null;
+          dispatchingDisabled?: boolean | null;
           displayName: string;
-          enabled?: Maybe<boolean>;
+          enabled?: boolean | null;
           owner: string;
-          patchingDisabled?: Maybe<boolean>;
+          patchingDisabled?: boolean | null;
           remotePath: string;
           repo: string;
-          repotrackerDisabled?: Maybe<boolean>;
+          repotrackerDisabled?: boolean | null;
           spawnHostScriptPath: string;
-          stepbackDisabled?: Maybe<boolean>;
-          notifyOnBuildFailure?: Maybe<boolean>;
-          githubTriggerAliases?: Maybe<Array<string>>;
-          perfEnabled?: Maybe<boolean>;
-          githubChecksEnabled?: Maybe<boolean>;
-          gitTagAuthorizedTeams?: Maybe<Array<string>>;
-          gitTagAuthorizedUsers?: Maybe<Array<string>>;
-          gitTagVersionsEnabled?: Maybe<boolean>;
-          manualPrTestingEnabled?: Maybe<boolean>;
-          prTestingEnabled?: Maybe<boolean>;
+          stepbackDisabled?: boolean | null;
+          notifyOnBuildFailure?: boolean | null;
+          githubTriggerAliases?: Array<string> | null;
+          perfEnabled?: boolean | null;
+          githubChecksEnabled?: boolean | null;
+          gitTagAuthorizedTeams?: Array<string> | null;
+          gitTagAuthorizedUsers?: Array<string> | null;
+          gitTagVersionsEnabled?: boolean | null;
+          manualPrTestingEnabled?: boolean | null;
+          prTestingEnabled?: boolean | null;
           taskSync: {
             __typename?: "TaskSyncOptions";
-            configEnabled?: Maybe<boolean>;
-            patchEnabled?: Maybe<boolean>;
+            configEnabled?: boolean | null;
+            patchEnabled?: boolean | null;
           };
-          banner?: Maybe<{
+          banner?: {
             __typename?: "ProjectBanner";
             text: string;
             theme: BannerTheme;
-          }>;
-          patchTriggerAliases?: Maybe<
-            Array<{
-              __typename?: "PatchTriggerAlias";
-              alias: string;
-              childProjectIdentifier: string;
-              parentAsModule?: Maybe<string>;
-              status?: Maybe<string>;
-              taskSpecifiers?: Maybe<
-                Array<{
-                  __typename?: "TaskSpecifier";
-                  patchAlias: string;
-                  taskRegex: string;
-                  variantRegex: string;
-                }>
-              >;
-            }>
-          >;
-          periodicBuilds?: Maybe<
-            Array<{
-              __typename?: "PeriodicBuild";
-              alias: string;
-              configFile: string;
-              id: string;
-              intervalHours: number;
-              message: string;
-              nextRunTime: Date;
-            }>
-          >;
+          } | null;
+          patchTriggerAliases?: Array<{
+            __typename?: "PatchTriggerAlias";
+            alias: string;
+            childProjectIdentifier: string;
+            parentAsModule?: string | null;
+            status?: string | null;
+            taskSpecifiers?: Array<{
+              __typename?: "TaskSpecifier";
+              patchAlias: string;
+              taskRegex: string;
+              variantRegex: string;
+            }> | null;
+          }> | null;
+          periodicBuilds?: Array<{
+            __typename?: "PeriodicBuild";
+            alias: string;
+            configFile: string;
+            cron: string;
+            id: string;
+            intervalHours: number;
+            message: string;
+            nextRunTime: Date;
+          }> | null;
           buildBaronSettings: {
             __typename?: "BuildBaronSettings";
             ticketCreateProject: string;
-            ticketSearchProjects?: Maybe<Array<string>>;
+            ticketSearchProjects?: Array<string> | null;
           };
-          externalLinks?: Maybe<
-            Array<{
-              __typename?: "ExternalLink";
-              displayName: string;
-              urlTemplate: string;
-            }>
-          >;
+          externalLinks?: Array<{
+            __typename?: "ExternalLink";
+            displayName: string;
+            urlTemplate: string;
+          }> | null;
           taskAnnotationSettings: {
             __typename?: "TaskAnnotationSettings";
             fileTicketWebhook: {
@@ -6941,115 +6749,105 @@ export type RepoEventLogsQuery = {
               endpoint: string;
               secret: string;
             };
-            jiraCustomFields?: Maybe<
-              Array<{
-                __typename?: "JiraField";
-                displayText: string;
-                field: string;
-              }>
-            >;
+            jiraCustomFields?: Array<{
+              __typename?: "JiraField";
+              displayText: string;
+              field: string;
+            }> | null;
           };
-          triggers?: Maybe<
-            Array<{
-              __typename?: "TriggerAlias";
-              alias: string;
-              buildVariantRegex: string;
-              configFile: string;
-              dateCutoff?: Maybe<number>;
-              level: string;
-              project: string;
-              status: string;
-              taskRegex: string;
-            }>
-          >;
+          triggers?: Array<{
+            __typename?: "TriggerAlias";
+            alias: string;
+            buildVariantRegex: string;
+            configFile: string;
+            dateCutoff?: number | null;
+            level: string;
+            project: string;
+            status: string;
+            taskRegex: string;
+          }> | null;
           workstationConfig: {
             __typename?: "WorkstationConfig";
-            gitClone?: Maybe<boolean>;
-            setupCommands?: Maybe<
-              Array<{
-                __typename?: "WorkstationSetupCommand";
-                command: string;
-                directory: string;
-              }>
-            >;
+            gitClone?: boolean | null;
+            setupCommands?: Array<{
+              __typename?: "WorkstationSetupCommand";
+              command: string;
+              directory: string;
+            }> | null;
           };
           commitQueue: {
             __typename?: "CommitQueueParams";
-            enabled?: Maybe<boolean>;
+            enabled?: boolean | null;
             mergeMethod: string;
             message: string;
           };
-        }>;
-        subscriptions?: Maybe<
-          Array<{
-            __typename?: "GeneralSubscription";
-            id: string;
-            ownerType: string;
-            resourceType: string;
-            trigger: string;
-            triggerData?: Maybe<{ [key: string]: any }>;
-            regexSelectors: Array<{
-              __typename?: "Selector";
-              data: string;
-              type: string;
-            }>;
-            selectors: Array<{
-              __typename?: "Selector";
-              data: string;
-              type: string;
-            }>;
-            subscriber?: Maybe<{
-              __typename?: "SubscriberWrapper";
-              type: string;
-              subscriber: {
-                __typename?: "Subscriber";
-                emailSubscriber?: Maybe<string>;
-                jiraCommentSubscriber?: Maybe<string>;
-                slackSubscriber?: Maybe<string>;
-                githubCheckSubscriber?: Maybe<{
-                  __typename?: "GithubCheckSubscriber";
-                  owner: string;
-                  ref: string;
-                  repo: string;
-                }>;
-                githubPRSubscriber?: Maybe<{
-                  __typename?: "GithubPRSubscriber";
-                  owner: string;
-                  prNumber?: Maybe<number>;
-                  ref: string;
-                  repo: string;
-                }>;
-                jiraIssueSubscriber?: Maybe<{
-                  __typename?: "JiraIssueSubscriber";
-                  issueType: string;
-                  project: string;
-                }>;
-                webhookSubscriber?: Maybe<{
-                  __typename?: "WebhookSubscriber";
-                  minDelayMs: number;
-                  retries: number;
-                  secret: string;
-                  timeoutMs: number;
-                  url: string;
-                  headers: Array<
-                    Maybe<{
-                      __typename?: "WebhookHeader";
-                      key: string;
-                      value: string;
-                    }>
-                  >;
-                }>;
-              };
-            }>;
-          }>
-        >;
-        vars?: Maybe<{
+        } | null;
+        subscriptions?: Array<{
+          __typename?: "GeneralSubscription";
+          id: string;
+          ownerType: string;
+          resourceType: string;
+          trigger: string;
+          triggerData?: { [key: string]: any } | null;
+          regexSelectors: Array<{
+            __typename?: "Selector";
+            data: string;
+            type: string;
+          }>;
+          selectors: Array<{
+            __typename?: "Selector";
+            data: string;
+            type: string;
+          }>;
+          subscriber?: {
+            __typename?: "SubscriberWrapper";
+            type: string;
+            subscriber: {
+              __typename?: "Subscriber";
+              emailSubscriber?: string | null;
+              jiraCommentSubscriber?: string | null;
+              slackSubscriber?: string | null;
+              githubCheckSubscriber?: {
+                __typename?: "GithubCheckSubscriber";
+                owner: string;
+                ref: string;
+                repo: string;
+              } | null;
+              githubPRSubscriber?: {
+                __typename?: "GithubPRSubscriber";
+                owner: string;
+                prNumber?: number | null;
+                ref: string;
+                repo: string;
+              } | null;
+              jiraIssueSubscriber?: {
+                __typename?: "JiraIssueSubscriber";
+                issueType: string;
+                project: string;
+              } | null;
+              webhookSubscriber?: {
+                __typename?: "WebhookSubscriber";
+                minDelayMs: number;
+                retries: number;
+                secret: string;
+                timeoutMs: number;
+                url: string;
+                headers: Array<{
+                  __typename?: "WebhookHeader";
+                  key: string;
+                  value: string;
+                } | null>;
+              } | null;
+            };
+          } | null;
+        }> | null;
+        vars?: {
           __typename?: "ProjectVars";
           adminOnlyVars: Array<string>;
           privateVars: Array<string>;
-          vars?: Maybe<{ [key: string]: any }>;
-        }>;
-      }>;
+          vars?: { [key: string]: any } | null;
+        } | null;
+      } | null;
     }>;
   };
 };
@@ -7063,20 +6861,18 @@ export type RepoSettingsQuery = {
   repoSettings: {
     __typename?: "RepoSettings";
     githubWebhooksEnabled: boolean;
-    aliases?: Maybe<
-      Array<{
-        __typename?: "ProjectAlias";
-        alias: string;
-        gitTag: string;
-        id: string;
-        remotePath: string;
-        task: string;
-        taskTags: Array<string>;
-        variant: string;
-        variantTags: Array<string>;
-      }>
-    >;
-    projectRef?: Maybe<{
+    aliases?: Array<{
+      __typename?: "ProjectAlias";
+      alias: string;
+      gitTag: string;
+      id: string;
+      remotePath: string;
+      task: string;
+      taskTags: Array<string>;
+      variant: string;
+      variantTags: Array<string>;
+    }> | null;
+    projectRef?: {
       __typename?: "RepoRef";
       displayName: string;
       id: string;
@@ -7095,67 +6891,58 @@ export type RepoSettingsQuery = {
       stepbackDisabled: boolean;
       versionControlEnabled: boolean;
       notifyOnBuildFailure: boolean;
-      githubTriggerAliases?: Maybe<Array<string>>;
+      githubTriggerAliases?: Array<string> | null;
       perfEnabled: boolean;
       githubChecksEnabled: boolean;
-      gitTagAuthorizedTeams?: Maybe<Array<string>>;
-      gitTagAuthorizedUsers?: Maybe<Array<string>>;
+      gitTagAuthorizedTeams?: Array<string> | null;
+      gitTagAuthorizedUsers?: Array<string> | null;
       gitTagVersionsEnabled: boolean;
       manualPrTestingEnabled: boolean;
       prTestingEnabled: boolean;
-      containerSizeDefinitions?: Maybe<
-        Array<{
-          __typename?: "ContainerResources";
-          cpu: number;
-          memoryMb: number;
-          name: string;
-        }>
-      >;
+      containerSizeDefinitions?: Array<{
+        __typename?: "ContainerResources";
+        cpu: number;
+        memoryMb: number;
+        name: string;
+      }> | null;
       taskSync: {
         __typename?: "RepoTaskSyncOptions";
         configEnabled: boolean;
         patchEnabled: boolean;
       };
-      patchTriggerAliases?: Maybe<
-        Array<{
-          __typename?: "PatchTriggerAlias";
-          alias: string;
-          childProjectIdentifier: string;
-          parentAsModule?: Maybe<string>;
-          status?: Maybe<string>;
-          taskSpecifiers?: Maybe<
-            Array<{
-              __typename?: "TaskSpecifier";
-              patchAlias: string;
-              taskRegex: string;
-              variantRegex: string;
-            }>
-          >;
-        }>
-      >;
-      periodicBuilds?: Maybe<
-        Array<{
-          __typename?: "PeriodicBuild";
-          alias: string;
-          configFile: string;
-          id: string;
-          intervalHours: number;
-          message: string;
-          nextRunTime: Date;
-        }>
-      >;
+      patchTriggerAliases?: Array<{
+        __typename?: "PatchTriggerAlias";
+        alias: string;
+        childProjectIdentifier: string;
+        parentAsModule?: string | null;
+        status?: string | null;
+        taskSpecifiers?: Array<{
+          __typename?: "TaskSpecifier";
+          patchAlias: string;
+          taskRegex: string;
+          variantRegex: string;
+        }> | null;
+      }> | null;
+      periodicBuilds?: Array<{
+        __typename?: "PeriodicBuild";
+        alias: string;
+        configFile: string;
+        cron: string;
+        id: string;
+        intervalHours: number;
+        message: string;
+        nextRunTime: Date;
+      }> | null;
       buildBaronSettings: {
         __typename?: "BuildBaronSettings";
         ticketCreateProject: string;
-        ticketSearchProjects?: Maybe<Array<string>>;
+        ticketSearchProjects?: Array<string> | null;
       };
-      externalLinks?: Maybe<
-        Array<{
-          __typename?: "ExternalLink";
-          displayName: string;
-          urlTemplate: string;
-        }>
-      >;
+      externalLinks?: Array<{
+        __typename?: "ExternalLink";
+        displayName: string;
+        urlTemplate: string;
+      }> | null;
       taskAnnotationSettings: {
         __typename?: "TaskAnnotationSettings";
         fileTicketWebhook: {
@@ -7163,20 +6950,18 @@ export type RepoSettingsQuery = {
           endpoint: string;
           secret: string;
         };
-        jiraCustomFields?: Maybe<
-          Array<{
-            __typename?: "JiraField";
-            displayText: string;
-            field: string;
-          }>
-        >;
+        jiraCustomFields?: Array<{
+          __typename?: "JiraField";
+          displayText: string;
+          field: string;
+        }> | null;
       };
       triggers: Array<{
         __typename?: "TriggerAlias";
         alias: string;
         buildVariantRegex: string;
         configFile: string;
-        dateCutoff?: Maybe<number>;
+        dateCutoff?: number | null;
         level: string;
         project: string;
         status: string;
@@ -7185,13 +6970,11 @@ export type RepoSettingsQuery = {
       workstationConfig: {
         __typename?: "RepoWorkstationConfig";
         gitClone: boolean;
-        setupCommands?: Maybe<
-          Array<{
-            __typename?: "WorkstationSetupCommand";
-            command: string;
-            directory: string;
-          }>
-        >;
+        setupCommands?: Array<{
+          __typename?: "WorkstationSetupCommand";
+          command: string;
+          directory: string;
+        }> | null;
       };
       commitQueue: {
         __typename?: "RepoCommitQueueParams";
@@ -7199,76 +6982,68 @@ export type RepoSettingsQuery = {
         mergeMethod: string;
         message: string;
       };
-    }>;
-    subscriptions?: Maybe<
-      Array<{
-        __typename?: "GeneralSubscription";
-        id: string;
-        ownerType: string;
-        resourceType: string;
-        trigger: string;
-        triggerData?: Maybe<{ [key: string]: any }>;
-        regexSelectors: Array<{
-          __typename?: "Selector";
-          data: string;
-          type: string;
-        }>;
-        selectors: Array<{
-          __typename?: "Selector";
-          data: string;
-          type: string;
-        }>;
-        subscriber?: Maybe<{
-          __typename?: "SubscriberWrapper";
-          type: string;
-          subscriber: {
-            __typename?: "Subscriber";
-            emailSubscriber?: Maybe<string>;
-            jiraCommentSubscriber?: Maybe<string>;
-            slackSubscriber?: Maybe<string>;
-            githubCheckSubscriber?: Maybe<{
-              __typename?: "GithubCheckSubscriber";
-              owner: string;
-              ref: string;
-              repo: string;
-            }>;
-            githubPRSubscriber?: Maybe<{
-              __typename?: "GithubPRSubscriber";
-              owner: string;
-              prNumber?: Maybe<number>;
-              ref: string;
-              repo: string;
-            }>;
-            jiraIssueSubscriber?: Maybe<{
-              __typename?: "JiraIssueSubscriber";
-              issueType: string;
-              project: string;
-            }>;
-            webhookSubscriber?: Maybe<{
-              __typename?: "WebhookSubscriber";
-              minDelayMs: number;
-              retries: number;
-              secret: string;
-              timeoutMs: number;
-              url: string;
-              headers: Array<
-                Maybe<{
-                  __typename?: "WebhookHeader";
-                  key: string;
-                  value: string;
-                }>
-              >;
-            }>;
-          };
-        }>;
-      }>
-    >;
-    vars?: Maybe<{
+    } | null;
+    subscriptions?: Array<{
+      __typename?: "GeneralSubscription";
+      id: string;
+      ownerType: string;
+      resourceType: string;
+      trigger: string;
+      triggerData?: { [key: string]: any } | null;
+      regexSelectors: Array<{
+        __typename?: "Selector";
+        data: string;
+        type: string;
+      }>;
+      selectors: Array<{ __typename?: "Selector"; data: string; type: string }>;
+      subscriber?: {
+        __typename?: "SubscriberWrapper";
+        type: string;
+        subscriber: {
+          __typename?: "Subscriber";
+          emailSubscriber?: string | null;
+          jiraCommentSubscriber?: string | null;
+          slackSubscriber?: string | null;
+          githubCheckSubscriber?: {
+            __typename?: "GithubCheckSubscriber";
+            owner: string;
+            ref: string;
+            repo: string;
+          } | null;
+          githubPRSubscriber?: {
+            __typename?: "GithubPRSubscriber";
+            owner: string;
+            prNumber?: number | null;
+            ref: string;
+            repo: string;
+          } | null;
+          jiraIssueSubscriber?: {
+            __typename?: "JiraIssueSubscriber";
+            issueType: string;
+            project: string;
+          } | null;
+          webhookSubscriber?: {
+            __typename?: "WebhookSubscriber";
+            minDelayMs: number;
+            retries: number;
+            secret: string;
+            timeoutMs: number;
+            url: string;
+            headers: Array<{
+              __typename?: "WebhookHeader";
+              key: string;
+              value: string;
+            } | null>;
+          } | null;
+        };
+      } | null;
+    }> | null;
+    vars?: {
       __typename?: "ProjectVars";
       adminOnlyVars: Array<string>;
       privateVars: Array<string>;
-      vars?: Maybe<{ [key: string]: any }>;
-    }>;
+      vars?: { [key: string]: any } | null;
+    } | null;
   };
 };
 
@@ -7276,35 +7051,35 @@ export type SpruceConfigQueryVariables = Exact<{ [key: string]: never }>;
 
 export type SpruceConfigQuery = {
   __typename?: "Query";
-  spruceConfig?: Maybe<{
+  spruceConfig?: {
     __typename?: "SpruceConfig";
-    banner?: Maybe<string>;
-    bannerTheme?: Maybe<string>;
-    jira?: Maybe<{ __typename?: "JiraConfig"; host?: Maybe<string> }>;
-    providers?: Maybe<{
+    banner?: string | null;
+    bannerTheme?: string | null;
+    jira?: { __typename?: "JiraConfig"; host?: string | null } | null;
+    providers?: {
       __typename?: "CloudProviderConfig";
-      aws?: Maybe<{
+      aws?: {
         __typename?: "AWSConfig";
-        maxVolumeSizePerUser?: Maybe<number>;
-        pod?: Maybe<{
+        maxVolumeSizePerUser?: number | null;
+        pod?: {
           __typename?: "AWSPodConfig";
-          ecs?: Maybe<{
+          ecs?: {
             __typename?: "ECSConfig";
             maxCPU: number;
             maxMemoryMb: number;
-          }>;
-        }>;
-      }>;
-    }>;
-    slack?: Maybe<{ __typename?: "SlackConfig"; name?: Maybe<string> }>;
+          } | null;
+        } | null;
+      } | null;
+    } | null;
+    slack?: { __typename?: "SlackConfig"; name?: string | null } | null;
     spawnHost: {
       __typename?: "SpawnHostConfig";
       spawnHostsPerUser: number;
       unexpirableHostsPerUser: number;
       unexpirableVolumesPerUser: number;
     };
-    ui?: Maybe<{ __typename?: "UIConfig"; defaultProject: string }>;
-  }>;
+    ui?: { __typename?: "UIConfig"; defaultProject: string } | null;
+  } | null;
 };
 
 export type SystemLogsQueryVariables = Exact<{
@@ -7314,7 +7089,7 @@ export type SystemLogsQueryVariables = Exact<{
 
 export type SystemLogsQuery = {
   __typename?: "Query";
-  task?: Maybe<{
+  task?: {
     __typename?: "Task";
     execution: number;
     id: string;
@@ -7322,12 +7097,12 @@ export type SystemLogsQuery = {
       __typename?: "TaskLogs";
       systemLogs: Array<{
         __typename?: "LogMessage";
-        message?: Maybe<string>;
-        severity?: Maybe<string>;
-        timestamp?: Maybe<Date>;
+        message?: string | null;
+        severity?: string | null;
+        timestamp?: Date | null;
       }>;
     };
-  }>;
+  } | null;
 };
 
 export type TaskAllExecutionsQueryVariables = Exact<{
@@ -7338,10 +7113,10 @@ export type TaskAllExecutionsQuery = {
   __typename?: "Query";
   taskAllExecutions: Array<{
     __typename?: "Task";
-    activatedTime?: Maybe<Date>;
+    activatedTime?: Date | null;
     execution: number;
     id: string;
-    ingestTime?: Maybe<Date>;
+    ingestTime?: Date | null;
     status: string;
   }>;
 };
@@ -7353,7 +7128,7 @@ export type TaskEventLogsQueryVariables = Exact<{
 
 export type TaskEventLogsQuery = {
   __typename?: "Query";
-  task?: Maybe<{
+  task?: {
     __typename?: "Task";
     execution: number;
     id: string;
@@ -7361,23 +7136,23 @@ export type TaskEventLogsQuery = {
       __typename?: "TaskLogs";
       eventLogs: Array<{
         __typename?: "TaskEventLogEntry";
-        eventType?: Maybe<string>;
+        eventType?: string | null;
         id: string;
-        timestamp?: Maybe<Date>;
+        timestamp?: Date | null;
         data: {
           __typename?: "TaskEventLogData";
-          hostId?: Maybe<string>;
-          jiraIssue?: Maybe<string>;
-          jiraLink?: Maybe<string>;
-          podId?: Maybe<string>;
-          priority?: Maybe<number>;
-          status?: Maybe<string>;
-          timestamp?: Maybe<Date>;
-          userId?: Maybe<string>;
+          hostId?: string | null;
+          jiraIssue?: string | null;
+          jiraLink?: string | null;
+          podId?: string | null;
+          priority?: number | null;
+          status?: string | null;
+          timestamp?: Date | null;
+          userId?: string | null;
         };
       }>;
     };
-  }>;
+  } | null;
 };
 
 export type TaskFilesQueryVariables = Exact<{
@@ -7387,7 +7162,7 @@ export type TaskFilesQueryVariables = Exact<{
 
 export type TaskFilesQuery = {
   __typename?: "Query";
-  task?: Maybe<{
+  task?: {
     __typename?: "Task";
     execution: number;
     id: string;
@@ -7396,13 +7171,15 @@ export type TaskFilesQuery = {
       fileCount: number;
       groupedFiles: Array<{
         __typename?: "GroupedFiles";
-        taskName?: Maybe<string>;
-        files?: Maybe<
-          Array<{ __typename?: "File"; link: string; name: string }>
-        >;
+        taskName?: string | null;
+        files?: Array<{
+          __typename?: "File";
+          link: string;
+          name: string;
+        }> | null;
       }>;
     };
-  }>;
+  } | null;
 };
 
 export type TaskLogsQueryVariables = Exact<{
@@ -7412,7 +7189,7 @@ export type TaskLogsQueryVariables = Exact<{
 
 export type TaskLogsQuery = {
   __typename?: "Query";
-  task?: Maybe<{
+  task?: {
     __typename?: "Task";
     execution: number;
     id: string;
@@ -7420,12 +7197,12 @@ export type TaskLogsQuery = {
       __typename?: "TaskLogs";
       taskLogs: Array<{
         __typename?: "LogMessage";
-        message?: Maybe<string>;
-        severity?: Maybe<string>;
-        timestamp?: Maybe<Date>;
+        message?: string | null;
+        severity?: string | null;
+        timestamp?: Date | null;
       }>;
     };
-  }>;
+  } | null;
 };
 
 export type TaskNamesForBuildVariantQueryVariables = Exact<{
@@ -7435,7 +7212,7 @@ export type TaskNamesForBuildVariantQueryVariables = Exact<{
 
 export type TaskNamesForBuildVariantQuery = {
   __typename?: "Query";
-  taskNamesForBuildVariant?: Maybe<Array<string>>;
+  taskNamesForBuildVariant?: Array<string> | null;
 };
 
 export type TaskStatusesQueryVariables = Exact<{
@@ -7459,15 +7236,13 @@ export type TaskTestSampleQueryVariables = Exact<{
 
 export type TaskTestSampleQuery = {
   __typename?: "Query";
-  taskTestSample?: Maybe<
-    Array<{
-      __typename?: "TaskTestResultSample";
-      execution: number;
-      matchingFailedTestNames: Array<string>;
-      taskId: string;
-      totalTestCount: number;
-    }>
-  >;
+  taskTestSample?: Array<{
+    __typename?: "TaskTestResultSample";
+    execution: number;
+    matchingFailedTestNames: Array<string>;
+    taskId: string;
+    totalTestCount: number;
+  }> | null;
 };
 
 export type TaskTestsQueryVariables = Exact<{
@@ -7482,7 +7257,7 @@ export type TaskTestsQueryVariables = Exact<{
 
 export type TaskTestsQuery = {
   __typename?: "Query";
-  task?: Maybe<{
+  task?: {
     __typename?: "Task";
     execution: number;
     id: string;
@@ -7492,21 +7267,21 @@ export type TaskTestsQuery = {
       totalTestCount: number;
       testResults: Array<{
         __typename?: "TestResult";
-        baseStatus?: Maybe<string>;
-        duration?: Maybe<number>;
+        baseStatus?: string | null;
+        duration?: number | null;
         id: string;
         status: string;
         testFile: string;
         logs: {
           __typename?: "TestLog";
-          url?: Maybe<string>;
-          urlLobster?: Maybe<string>;
-          urlParsley?: Maybe<string>;
-          urlRaw?: Maybe<string>;
+          url?: string | null;
+          urlLobster?: string | null;
+          urlParsley?: string | null;
+          urlRaw?: string | null;
         };
       }>;
     };
-  }>;
+  } | null;
 };
 
 export type TaskQueryVariables = Exact<{
@@ -7516,12 +7291,12 @@ export type TaskQueryVariables = Exact<{
 
 export type TaskQuery = {
   __typename?: "Query";
-  task?: Maybe<{
+  task?: {
     __typename?: "Task";
     aborted: boolean;
-    activatedBy?: Maybe<string>;
-    activatedTime?: Maybe<Date>;
-    ami?: Maybe<string>;
+    activatedBy?: string | null;
+    activatedTime?: Date | null;
+    ami?: string | null;
     blocked: boolean;
     canAbort: boolean;
     canDisable: boolean;
@@ -7532,34 +7307,34 @@ export type TaskQuery = {
     canSetPriority: boolean;
     canUnschedule: boolean;
     distroId: string;
-    estimatedStart?: Maybe<number>;
-    expectedDuration?: Maybe<number>;
+    estimatedStart?: number | null;
+    expectedDuration?: number | null;
     failedTestCount: number;
-    finishTime?: Maybe<Date>;
-    generatedBy?: Maybe<string>;
-    generatedByName?: Maybe<string>;
-    hostId?: Maybe<string>;
-    ingestTime?: Maybe<Date>;
+    finishTime?: Date | null;
+    generatedBy?: string | null;
+    generatedByName?: string | null;
+    hostId?: string | null;
+    ingestTime?: Date | null;
     isPerfPluginEnabled: boolean;
     latestExecution: number;
     minQueuePosition: number;
     order: number;
-    patchNumber?: Maybe<number>;
-    priority?: Maybe<number>;
+    patchNumber?: number | null;
+    priority?: number | null;
     requester: string;
     resetWhenFinished: boolean;
-    spawnHostLink?: Maybe<string>;
-    startTime?: Maybe<Date>;
-    timeTaken?: Maybe<number>;
+    spawnHostLink?: string | null;
+    startTime?: Date | null;
+    timeTaken?: number | null;
     totalTestCount: number;
     buildVariant: string;
-    buildVariantDisplayName?: Maybe<string>;
+    buildVariantDisplayName?: string | null;
     displayName: string;
     execution: number;
     id: string;
-    revision?: Maybe<string>;
+    revision?: string | null;
     status: string;
-    abortInfo?: Maybe<{
+    abortInfo?: {
       __typename?: "AbortInfo";
       buildVariantDisplayName: string;
       newVersion: string;
@@ -7567,47 +7342,41 @@ export type TaskQuery = {
       taskDisplayName: string;
       taskID: string;
       user: string;
-    }>;
-    annotation?: Maybe<{
+    } | null;
+    annotation?: {
       __typename?: "Annotation";
       id: string;
       taskExecution: number;
       taskId: string;
       webhookConfigured: boolean;
-      createdIssues?: Maybe<
-        Array<
-          Maybe<{
-            __typename?: "IssueLink";
-            issueKey?: Maybe<string>;
-            url?: Maybe<string>;
-            source?: Maybe<{
-              __typename?: "Source";
-              author: string;
-              requester: string;
-              time: Date;
-            }>;
-          }>
-        >
-      >;
-      issues?: Maybe<
-        Array<
-          Maybe<{
-            __typename?: "IssueLink";
-            issueKey?: Maybe<string>;
-            url?: Maybe<string>;
-            source?: Maybe<{
-              __typename?: "Source";
-              author: string;
-              requester: string;
-              time: Date;
-            }>;
-          }>
-        >
-      >;
-      metadataLinks?: Maybe<
-        Array<Maybe<{ __typename?: "MetadataLink"; text: string; url: string }>>
-      >;
-      note?: Maybe<{
+      createdIssues?: Array<{
+        __typename?: "IssueLink";
+        issueKey?: string | null;
+        url?: string | null;
+        source?: {
+          __typename?: "Source";
+          author: string;
+          requester: string;
+          time: Date;
+        } | null;
+      } | null> | null;
+      issues?: Array<{
+        __typename?: "IssueLink";
+        issueKey?: string | null;
+        url?: string | null;
+        source?: {
+          __typename?: "Source";
+          author: string;
+          requester: string;
+          time: Date;
+        } | null;
+      } | null> | null;
+      metadataLinks?: Array<{
+        __typename?: "MetadataLink";
+        text: string;
+        url: string;
+      } | null> | null;
+      note?: {
         __typename?: "Note";
         message: string;
         source: {
@@ -7616,81 +7385,73 @@ export type TaskQuery = {
           requester: string;
           time: Date;
         };
-      }>;
-      suspectedIssues?: Maybe<
-        Array<
-          Maybe<{
-            __typename?: "IssueLink";
-            issueKey?: Maybe<string>;
-            url?: Maybe<string>;
-            source?: Maybe<{
-              __typename?: "Source";
-              author: string;
-              requester: string;
-              time: Date;
-            }>;
-          }>
-        >
-      >;
-    }>;
-    baseTask?: Maybe<{
+      } | null;
+      suspectedIssues?: Array<{
+        __typename?: "IssueLink";
+        issueKey?: string | null;
+        url?: string | null;
+        source?: {
+          __typename?: "Source";
+          author: string;
+          requester: string;
+          time: Date;
+        } | null;
+      } | null> | null;
+    } | null;
+    baseTask?: {
       __typename?: "Task";
       execution: number;
       id: string;
-      timeTaken?: Maybe<number>;
+      timeTaken?: number | null;
       versionMetadata: { __typename?: "Version"; id: string; revision: string };
-    }>;
-    dependsOn?: Maybe<
-      Array<{
-        __typename?: "Dependency";
-        buildVariant: string;
-        metStatus: MetStatus;
-        name: string;
-        requiredStatus: RequiredStatus;
-        taskId: string;
-      }>
-    >;
-    details?: Maybe<{
+    } | null;
+    dependsOn?: Array<{
+      __typename?: "Dependency";
+      buildVariant: string;
+      metStatus: MetStatus;
+      name: string;
+      requiredStatus: RequiredStatus;
+      taskId: string;
+    }> | null;
+    details?: {
       __typename?: "TaskEndDetail";
-      description?: Maybe<string>;
+      description?: string | null;
       status: string;
-      timedOut?: Maybe<boolean>;
-      timeoutType?: Maybe<string>;
+      timedOut?: boolean | null;
+      timeoutType?: string | null;
       type: string;
       oomTracker: {
         __typename?: "OomTrackerInfo";
         detected: boolean;
-        pids?: Maybe<Array<Maybe<number>>>;
+        pids?: Array<number | null> | null;
       };
-    }>;
-    displayTask?: Maybe<{
+    } | null;
+    displayTask?: {
       __typename?: "Task";
       displayName: string;
       execution: number;
       id: string;
-    }>;
-    executionTasksFull?: Maybe<
-      Array<{
-        __typename?: "Task";
-        baseStatus?: Maybe<string>;
-        buildVariant: string;
-        buildVariantDisplayName?: Maybe<string>;
-        displayName: string;
-        execution: number;
-        id: string;
-        status: string;
-      }>
-    >;
+    } | null;
+    executionTasksFull?: Array<{
+      __typename?: "Task";
+      baseStatus?: string | null;
+      buildVariant: string;
+      buildVariantDisplayName?: string | null;
+      displayName: string;
+      execution: number;
+      id: string;
+      status: string;
+    }> | null;
     logs: {
       __typename?: "TaskLogLinks";
-      agentLogLink?: Maybe<string>;
-      allLogLink?: Maybe<string>;
-      eventLogLink?: Maybe<string>;
-      systemLogLink?: Maybe<string>;
-      taskLogLink?: Maybe<string>;
+      agentLogLink?: string | null;
+      allLogLink?: string | null;
+      eventLogLink?: string | null;
+      systemLogLink?: string | null;
+      taskLogLink?: string | null;
     };
-    pod?: Maybe<{ __typename?: "Pod"; id: string }>;
-    project?: Maybe<{ __typename?: "Project"; id: string; identifier: string }>;
+    pod?: { __typename?: "Pod"; id: string } | null;
+    project?: { __typename?: "Project"; id: string; identifier: string } | null;
     taskFiles: { __typename?: "TaskFiles"; fileCount: number };
     versionMetadata: {
       __typename?: "Version";
@@ -7703,7 +7464,7 @@ export type TaskQuery = {
       projectIdentifier: string;
       revision: string;
     };
-  }>;
+  } | null;
 };
 
 export type UndispatchedTasksQueryVariables = Exact<{
@@ -7720,7 +7481,7 @@ export type UndispatchedTasksQuery = {
       data: Array<{
         __typename?: "Task";
         buildVariant: string;
-        buildVariantDisplayName?: Maybe<string>;
+        buildVariantDisplayName?: string | null;
         displayName: string;
         execution: number;
         id: string;
@@ -7733,13 +7494,13 @@ export type UserConfigQueryVariables = Exact<{ [key: string]: never }>;
 
 export type UserConfigQuery = {
   __typename?: "Query";
-  userConfig?: Maybe<{
+  userConfig?: {
     __typename?: "UserConfig";
     api_key: string;
     api_server_host: string;
     ui_server_host: string;
     user: string;
-  }>;
+  } | null;
 };
 
 export type UserPermissionsQueryVariables = Exact<{ [key: string]: never }>;
@@ -7757,33 +7518,33 @@ export type UserSettingsQueryVariables = Exact<{ [key: string]: never }>;
 
 export type UserSettingsQuery = {
   __typename?: "Query";
-  userSettings?: Maybe<{
+  userSettings?: {
     __typename?: "UserSettings";
-    dateFormat?: Maybe<string>;
-    region?: Maybe<string>;
-    slackMemberId?: Maybe<string>;
-    slackUsername?: Maybe<string>;
-    timezone?: Maybe<string>;
-    githubUser?: Maybe<{
+    dateFormat?: string | null;
+    region?: string | null;
+    slackMemberId?: string | null;
+    slackUsername?: string | null;
+    timezone?: string | null;
+    githubUser?: {
       __typename?: "GithubUser";
-      lastKnownAs?: Maybe<string>;
-    }>;
-    notifications?: Maybe<{
+      lastKnownAs?: string | null;
+    } | null;
+    notifications?: {
       __typename?: "Notifications";
-      buildBreak?: Maybe<string>;
-      commitQueue?: Maybe<string>;
-      patchFinish?: Maybe<string>;
-      patchFirstFailure?: Maybe<string>;
-      spawnHostExpiration?: Maybe<string>;
-      spawnHostOutcome?: Maybe<string>;
-    }>;
-    useSpruceOptions?: Maybe<{
+      buildBreak?: string | null;
+      commitQueue?: string | null;
+      patchFinish?: string | null;
+      patchFirstFailure?: string | null;
+      spawnHostExpiration?: string | null;
+      spawnHostOutcome?: string | null;
+    } | null;
+    useSpruceOptions?: {
       __typename?: "UseSpruceOptions";
-      hasUsedMainlineCommitsBefore?: Maybe<boolean>;
-      hasUsedSpruceBefore?: Maybe<boolean>;
-      spruceV1?: Maybe<boolean>;
-    }>;
-  }>;
+      hasUsedMainlineCommitsBefore?: boolean | null;
+      hasUsedSpruceBefore?: boolean | null;
+      spruceV1?: boolean | null;
+    } | null;
+  } | null;
 };
 
 export type UserQueryVariables = Exact<{ [key: string]: never }>;
@@ -7813,25 +7574,23 @@ export type VersionTaskDurationsQuery = {
       count: number;
       data: Array<{
         __typename?: "Task";
-        buildVariantDisplayName?: Maybe<string>;
+        buildVariantDisplayName?: string | null;
         displayName: string;
         execution: number;
         id: string;
-        startTime?: Maybe<Date>;
+        startTime?: Date | null;
         status: string;
-        timeTaken?: Maybe<number>;
-        executionTasksFull?: Maybe<
-          Array<{
-            __typename?: "Task";
-            buildVariantDisplayName?: Maybe<string>;
-            displayName: string;
-            execution: number;
-            id: string;
-            startTime?: Maybe<Date>;
-            status: string;
-            timeTaken?: Maybe<number>;
-          }>
-        >;
+        timeTaken?: number | null;
+        executionTasksFull?: Array<{
+          __typename?: "Task";
+          buildVariantDisplayName?: string | null;
+          displayName: string;
+          execution: number;
+          id: string;
+          startTime?: Date | null;
+          status: string;
+          timeTaken?: number | null;
+        }> | null;
       }>;
     };
   };
@@ -7856,36 +7615,34 @@ export type VersionTasksQuery = {
         aborted: boolean;
         blocked: boolean;
         buildVariant: string;
-        buildVariantDisplayName?: Maybe<string>;
+        buildVariantDisplayName?: string | null;
         displayName: string;
         execution: number;
         id: string;
-        projectIdentifier?: Maybe<string>;
+        projectIdentifier?: string | null;
         status: string;
-        baseTask?: Maybe<{
+        baseTask?: {
           __typename?: "Task";
           execution: number;
           id: string;
           status: string;
-        }>;
-        executionTasksFull?: Maybe<
-          Array<{
+        } | null;
+        executionTasksFull?: Array<{
+          __typename?: "Task";
+          buildVariant: string;
+          buildVariantDisplayName?: string | null;
+          displayName: string;
+          execution: number;
+          id: string;
+          projectIdentifier?: string | null;
+          status: string;
+          baseTask?: {
             __typename?: "Task";
-            buildVariant: string;
-            buildVariantDisplayName?: Maybe<string>;
-            displayName: string;
             execution: number;
             id: string;
-            projectIdentifier?: Maybe<string>;
             status: string;
-            baseTask?: Maybe<{
-              __typename?: "Task";
-              execution: number;
-              id: string;
-              status: string;
-            }>;
-          }>
-        >;
+          } | null;
+        }> | null;
       }>;
     };
   };
@@ -7899,11 +7656,11 @@ export type VersionQuery = {
   __typename?: "Query";
   version: {
     __typename?: "Version";
-    activated?: Maybe<boolean>;
+    activated?: boolean | null;
     author: string;
     createTime: Date;
     errors: Array<string>;
-    finishTime?: Maybe<Date>;
+    finishTime?: Date | null;
     id: string;
     isPatch: boolean;
     message: string;
@@ -7912,81 +7669,79 @@ export type VersionQuery = {
     projectIdentifier: string;
     repo: string;
     revision: string;
-    startTime?: Maybe<Date>;
+    startTime?: Date | null;
     status: string;
-    taskCount?: Maybe<number>;
+    taskCount?: number | null;
     warnings: Array<string>;
-    baseVersion?: Maybe<{ __typename?: "Version"; id: string }>;
+    baseVersion?: { __typename?: "Version"; id: string } | null;
     externalLinksForMetadata: Array<{
       __typename?: "ExternalLinkForMetadata";
       displayName: string;
       url: string;
     }>;
-    manifest?: Maybe<{
+    manifest?: {
       __typename?: "Manifest";
       branch: string;
       id: string;
       isBase: boolean;
-      moduleOverrides?: Maybe<{ [key: string]: any }>;
-      modules?: Maybe<any>;
+      moduleOverrides?: { [key: string]: any } | null;
+      modules?: any | null;
       project: string;
       revision: string;
-    }>;
+    } | null;
     parameters: Array<{ __typename?: "Parameter"; key: string; value: string }>;
-    patch?: Maybe<{
+    patch?: {
       __typename?: "Patch";
-      alias?: Maybe<string>;
+      alias?: string | null;
       canEnqueueToCommitQueue: boolean;
-      commitQueuePosition?: Maybe<number>;
+      commitQueuePosition?: number | null;
       id: string;
       patchNumber: number;
-      childPatches?: Maybe<
-        Array<{
-          __typename?: "Patch";
-          githash: string;
+      childPatches?: Array<{
+        __typename?: "Patch";
+        githash: string;
+        id: string;
+        projectIdentifier: string;
+        status: string;
+        taskCount?: number | null;
+        parameters: Array<{
+          __typename?: "Parameter";
+          key: string;
+          value: string;
+        }>;
+        versionFull?: {
+          __typename?: "Version";
           id: string;
-          projectIdentifier: string;
           status: string;
-          taskCount?: Maybe<number>;
-          parameters: Array<{
-            __typename?: "Parameter";
-            key: string;
-            value: string;
-          }>;
-          versionFull?: Maybe<{
-            __typename?: "Version";
-            id: string;
-            status: string;
-            baseVersion?: Maybe<{ __typename?: "Version"; id: string }>;
-          }>;
-        }>
-      >;
-    }>;
-    previousVersion?: Maybe<{
+          baseVersion?: { __typename?: "Version"; id: string } | null;
+        } | null;
+      }> | null;
+    } | null;
+    previousVersion?: {
       __typename?: "Version";
       id: string;
       revision: string;
-    }>;
-    projectMetadata?: Maybe<{
+    } | null;
+    projectMetadata?: {
       __typename?: "Project";
       id: string;
       owner: string;
       repo: string;
-    }>;
-    versionTiming?: Maybe<{
+    } | null;
+    versionTiming?: {
       __typename?: "VersionTiming";
-      makespan?: Maybe<number>;
-      timeTaken?: Maybe<number>;
-    }>;
-    upstreamProject?: Maybe<{
+      makespan?: number | null;
+      timeTaken?: number | null;
+    } | null;
+    upstreamProject?: {
       __typename?: "UpstreamProject";
       project: string;
       repo: string;
       triggerID: string;
       triggerType: string;
-      task?: Maybe<{ __typename?: "Task"; execution: number; id: string }>;
-      version?: Maybe<{ __typename?: "Version"; id: string }>;
-    }>;
+      task?: { __typename?: "Task"; execution: number; id: string } | null;
+      version?: { __typename?: "Version"; id: string } | null;
+    } | null;
   };
 };
 
@@ -7994,23 +7749,21 @@ export type ViewableProjectRefsQueryVariables = Exact<{ [key: string]: never }>;
 
 export type ViewableProjectRefsQuery = {
   __typename?: "Query";
-  viewableProjectRefs: Array<
-    Maybe<{
-      __typename?: "GroupedProjects";
-      groupDisplayName: string;
-      projects: Array<{
-        __typename?: "Project";
-        displayName: string;
-        enabled?: Maybe<boolean>;
-        id: string;
-        identifier: string;
-        isFavorite: boolean;
-        owner: string;
-        repo: string;
-      }>;
-      repo?: Maybe<{ __typename?: "RepoRef"; id: string }>;
-    }>
-  >;
+  viewableProjectRefs: Array<{
+    __typename?: "GroupedProjects";
+    groupDisplayName: string;
+    projects: Array<{
+      __typename?: "Project";
+      displayName: string;
+      enabled?: boolean | null;
+      id: string;
+      identifier: string;
+      isFavorite: boolean;
+      owner: string;
+      repo: string;
+    }>;
+    repo?: { __typename?: "RepoRef"; id: string } | null;
+  } | null>;
 };
 
 export type HostsQueryVariables = Exact<{
@@ -8029,12 +7782,12 @@ export type HostsQuery = {
   __typename?: "Query";
   hosts: {
     __typename?: "HostsResponse";
-    filteredHostsCount?: Maybe<number>;
+    filteredHostsCount?: number | null;
     totalHostsCount: number;
     hosts: Array<{
       __typename?: "Host";
-      distroId?: Maybe<string>;
-      elapsed?: Maybe<Date>;
+      distroId?: string | null;
+      elapsed?: Date | null;
       hostUrl: string;
       id: string;
       noExpiration: boolean;
@@ -8042,18 +7795,18 @@ export type HostsQuery = {
       startedBy: string;
       status: string;
       tag: string;
-      totalIdleTime?: Maybe<number>;
-      uptime?: Maybe<Date>;
-      distro?: Maybe<{
+      totalIdleTime?: number | null;
+      uptime?: Date | null;
+      distro?: {
         __typename?: "DistroInfo";
-        bootstrapMethod?: Maybe<string>;
-        id?: Maybe<string>;
-      }>;
-      runningTask?: Maybe<{
+        bootstrapMethod?: string | null;
+        id?: string | null;
+      } | null;
+      runningTask?: {
         __typename?: "TaskInfo";
-        id?: Maybe<string>;
-        name?: Maybe<string>;
-      }>;
+        id?: string | null;
+        name?: string | null;
+      } | null;
     }>;
   };
 };
@@ -8075,36 +7828,34 @@ export type ProjectPatchesQuery = {
       patches: Array<{
         __typename?: "Patch";
         activated: boolean;
-        alias?: Maybe<string>;
+        alias?: string | null;
         author: string;
         authorDisplayName: string;
         canEnqueueToCommitQueue: boolean;
-        commitQueuePosition?: Maybe<number>;
-        createTime?: Maybe<Date>;
+        commitQueuePosition?: number | null;
+        createTime?: Date | null;
         description: string;
         id: string;
         projectIdentifier: string;
         status: string;
-        projectMetadata?: Maybe<{
+        projectMetadata?: {
           __typename?: "Project";
           owner: string;
           repo: string;
-        }>;
-        versionFull?: Maybe<{
+        } | null;
+        versionFull?: {
           __typename?: "Version";
           id: string;
           status: string;
-          taskStatusStats?: Maybe<{
+          taskStatusStats?: {
             __typename?: "TaskStats";
-            counts?: Maybe<
-              Array<{
-                __typename?: "StatusCount";
-                count: number;
-                status: string;
-              }>
-            >;
-          }>;
-        }>;
+            counts?: Array<{
+              __typename?: "StatusCount";
+              count: number;
+              status: string;
+            }> | null;
+          } | null;
+        } | null;
       }>;
     };
   };
@@ -8128,22 +7879,22 @@ export type SpawnTaskQueryVariables = Exact<{
 
 export type SpawnTaskQuery = {
   __typename?: "Query";
-  task?: Maybe<{
+  task?: {
     __typename?: "Task";
     canSync: boolean;
     buildVariant: string;
-    buildVariantDisplayName?: Maybe<string>;
+    buildVariantDisplayName?: string | null;
     displayName: string;
     execution: number;
     id: string;
-    revision?: Maybe<string>;
+    revision?: string | null;
     status: string;
-    project?: Maybe<{
+    project?: {
       __typename?: "Project";
       id: string;
       spawnHostScriptPath: string;
-    }>;
-  }>;
+    } | null;
+  } | null;
 };
 
 export type SubnetAvailabilityZonesQueryVariables = Exact<{
@@ -8183,36 +7934,34 @@ export type UserPatchesQuery = {
       patches: Array<{
         __typename?: "Patch";
         activated: boolean;
-        alias?: Maybe<string>;
+        alias?: string | null;
         author: string;
         authorDisplayName: string;
         canEnqueueToCommitQueue: boolean;
-        commitQueuePosition?: Maybe<number>;
-        createTime?: Maybe<Date>;
+        commitQueuePosition?: number | null;
+        createTime?: Date | null;
         description: string;
         id: string;
         projectIdentifier: string;
         status: string;
-        projectMetadata?: Maybe<{
+        projectMetadata?: {
           __typename?: "Project";
           owner: string;
           repo: string;
-        }>;
-        versionFull?: Maybe<{
+        } | null;
+        versionFull?: {
           __typename?: "Version";
           id: string;
           status: string;
-          taskStatusStats?: Maybe<{
+          taskStatusStats?: {
             __typename?: "TaskStats";
-            counts?: Maybe<
-              Array<{
-                __typename?: "StatusCount";
-                count: number;
-                status: string;
-              }>
-            >;
-          }>;
-        }>;
+            counts?: Array<{
+              __typename?: "StatusCount";
+              count: number;
+              status: string;
+            }> | null;
+          } | null;
+        } | null;
       }>;
     };
   };
@@ -8225,47 +7974,41 @@ export type UserSubscriptionsQuery = {
   user: {
     __typename?: "User";
     userId: string;
-    subscriptions?: Maybe<
-      Array<{
-        __typename?: "GeneralSubscription";
-        id: string;
-        ownerType: string;
-        resourceType: string;
-        trigger: string;
-        triggerData?: Maybe<{ [key: string]: any }>;
-        regexSelectors: Array<{
-          __typename?: "Selector";
-          data: string;
-          type: string;
-        }>;
-        selectors: Array<{
-          __typename?: "Selector";
-          data: string;
-          type: string;
-        }>;
-        subscriber?: Maybe<{
-          __typename?: "SubscriberWrapper";
-          type: string;
-          subscriber: {
-            __typename?: "Subscriber";
-            emailSubscriber?: Maybe<string>;
-            jiraCommentSubscriber?: Maybe<string>;
-            slackSubscriber?: Maybe<string>;
-          };
-        }>;
-      }>
-    >;
+    subscriptions?: Array<{
+      __typename?: "GeneralSubscription";
+      id: string;
+      ownerType: string;
+      resourceType: string;
+      trigger: string;
+      triggerData?: { [key: string]: any } | null;
+      regexSelectors: Array<{
+        __typename?: "Selector";
+        data: string;
+        type: string;
+      }>;
+      selectors: Array<{ __typename?: "Selector"; data: string; type: string }>;
+      subscriber?: {
+        __typename?: "SubscriberWrapper";
+        type: string;
+        subscriber: {
+          __typename?: "Subscriber";
+          emailSubscriber?: string | null;
+          jiraCommentSubscriber?: string | null;
+          slackSubscriber?: string | null;
+        };
+      } | null;
+    }> | null;
   };
-  userSettings?: Maybe<{
+  userSettings?: {
     __typename?: "UserSettings";
-    notifications?: Maybe<{
+    notifications?: {
       __typename?: "Notifications";
-      buildBreakId?: Maybe<string>;
-      commitQueueId?: Maybe<string>;
-      patchFinishId?: Maybe<string>;
-      patchFirstFailureId?: Maybe<string>;
-      spawnHostExpirationId?: Maybe<string>;
-      spawnHostOutcomeId?: Maybe<string>;
-    }>;
-  }>;
+      buildBreakId?: string | null;
+      commitQueueId?: string | null;
+      patchFinishId?: string | null;
+      patchFirstFailureId?: string | null;
+      spawnHostExpirationId?: string | null;
+      spawnHostOutcomeId?: string | null;
+    } | null;
+  } | null;
 };
diff --git a/src/gql/mutations/delete-subscriptions.graphql b/src/gql/mutations/delete-subscriptions.graphql
new file mode 100644
index 0000000000..11d320d90d
--- /dev/null
+++ b/src/gql/mutations/delete-subscriptions.graphql
@@ -0,0 +1,3 @@
+mutation DeleteSubscriptions($subscriptionIds: [String!]!) {
+  deleteSubscriptions(subscriptionIds: $subscriptionIds)
+}
diff --git a/src/gql/mutations/index.ts b/src/gql/mutations/index.ts
index aa36f70f70..ffd449d92c 100644
--- a/src/gql/mutations/index.ts
+++ b/src/gql/mutations/index.ts
@@ -11,6 +11,7 @@ import CREATE_PUBLIC_KEY from "./create-public-key.graphql";
 import DEACTIVATE_STEPBACK_TASK from "./deactivate-stepback-task.graphql";
 import DEFAULT_SECTION_TO_REPO from "./default-section-to-repo.graphql";
 import DELETE_PROJECT from "./delete-project.graphql";
+import DELETE_SUBSCRIPTIONS from "./delete-subscriptions.graphql";
 import DETACH_PROJECT_FROM_REPO from "./detach-project-from-repo.graphql";
 import DETACH_VOLUME from "./detach-volume.graphql";
 import EDIT_ANNOTATION_NOTE from "./edit-annotation-note.graphql";
@@ -45,6 +46,7 @@ import SPAWN_VOLUME from "./spawn-volume.graphql";
 import UNSCHEDULE_PATCH_TASKS from "./unschedule-patch-tasks.graphql";
 import UNSCHEDULE_TASK from "./unschedule-task.graphql";
 import UPDATE_HOST_STATUS from "./update-host-status.graphql";
+import UPDATE_PATCH_DESCRIPTION from "./update-patch-description.graphql";
 import UPDATE_PUBLIC_KEY from "./update-public-key.graphql";
 import UPDATE_SPAWN_HOST_STATUS from "./update-spawn-host-status.graphql";
 import UPDATE_SPAWN_VOLUME from "./update-spawn-volume.graphql";
@@ -64,6 +66,7 @@ export {
   DEACTIVATE_STEPBACK_TASK,
   DEFAULT_SECTION_TO_REPO,
   DELETE_PROJECT,
+  DELETE_SUBSCRIPTIONS,
   DETACH_PROJECT_FROM_REPO,
   DETACH_VOLUME,
   EDIT_ANNOTATION_NOTE,
@@ -71,6 +74,7 @@ export {
   ENQUEUE_PATCH,
   FILE_JIRA_TICKET,
   FORCE_REPOTRACKER_RUN,
+  MIGRATE_VOLUME,
   MOVE_ANNOTATION,
   OVERRIDE_TASK_DEPENDENCIES,
   PROMOTE_VARS_TO_REPO,
@@ -79,8 +83,8 @@ export {
   REMOVE_ITEM_FROM_COMMIT_QUEUE,
   REMOVE_PUBLIC_KEY,
   REMOVE_VOLUME,
-  RESTART_JASPER,
   REPROVISION_TO_NEW,
+  RESTART_JASPER,
   RESTART_TASK,
   RESTART_VERSIONS,
   SAVE_PROJECT_SETTINGS_FOR_SECTION,
@@ -97,9 +101,9 @@ export {
   UNSCHEDULE_PATCH_TASKS,
   UNSCHEDULE_TASK,
   UPDATE_HOST_STATUS,
+  UPDATE_PATCH_DESCRIPTION,
   UPDATE_PUBLIC_KEY,
   UPDATE_SPAWN_HOST_STATUS,
   UPDATE_SPAWN_VOLUME,
   UPDATE_USER_SETTINGS,
-  MIGRATE_VOLUME,
 };
diff --git a/src/gql/mutations/update-patch-description.graphql b/src/gql/mutations/update-patch-description.graphql
new file mode 100644
index 0000000000..5c436dc9a7
--- /dev/null
+++ b/src/gql/mutations/update-patch-description.graphql
@@ -0,0 +1,10 @@
+#import "../fragments/basePatch.graphql"
+
+mutation UpdatePatchDescription($patchId: String!, $description: String!) {
+  schedulePatch(
+    patchId: $patchId
+    configure: { variantsTasks: [], description: $description }
+  ) {
+    ...BasePatch
+  }
+}
diff --git a/src/gql/queries/get-host-events.graphql b/src/gql/queries/get-host-events.graphql
index 400896f736..00f311c564 100644
--- a/src/gql/queries/get-host-events.graphql
+++ b/src/gql/queries/get-host-events.graphql
@@ -8,6 +8,7 @@ query HostEvents($id: String!, $tag: String!, $limit: Int, $page: Int) {
         duration
         execution
         hostname
+        jasperRevision
         logs
         monitorOp
         newStatus
diff --git a/src/pages/ProjectPatches.tsx b/src/pages/ProjectPatches.tsx
index 6cf8d0d6c9..3ef96e4d45 100644
--- a/src/pages/ProjectPatches.tsx
+++ b/src/pages/ProjectPatches.tsx
@@ -3,7 +3,9 @@ import { useLocation, useParams } from "react-router-dom";
 import { useProjectPatchesAnalytics } from "analytics/patches/useProjectPatchesAnalytics";
 import { ProjectBanner } from "components/Banners";
 import { PatchesPage, usePatchesInputFromSearch } from "components/PatchesPage";
+import { ProjectSelect } from "components/ProjectSelect";
 import { DEFAULT_POLL_INTERVAL } from "constants/index";
+import { getProjectPatchesRoute } from "constants/routes";
 import { useToastContext } from "context/toast";
 import {
   ProjectPatchesQuery,
@@ -52,9 +54,19 @@ export const ProjectPatches = () => {
       <ProjectBanner projectIdentifier={projectIdentifier} />
       <PatchesPage
         analyticsObject={analyticsObject}
-        pageTitle={`${displayName ?? ""} Patches`}
         loading={loading}
+        pageTitle={`${displayName ?? ""} Patches`}
         pageType="project"
+        filterComp={
+          <ProjectSelect
+            getRoute={getProjectPatchesRoute}
+            selectedProjectIdentifier={projectIdentifier}
+            showLabel={false}
+            onSubmit={() => {
+              analyticsObject.sendEvent({ name: "Change Project" });
+            }}
+          />
+        }
         patches={patches}
       />
     </>
diff --git a/src/pages/Version.tsx b/src/pages/Version.tsx
index a657833eea..43aab87fd0 100644
--- a/src/pages/Version.tsx
+++ b/src/pages/Version.tsx
@@ -40,6 +40,7 @@ import {
   Metadata,
   VersionTabs,
 } from "./version/index";
+import { NameChangeModal } from "./version/NameChangeModal";
 
 export const VersionPage: React.VFC = () => {
   const spruceConfig = useSpruceConfig();
@@ -193,7 +194,11 @@ export const VersionPage: React.VFC = () => {
         loading={false}
         pageTitle={pageTitle}
         title={linkifiedMessage || `Version ${order}`}
-      />
+      >
+        {isPatch && (
+          <NameChangeModal patchId={id} originalPatchName={message} />
+        )}
+      </PageTitle>
       <PageLayout>
         <PageSider>
           <Metadata loading={false} version={version} />
diff --git a/src/pages/commits/ActiveCommits/__snapshots__/ProjectHealth.stories.storyshot b/src/pages/commits/ActiveCommits/__snapshots__/ProjectHealth.stories.storyshot
index a6b003f68c..79b75a314e 100644
--- a/src/pages/commits/ActiveCommits/__snapshots__/ProjectHealth.stories.storyshot
+++ b/src/pages/commits/ActiveCommits/__snapshots__/ProjectHealth.stories.storyshot
@@ -328,10 +328,10 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
               data-cy="commit-label"
             >
               <p
-                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1yli3c0"
+                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1tb6tuo"
               >
                 <a
-                  class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                  class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                   data-cy="githash-link"
                   href="/version/spruce_987bf57eb679c6361322c3961b30a10724a9b001/tasks"
                 >
@@ -347,17 +347,17 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
                 </b>
               </p>
               <p
-                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1yli3c0"
+                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1tb6tuo"
               >
                 Jonathan Brill
                  -
               </p>
               <p
-                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1yli3c0"
+                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1tb6tuo"
               >
                 
                 <a
-                  class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                  class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                   data-cy="jira-link"
                   href="https://undefined/browse/EVG-14901"
                   rel="noopener noreferrer"
@@ -372,7 +372,7 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
                  add ssh key to EditSpawnHos...
               </p>
               <small
-                class="leafygreen-ui-cssveg css-7pbzgz-ButtonText eq9i5u71 leafygreen-ui-ppjyot"
+                class="leafygreen-ui-cssveg css-7pbzgz-ButtonText eq9i5u71 leafygreen-ui-6flbwy"
               >
                 more
               </small>
@@ -387,10 +387,10 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
               data-cy="commit-label"
             >
               <p
-                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1yli3c0"
+                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1tb6tuo"
               >
                 <a
-                  class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                  class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                   data-cy="githash-link"
                   href="/version/spruce_v2.11.1_60eda8722a60ed09bb78a2ff/tasks"
                 >
@@ -406,18 +406,18 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
                 </b>
               </p>
               <p
-                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1yli3c0"
+                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1tb6tuo"
               >
                 Mohamed Khelif
                  -
               </p>
               <p
-                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1yli3c0"
+                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1tb6tuo"
               >
                 Triggered From Git Tag 'v2.11.1': v2....
               </p>
               <small
-                class="leafygreen-ui-cssveg css-7pbzgz-ButtonText eq9i5u71 leafygreen-ui-ppjyot"
+                class="leafygreen-ui-cssveg css-7pbzgz-ButtonText eq9i5u71 leafygreen-ui-6flbwy"
               >
                 more
               </small>
@@ -432,7 +432,7 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
               role="button"
             >
               <small
-                class="css-t2ltce-ButtonText ezzuvrx6 leafygreen-ui-ppjyot"
+                class="css-t2ltce-ButtonText ezzuvrx6 leafygreen-ui-6flbwy"
                 data-cy="inactive-commits-button"
               >
                 <div>
@@ -451,10 +451,10 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
               data-cy="commit-label"
             >
               <p
-                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1yli3c0"
+                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1tb6tuo"
               >
                 <a
-                  class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                  class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                   data-cy="githash-link"
                   href="/version/spruce_9c1d1ebc85829d69dde7684fbcce86dd21e5a9ad/tasks"
                 >
@@ -470,17 +470,17 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
                 </b>
               </p>
               <p
-                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1yli3c0"
+                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1tb6tuo"
               >
                 Mohamed Khelif
                  -
               </p>
               <p
-                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1yli3c0"
+                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1tb6tuo"
               >
                 
                 <a
-                  class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                  class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                   data-cy="jira-link"
                   href="https://undefined/browse/EVG-14799"
                   rel="noopener noreferrer"
@@ -495,7 +495,7 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
                  Correctly visit configure p...
               </p>
               <small
-                class="leafygreen-ui-cssveg css-7pbzgz-ButtonText eq9i5u71 leafygreen-ui-ppjyot"
+                class="leafygreen-ui-cssveg css-7pbzgz-ButtonText eq9i5u71 leafygreen-ui-6flbwy"
               >
                 more
               </small>
@@ -510,10 +510,10 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
               data-cy="commit-label"
             >
               <p
-                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1yli3c0"
+                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1tb6tuo"
               >
                 <a
-                  class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                  class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                   data-cy="githash-link"
                   href="/version/spruce_f7f7f1a3abdb9897dfc02b7a1de9821651b0916e/tasks"
                 >
@@ -529,18 +529,18 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
                 </b>
               </p>
               <p
-                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1yli3c0"
+                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1tb6tuo"
               >
                 Sophie Stadler
                  -
               </p>
               <p
-                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1yli3c0"
+                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1tb6tuo"
               >
                 Remove navigation announcement toast ...
               </p>
               <small
-                class="leafygreen-ui-cssveg css-7pbzgz-ButtonText eq9i5u71 leafygreen-ui-ppjyot"
+                class="leafygreen-ui-cssveg css-7pbzgz-ButtonText eq9i5u71 leafygreen-ui-6flbwy"
               >
                 more
               </small>
@@ -555,10 +555,10 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
               data-cy="commit-label"
             >
               <p
-                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1yli3c0"
+                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1tb6tuo"
               >
                 <a
-                  class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                  class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                   data-cy="githash-link"
                   href="/version/spruce_v2.11.0_60ec461532f4172d48288274/tasks"
                 >
@@ -574,18 +574,18 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
                 </b>
               </p>
               <p
-                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1yli3c0"
+                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1tb6tuo"
               >
                 Chaya Malik
                  -
               </p>
               <p
-                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1yli3c0"
+                class="css-1l2peoq-LabelText e1cz15300 leafygreen-ui-1tb6tuo"
               >
                 Triggered From Git Tag 'v2.11.0': v2....
               </p>
               <small
-                class="leafygreen-ui-cssveg css-7pbzgz-ButtonText eq9i5u71 leafygreen-ui-ppjyot"
+                class="leafygreen-ui-cssveg css-7pbzgz-ButtonText eq9i5u71 leafygreen-ui-6flbwy"
               >
                 more
               </small>
@@ -607,7 +607,7 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
               class="css-8bv1t4-Container ek3nkvx1"
             >
               <a
-                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1cn1hqb"
+                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1320234"
                 data-cy="variant-header"
                 href="/variant-history/spruce/bv_000?selectedCommit=929"
               >
@@ -657,7 +657,7 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
               class="css-8bv1t4-Container ek3nkvx1"
             >
               <a
-                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1cn1hqb"
+                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1320234"
                 data-cy="variant-header"
                 href="/variant-history/spruce/bv_001?selectedCommit=929"
               >
@@ -707,7 +707,7 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
               class="css-8bv1t4-Container ek3nkvx1"
             >
               <a
-                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1cn1hqb"
+                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1320234"
                 data-cy="variant-header"
                 href="/variant-history/spruce/bv_002?selectedCommit=929"
               >
@@ -766,7 +766,7 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
               class="css-8bv1t4-Container ek3nkvx1"
             >
               <a
-                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1cn1hqb"
+                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1320234"
                 data-cy="variant-header"
                 href="/variant-history/spruce/bv_000?selectedCommit=928"
               >
@@ -816,7 +816,7 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
               class="css-8bv1t4-Container ek3nkvx1"
             >
               <a
-                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1cn1hqb"
+                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1320234"
                 data-cy="variant-header"
                 href="/variant-history/spruce/bv_001?selectedCommit=928"
               >
@@ -866,7 +866,7 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
               class="css-8bv1t4-Container ek3nkvx1"
             >
               <a
-                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1cn1hqb"
+                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1320234"
                 data-cy="variant-header"
                 href="/variant-history/spruce/bv_002?selectedCommit=928"
               >
@@ -929,7 +929,7 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
               class="css-8bv1t4-Container ek3nkvx1"
             >
               <a
-                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1cn1hqb"
+                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1320234"
                 data-cy="variant-header"
                 href="/variant-history/spruce/bv_000?selectedCommit=926"
               >
@@ -979,7 +979,7 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
               class="css-8bv1t4-Container ek3nkvx1"
             >
               <a
-                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1cn1hqb"
+                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1320234"
                 data-cy="variant-header"
                 href="/variant-history/spruce/bv_001?selectedCommit=926"
               >
@@ -1029,7 +1029,7 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
               class="css-8bv1t4-Container ek3nkvx1"
             >
               <a
-                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1cn1hqb"
+                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1320234"
                 data-cy="variant-header"
                 href="/variant-history/spruce/bv_002?selectedCommit=926"
               >
@@ -1088,7 +1088,7 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
               class="css-8bv1t4-Container ek3nkvx1"
             >
               <a
-                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1cn1hqb"
+                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1320234"
                 data-cy="variant-header"
                 href="/variant-history/spruce/bv_000?selectedCommit=925"
               >
@@ -1138,7 +1138,7 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
               class="css-8bv1t4-Container ek3nkvx1"
             >
               <a
-                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1cn1hqb"
+                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1320234"
                 data-cy="variant-header"
                 href="/variant-history/spruce/bv_001?selectedCommit=925"
               >
@@ -1188,7 +1188,7 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
               class="css-8bv1t4-Container ek3nkvx1"
             >
               <a
-                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1cn1hqb"
+                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1320234"
                 data-cy="variant-header"
                 href="/variant-history/spruce/bv_002?selectedCommit=925"
               >
@@ -1247,7 +1247,7 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
               class="css-8bv1t4-Container ek3nkvx1"
             >
               <a
-                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1cn1hqb"
+                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1320234"
                 data-cy="variant-header"
                 href="/variant-history/spruce/bv_000?selectedCommit=924"
               >
@@ -1297,7 +1297,7 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
               class="css-8bv1t4-Container ek3nkvx1"
             >
               <a
-                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1cn1hqb"
+                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1320234"
                 data-cy="variant-header"
                 href="/variant-history/spruce/bv_001?selectedCommit=924"
               >
@@ -1347,7 +1347,7 @@ exports[`storybook Storyshots Pages/Commits/Project Health Page Default 1`] = `
               class="css-8bv1t4-Container ek3nkvx1"
             >
               <a
-                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1cn1hqb"
+                class="lg-ui-0003 ek3nkvx3 css-1vedf2u-StyledLink-Label leafygreen-ui-1320234"
                 data-cy="variant-header"
                 href="/variant-history/spruce/bv_002?selectedCommit=924"
               >
diff --git a/src/pages/commits/InactiveCommits/__snapshots__/InactiveCommits.stories.storyshot b/src/pages/commits/InactiveCommits/__snapshots__/InactiveCommits.stories.storyshot
index 004b44354f..f98c7f98b7 100644
--- a/src/pages/commits/InactiveCommits/__snapshots__/InactiveCommits.stories.storyshot
+++ b/src/pages/commits/InactiveCommits/__snapshots__/InactiveCommits.stories.storyshot
@@ -7,7 +7,7 @@ exports[`storybook Storyshots pages/commits/InactiveCommits Default 1`] = `
     role="button"
   >
     <small
-      class="css-t2ltce-ButtonText ezzuvrx6 leafygreen-ui-ppjyot"
+      class="css-t2ltce-ButtonText ezzuvrx6 leafygreen-ui-6flbwy"
       data-cy="inactive-commits-button"
     >
       <div>
diff --git a/src/pages/container/EventsTable/index.tsx b/src/pages/container/EventsTable/index.tsx
index 72317a3f31..0ef5cc8576 100644
--- a/src/pages/container/EventsTable/index.tsx
+++ b/src/pages/container/EventsTable/index.tsx
@@ -48,7 +48,6 @@ const EventsTable: React.VFC<{}> = () => {
   return (
     <SiderCard>
       <TableTitle>
-        {/* @ts-expect-error */}
         <StyledSubtitle>Recent Events</StyledSubtitle>
         <TableControlInnerRow>
           <Pagination
@@ -89,7 +88,6 @@ const EventsTable: React.VFC<{}> = () => {
   );
 };
 
-// @ts-expect-error
 const StyledSubtitle = styled(Subtitle)`
   margin: ${size.s} 0;
 `;
diff --git a/src/pages/container/EventsTable/util.tsx b/src/pages/container/EventsTable/util.tsx
index a537e670ef..45e4fd0bda 100644
--- a/src/pages/container/EventsTable/util.tsx
+++ b/src/pages/container/EventsTable/util.tsx
@@ -1,5 +1,4 @@
-import styled from "@emotion/styled";
-import { StyledRouterLink } from "components/styles";
+import { ShortenedRouterLink } from "components/styles";
 import { getTaskRoute } from "constants/routes";
 import { PodEventsQuery } from "gql/generated/types";
 import { PodEvent } from "types/pod";
@@ -13,12 +12,12 @@ export const getEventCopy = (
 ) => {
   const { eventType, data } = event;
   const taskLink = (
-    <StyledLink
+    <ShortenedRouterLink
       title={data.taskID}
       to={getTaskRoute(data.taskID, { execution: data.taskExecution })}
     >
       {data.taskID}
-    </StyledLink>
+    </ShortenedRouterLink>
   );
   switch (eventType) {
     case PodEvent.StatusChange:
@@ -45,11 +44,3 @@ export const getEventCopy = (
       return null;
   }
 };
-
-const StyledLink = styled(StyledRouterLink)`
-  span {
-    max-width: 300px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-`;
diff --git a/src/pages/host/HostTable.tsx b/src/pages/host/HostTable.tsx
index 86bdcba8b5..2806e7fd7a 100644
--- a/src/pages/host/HostTable.tsx
+++ b/src/pages/host/HostTable.tsx
@@ -1,15 +1,14 @@
 import { ApolloError } from "@apollo/client";
 import styled from "@emotion/styled";
+import { Table, TableHeader, Row, Cell } from "@leafygreen-ui/table";
 import { Subtitle } from "@leafygreen-ui/typography";
-import { Table } from "antd";
-import { ColumnProps } from "antd/es/table";
 import { useHostsTableAnalytics } from "analytics";
 import PageSizeSelector, {
   usePageSizeSelector,
 } from "components/PageSizeSelector";
 import Pagination from "components/Pagination";
 import { size } from "constants/tokens";
-import { HostEventsQuery, HostEventLogEntry } from "gql/generated/types";
+import { HostEventsQuery } from "gql/generated/types";
 import { useDateFormat } from "hooks";
 import { getHostEventString } from "pages/host/getHostEventString";
 import { HostCard } from "pages/host/HostCard";
@@ -28,24 +27,6 @@ export const HostTable: React.VFC<{
   const getDateCopy = useDateFormat();
   const hostEvents = eventData?.hostEvents;
   const logEntries = hostEvents?.eventLogEntries;
-  const columnsTemplate: Array<ColumnProps<HostEventLogEntry>> = [
-    {
-      title: "Date",
-      dataIndex: "timestamp",
-      width: "25%",
-      render: (_, { eventType, timestamp }: HostEventLogEntry): JSX.Element => (
-        <div data-cy={`${eventType}-time`}>{getDateCopy(timestamp)}</div>
-      ),
-    },
-    {
-      title: "Event",
-      dataIndex: "data",
-      width: "75%",
-      render: (_, { eventType, data }: HostEventLogEntry): JSX.Element => (
-        <div>{getHostEventString(eventType, data)}</div>
-      ),
-    },
-  ];
 
   const handlePageSizeChange = (pageSize: number): void => {
     setPageSize(pageSize);
@@ -55,7 +36,6 @@ export const HostTable: React.VFC<{
   return (
     <HostCard error={error} loading={loading} metaData={false}>
       <TableTitle>
-        {/* @ts-expect-error */}
         <StyledSubtitle>Recent Events </StyledSubtitle>
         <PaginationWrapper>
           <Pagination
@@ -71,21 +51,27 @@ export const HostTable: React.VFC<{
           />
         </PaginationWrapper>
       </TableTitle>
-
       <Table
         data-cy="host-events-table"
-        dataSource={logEntries}
-        rowKey={rowKey}
-        columns={columnsTemplate}
-        pagination={false}
-      />
+        data={logEntries}
+        columns={[
+          <TableHeader key="date" dataType="date" label="Date" />,
+          <TableHeader key="event" label="Event" />,
+        ]}
+      >
+        {({ datum }) => (
+          <Row data-cy={`event-type-${datum.eventType}`} key={datum.id}>
+            <Cell data-cy={`${datum.eventType}-time`}>
+              {getDateCopy(datum.timestamp)}
+            </Cell>
+            <Cell>{getHostEventString(datum.eventType, datum.data)}</Cell>
+          </Row>
+        )}
+      </Table>
     </HostCard>
   );
 };
 
-const rowKey = (record: HostEventLogEntry): string => `${record.id}`;
-
-// @ts-expect-error
 const StyledSubtitle = styled(Subtitle)`
   margin-bottom: 20px;
   margin-top: ${size.s};
diff --git a/src/pages/host/getHostEventString.tsx b/src/pages/host/getHostEventString.tsx
index 3e9e90ed22..0ccc5afd3e 100644
--- a/src/pages/host/getHostEventString.tsx
+++ b/src/pages/host/getHostEventString.tsx
@@ -1,12 +1,12 @@
 import Code from "@leafygreen-ui/code";
 import { Accordion } from "components/Accordion";
-import { StyledRouterLink } from "components/styles";
+import { ShortenedRouterLink } from "components/styles";
 import { getTaskRoute } from "constants/routes";
 import { HostEventLogData } from "gql/generated/types";
 import { HostEvent, HostMonitorOp } from "types/host";
 import { string } from "utils";
 
-const { stringifyNanoseconds, shortenString } = string;
+const { stringifyNanoseconds } = string;
 
 const getTerminationString = (monitorOp: string) => {
   switch (monitorOp) {
@@ -27,6 +27,19 @@ const getTerminationString = (monitorOp: string) => {
   }
 };
 
+interface TaskLinkProps {
+  "data-cy": string;
+  taskId: string;
+}
+const TaskLink: React.VFC<TaskLinkProps> = ({ "data-cy": dataCy, taskId }) => (
+  <ShortenedRouterLink
+    data-cy={dataCy}
+    title={taskId}
+    to={getTaskRoute(taskId)}
+  >
+    {taskId}
+  </ShortenedRouterLink>
+);
 export const getHostEventString = (
   eventType: string,
   data: HostEventLogData
@@ -201,25 +214,17 @@ export const getHostEventString = (
       return (
         <div data-cy="host-running-task-set">
           Assigned to run task{" "}
-          <StyledRouterLink
-            data-cy="host-running-task-set-link"
-            to={getTaskRoute(data.taskId)}
-          >
-            {shortenString(data.taskId, false, 50, "...")}
-          </StyledRouterLink>
+          <TaskLink taskId={data.taskId} data-cy="host-running-task-set-link" />
         </div>
       );
     case HostEvent.HostRunningTaskCleared:
       return (
         <div data-cy="host-running-task-cleared">
-          Current running task cleared (was:
-          <StyledRouterLink
+          Current running task cleared (was:{" "}
+          <TaskLink
+            taskId={data.taskId}
             data-cy="host-running-task-cleared-link"
-            to={getTaskRoute(data.taskId)}
-          >
-            {shortenString(data.taskId, false, 50, "...")}
-          </StyledRouterLink>
-          )
+          />
         </div>
       );
     case HostEvent.HostMonitorFlag:
@@ -252,12 +257,7 @@ export const getHostEventString = (
       return (
         <div data-cy="host-task-finished">
           Task{" "}
-          <StyledRouterLink
-            data-cy="host-task-finished-link"
-            to={getTaskRoute(data.taskId)}
-          >
-            {shortenString(data.taskId, false, 50, "...")}
-          </StyledRouterLink>{" "}
+          <TaskLink taskId={data.taskId} data-cy="host-task-finished-link" />{" "}
           completed with status:
           <b> {data.taskStatus}</b>
         </div>
diff --git a/src/pages/preferences/preferencesTabs/NotificationsTab.tsx b/src/pages/preferences/preferencesTabs/NotificationsTab.tsx
index 678a26a533..66c7812fd5 100644
--- a/src/pages/preferences/preferencesTabs/NotificationsTab.tsx
+++ b/src/pages/preferences/preferencesTabs/NotificationsTab.tsx
@@ -16,7 +16,6 @@ import {
 import { UPDATE_USER_SETTINGS } from "gql/mutations";
 import { useUserSettings } from "hooks";
 import { string } from "utils";
-import { ClearSubscriptionsCard } from "./notificationTab/ClearSubscriptionsCard";
 import { NotificationField } from "./notificationTab/NotificationField";
 import { UserSubscriptions } from "./notificationTab/UserSubscriptions";
 
@@ -116,7 +115,6 @@ export const NotificationsTab: React.VFC = () => {
         </Button>
       </SettingsCard>
       <UserSubscriptions />
-      <ClearSubscriptionsCard />
     </>
   );
 };
diff --git a/src/pages/preferences/preferencesTabs/cliTab/DownloadCard.tsx b/src/pages/preferences/preferencesTabs/cliTab/DownloadCard.tsx
index c5f0b16189..33308f996f 100644
--- a/src/pages/preferences/preferencesTabs/cliTab/DownloadCard.tsx
+++ b/src/pages/preferences/preferencesTabs/cliTab/DownloadCard.tsx
@@ -21,7 +21,7 @@ import {
   ClientBinary,
 } from "gql/generated/types";
 import { GET_CLIENT_CONFIG } from "gql/queries";
-import { CardType, SubtitleType } from "types/leafygreen";
+import { CardType } from "types/leafygreen";
 
 export const DownloadCard = () => {
   const { data, loading } = useQuery<
@@ -161,7 +161,7 @@ const CliDownloadButton = styled(Button)`
   margin-top: ${size.xs};
 `;
 
-const CliDownloadTitle = styled<SubtitleType>(Subtitle)`
+const CliDownloadTitle = styled(Subtitle)`
   font-weight: bold;
 `;
 
diff --git a/src/pages/preferences/preferencesTabs/cliTab/__snapshots__/NodeList.stories.storyshot b/src/pages/preferences/preferencesTabs/cliTab/__snapshots__/NodeList.stories.storyshot
index f7b2304721..02f3f4d644 100644
--- a/src/pages/preferences/preferencesTabs/cliTab/__snapshots__/NodeList.stories.storyshot
+++ b/src/pages/preferences/preferencesTabs/cliTab/__snapshots__/NodeList.stories.storyshot
@@ -12,13 +12,13 @@ exports[`storybook Storyshots Pages/Preferences/Node List Node Element 1`] = `
         class="css-1ivxpad-Circle e1k5prvz5"
       >
         <h6
-          class="css-vdb9bk-Index e1k5prvz4 leafygreen-ui-41zalo"
+          class="css-vdb9bk-Index e1k5prvz4 leafygreen-ui-19p3n10"
         >
           1
         </h6>
       </div>
       <h6
-        class="css-b00ohd-NodeTitle e1k5prvz3 leafygreen-ui-41zalo"
+        class="css-b00ohd-NodeTitle e1k5prvz3 leafygreen-ui-19p3n10"
       >
         Download the Command-Line Client.
       </h6>
@@ -54,13 +54,13 @@ exports[`storybook Storyshots Pages/Preferences/Node List Node List Full 1`] = `
             class="css-1ivxpad-Circle e1k5prvz5"
           >
             <h6
-              class="css-vdb9bk-Index e1k5prvz4 leafygreen-ui-41zalo"
+              class="css-vdb9bk-Index e1k5prvz4 leafygreen-ui-19p3n10"
             >
               1
             </h6>
           </div>
           <h6
-            class="css-b00ohd-NodeTitle e1k5prvz3 leafygreen-ui-41zalo"
+            class="css-b00ohd-NodeTitle e1k5prvz3 leafygreen-ui-19p3n10"
           >
             Download the Command-Line Client.
           </h6>
@@ -85,13 +85,13 @@ exports[`storybook Storyshots Pages/Preferences/Node List Node List Full 1`] = `
             class="css-1ivxpad-Circle e1k5prvz5"
           >
             <h6
-              class="css-vdb9bk-Index e1k5prvz4 leafygreen-ui-41zalo"
+              class="css-vdb9bk-Index e1k5prvz4 leafygreen-ui-19p3n10"
             >
               2
             </h6>
           </div>
           <h6
-            class="css-b00ohd-NodeTitle e1k5prvz3 leafygreen-ui-41zalo"
+            class="css-b00ohd-NodeTitle e1k5prvz3 leafygreen-ui-19p3n10"
           >
             Move the command-line client to somewhere in your PATH. On many systems this will be /usr/local/bin.
           </h6>
diff --git a/src/pages/preferences/preferencesTabs/cliTab/nodeList/Node.tsx b/src/pages/preferences/preferencesTabs/cliTab/nodeList/Node.tsx
index 3b299f2358..cfb40ac94b 100644
--- a/src/pages/preferences/preferencesTabs/cliTab/nodeList/Node.tsx
+++ b/src/pages/preferences/preferencesTabs/cliTab/nodeList/Node.tsx
@@ -17,7 +17,6 @@ export const Node: React.VFC<NodeProps> = ({ title, child, stepNumber }) => (
   <NodeContainer>
     <NodeHeader>
       <Step stepNumber={stepNumber} />
-      {/* @ts-expect-error */}
       <NodeTitle>{title}</NodeTitle>
     </NodeHeader>
     {child && <ChildContainer>{child}</ChildContainer>}
@@ -30,7 +29,6 @@ interface StepProps {
 
 const Step: React.VFC<StepProps> = ({ stepNumber }) => (
   <Circle>
-    {/* @ts-expect-error */}
     <Index>{stepNumber}</Index>
   </Circle>
 );
@@ -45,12 +43,10 @@ const Circle = styled.div`
   align-items: center;
 `;
 
-// @ts-expect-error
 const Index = styled(Subtitle)`
   color: ${white};
 `;
 
-// @ts-expect-error
 const NodeTitle = styled(Subtitle)`
   align-self: center;
   margin-left: ${size.m};
diff --git a/src/pages/preferences/preferencesTabs/notificationTab/ClearSubscriptionsCard.tsx b/src/pages/preferences/preferencesTabs/notificationTab/ClearSubscriptions.tsx
similarity index 68%
rename from src/pages/preferences/preferencesTabs/notificationTab/ClearSubscriptionsCard.tsx
rename to src/pages/preferences/preferencesTabs/notificationTab/ClearSubscriptions.tsx
index eb39b0ba4f..6dfb09ce2b 100644
--- a/src/pages/preferences/preferencesTabs/notificationTab/ClearSubscriptionsCard.tsx
+++ b/src/pages/preferences/preferencesTabs/notificationTab/ClearSubscriptions.tsx
@@ -1,12 +1,8 @@
 import { useState } from "react";
 import { useMutation } from "@apollo/client";
-import styled from "@emotion/styled";
 import Button, { Variant } from "@leafygreen-ui/button";
-import { Body } from "@leafygreen-ui/typography";
 import { usePreferencesAnalytics } from "analytics";
 import { ConfirmationModal } from "components/ConfirmationModal";
-import { SettingsCard } from "components/SettingsCard";
-import { size } from "constants/tokens";
 import { useToastContext } from "context/toast";
 import {
   ClearMySubscriptionsMutation,
@@ -14,7 +10,7 @@ import {
 } from "gql/generated/types";
 import { CLEAR_MY_SUBSCRIPTIONS } from "gql/mutations";
 
-export const ClearSubscriptionsCard: React.VFC = () => {
+export const ClearSubscriptions: React.VFC = () => {
   const [showModal, setShowModal] = useState(false);
   const { sendEvent } = usePreferencesAnalytics();
   const dispatchToast = useToastContext();
@@ -42,19 +38,13 @@ export const ClearSubscriptionsCard: React.VFC = () => {
 
   return (
     <>
-      <SettingsCard>
-        <Body>
-          Clear all subscriptions you have made on individual Version and Task
-          pages:
-        </Body>
-        <StyledClearSubscriptionButton
-          data-cy="clear-subscriptions-button"
-          variant={Variant.Danger}
-          onClick={() => setShowModal(true)}
-        >
-          Clear all previous subscriptions
-        </StyledClearSubscriptionButton>
-      </SettingsCard>
+      <Button
+        data-cy="clear-subscriptions-button"
+        variant={Variant.Danger}
+        onClick={() => setShowModal(true)}
+      >
+        Clear all previous subscriptions
+      </Button>
       <ConfirmationModal
         open={showModal}
         title="Clear All Subscriptions"
@@ -70,12 +60,8 @@ export const ClearSubscriptionsCard: React.VFC = () => {
         submitDisabled={loading}
       >
         Are you sure you want to clear all subscriptions you have made on
-        individual Version and Task pages?
+        individual version, task, and project pages?
       </ConfirmationModal>
     </>
   );
 };
-
-const StyledClearSubscriptionButton = styled(Button)`
-  margin-top: ${size.m};
-`;
diff --git a/src/pages/preferences/preferencesTabs/notificationTab/UserSubscriptions.tsx b/src/pages/preferences/preferencesTabs/notificationTab/UserSubscriptions.tsx
index 9e1c0131eb..6c69d82888 100644
--- a/src/pages/preferences/preferencesTabs/notificationTab/UserSubscriptions.tsx
+++ b/src/pages/preferences/preferencesTabs/notificationTab/UserSubscriptions.tsx
@@ -1,71 +1,94 @@
-import { useMemo, useRef } from "react";
-import { useQuery } from "@apollo/client";
+import { useRef, useState } from "react";
+import { useMutation } from "@apollo/client";
 import styled from "@emotion/styled";
+import Button from "@leafygreen-ui/button";
+import Pagination from "@leafygreen-ui/pagination";
+import { palette } from "@leafygreen-ui/palette";
+import { useLeafyGreenTable } from "@leafygreen-ui/table/new";
 import {
-  Cell,
-  ExpandedContent,
-  flexRender,
-  HeaderCell,
-  HeaderRow,
-  Row,
-  Table,
-  TableBody,
-  TableHead,
-  useLeafyGreenTable,
-} from "@leafygreen-ui/table/new";
+  getFacetedUniqueValues,
+  getFilteredRowModel,
+} from "@tanstack/react-table";
+import Icon from "components/Icon";
 import { SettingsCard, SettingsCardTitle } from "components/SettingsCard";
-import { StyledRouterLink } from "components/styles";
+import { ShortenedRouterLink } from "components/styles";
+import { BaseTable } from "components/Table/BaseTable";
+import { getColumnTreeSelectFilterProps } from "components/Table/LGFilters";
 import { getSubscriberText } from "constants/subscription";
+import { size } from "constants/tokens";
 import {
+  resourceTypeToCopy,
+  resourceTypeTreeData,
+  triggerToCopy,
+  triggerTreeData,
+} from "constants/triggers";
+import { useToastContext } from "context/toast";
+import {
+  DeleteSubscriptionsMutation,
+  DeleteSubscriptionsMutationVariables,
   GeneralSubscription,
   Selector,
-  UserSubscriptionsQuery,
-  UserSubscriptionsQueryVariables,
 } from "gql/generated/types";
-import { USER_SUBSCRIPTIONS } from "gql/queries";
+import { DELETE_SUBSCRIPTIONS } from "gql/mutations";
 import { notificationMethodToCopy } from "types/subscription";
-import { resourceTypeToCopy, triggerToCopy } from "types/triggers";
-import { getResourceRoute, processSubscriptionData } from "./utils";
+import { ClearSubscriptions } from "./ClearSubscriptions";
+import { getResourceRoute, useSubscriptionData } from "./utils";
+
+const { gray } = palette;
 
 export const UserSubscriptions: React.VFC<{}> = () => {
-  const { data } = useQuery<
-    UserSubscriptionsQuery,
-    UserSubscriptionsQueryVariables
-  >(USER_SUBSCRIPTIONS);
+  const dispatchToast = useToastContext();
 
-  const globalSubscriptionIds = useMemo(() => {
-    const {
-      buildBreakId,
-      commitQueueId,
-      patchFinishId,
-      patchFirstFailureId,
-      spawnHostExpirationId,
-      spawnHostOutcomeId,
-    } = data?.userSettings?.notifications ?? {};
-    return new Set([
-      buildBreakId,
-      commitQueueId,
-      patchFinishId,
-      patchFirstFailureId,
-      spawnHostExpirationId,
-      spawnHostOutcomeId,
-    ]);
-  }, [data?.userSettings?.notifications]);
+  const [deleteSubscriptions] = useMutation<
+    DeleteSubscriptionsMutation,
+    DeleteSubscriptionsMutationVariables
+  >(DELETE_SUBSCRIPTIONS, {
+    refetchQueries: ["UserSubscriptions"],
+    onCompleted: (result) => {
+      dispatchToast.success(
+        `Deleted ${result.deleteSubscriptions} subscription${
+          result.deleteSubscriptions === 1 ? "" : "s"
+        }.`
+      );
+    },
+    onError: (e) => {
+      dispatchToast.error(
+        `Error attempting to delete subscriptions: ${e.message}`
+      );
+    },
+  });
 
-  const subscriptions = useMemo(
-    () =>
-      processSubscriptionData(data?.user?.subscriptions, globalSubscriptionIds),
-    [data?.user?.subscriptions, globalSubscriptionIds]
-  );
+  const subscriptions = useSubscriptionData();
+
+  const [columnFilters, setColumnFilters] = useState([]);
+  const [rowSelection, setRowSelection] = useState({});
 
   const tableContainerRef = useRef<HTMLDivElement>(null);
   const table = useLeafyGreenTable<GeneralSubscription>({
     columns,
     containerRef: tableContainerRef,
     data: subscriptions ?? [],
+    getFacetedUniqueValues: getFacetedUniqueValues(),
+    getFilteredRowModel: getFilteredRowModel(),
+    hasSelectableRows: true,
+    onColumnFiltersChange: setColumnFilters,
+    onRowSelectionChange: setRowSelection,
+    state: {
+      columnFilters,
+      rowSelection,
+    },
+    withPagination: true,
   });
 
-  const { rows } = table.getRowModel();
+  const onDeleteSubscriptions = () => {
+    const subscriptionIds = table
+      .getSelectedRowModel()
+      .rows.map(({ original }) => original.id);
+
+    deleteSubscriptions({ variables: { subscriptionIds } });
+
+    table.resetRowSelection();
+  };
 
   return (
     <>
@@ -74,39 +97,45 @@ export const UserSubscriptions: React.VFC<{}> = () => {
         {!subscriptions?.length ? (
           "No subscriptions found."
         ) : (
-          <Table table={table} ref={tableContainerRef} shouldAlternateRowColor>
-            <TableHead>
-              {table.getHeaderGroups().map((headerGroup) => (
-                <HeaderRow key={headerGroup.id}>
-                  {headerGroup.headers.map((header) => (
-                    <HeaderCell key={header.id} header={header}>
-                      {flexRender(
-                        header.column.columnDef.header,
-                        header.getContext()
-                      )}
-                    </HeaderCell>
-                  ))}
-                </HeaderRow>
-              ))}
-            </TableHead>
-            <TableBody>
-              {rows.map((row) => (
-                <Row key={row.id} row={row} data-cy="subscription-row">
-                  {row.getVisibleCells().map((cell) => (
-                    <Cell key={cell.id}>
-                      {flexRender(
-                        cell.column.columnDef.cell,
-                        cell.getContext()
-                      )}
-                    </Cell>
-                  ))}
-                  {row.original.renderExpandedContent && (
-                    <ExpandedContent row={row} />
-                  )}
-                </Row>
-              ))}
-            </TableBody>
-          </Table>
+          <>
+            <InteractiveWrapper>
+              <Button
+                data-cy="delete-some-button"
+                disabled={Object.entries(rowSelection).length === 0}
+                leftGlyph={<Icon glyph="Trash" />}
+                onClick={onDeleteSubscriptions}
+                size="small"
+              >
+                Delete
+                {Object.entries(rowSelection).length
+                  ? ` (${Object.entries(rowSelection).length})`
+                  : ""}
+              </Button>
+              <PaginationWrapper>
+                <Pagination
+                  itemsPerPage={table.getState().pagination.pageSize}
+                  onItemsPerPageOptionChange={(value: string) => {
+                    table.setPageSize(Number(value));
+                  }}
+                  numTotalItems={subscriptions.length}
+                  currentPage={table.getState().pagination.pageIndex + 1}
+                  onCurrentPageOptionChange={(value: string) => {
+                    table.setPageIndex(Number(value) - 1);
+                  }}
+                  onBackArrowClick={() => table.previousPage()}
+                  onForwardArrowClick={() => table.nextPage()}
+                />
+              </PaginationWrapper>
+            </InteractiveWrapper>
+            <BaseTable
+              data-cy-row="subscription-row"
+              table={table}
+              shouldAlternateRowColor
+            />
+            <TableFooter>
+              <ClearSubscriptions />
+            </TableFooter>
+          </>
         )}
       </SettingsCard>
     </>
@@ -115,12 +144,16 @@ export const UserSubscriptions: React.VFC<{}> = () => {
 
 const columns = [
   {
-    header: "Type",
     accessorKey: "resourceType",
     cell: ({ getValue }) => {
       const resourceType = getValue();
       return resourceTypeToCopy?.[resourceType] ?? resourceType;
     },
+    ...getColumnTreeSelectFilterProps({
+      "data-cy": "status-filter-popover",
+      tData: resourceTypeTreeData,
+      title: "Type",
+    }),
   },
   {
     header: "ID",
@@ -138,12 +171,20 @@ const columns = [
       const { data: selectorId } = resourceSelector ?? {};
       const route = getResourceRoute(resourceType, resourceSelector);
 
-      return route ? <IdLink to={route}>{selectorId}</IdLink> : selectorId;
+      return route ? (
+        <ShortenedRouterLink to={route}>{selectorId}</ShortenedRouterLink>
+      ) : (
+        selectorId
+      );
     },
   },
   {
-    header: "Event",
     accessorKey: "trigger",
+    ...getColumnTreeSelectFilterProps({
+      "data-cy": "trigger-filter-popover",
+      tData: triggerTreeData,
+      title: "Event",
+    }),
     cell: ({ getValue }) => {
       const trigger = getValue();
       return triggerToCopy?.[trigger] ?? trigger;
@@ -164,10 +205,20 @@ const columns = [
   },
 ];
 
-const IdLink = styled(StyledRouterLink)`
-  span {
-    max-width: 200px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
+const InteractiveWrapper = styled.div`
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: ${size.s};
+`;
+
+const PaginationWrapper = styled.div`
+  width: 50%;
+`;
+
+const TableFooter = styled.div`
+  box-shadow: 0 -4px ${gray.light2};
+  display: flex;
+  justify-content: flex-end;
+  margin-top: ${size.s};
+  padding-top: ${size.s};
 `;
diff --git a/src/pages/preferences/preferencesTabs/notificationTab/utils.tsx b/src/pages/preferences/preferencesTabs/notificationTab/utils.tsx
index d87b70dd4b..9ca32cff51 100644
--- a/src/pages/preferences/preferencesTabs/notificationTab/utils.tsx
+++ b/src/pages/preferences/preferencesTabs/notificationTab/utils.tsx
@@ -1,3 +1,5 @@
+import { useMemo } from "react";
+import { useQuery } from "@apollo/client";
 import styled from "@emotion/styled";
 import { LeafyGreenTableRow } from "@leafygreen-ui/table/new";
 import {
@@ -7,10 +9,51 @@ import {
   getVersionRoute,
 } from "constants/routes";
 import { size } from "constants/tokens";
-import { GeneralSubscription, Selector } from "gql/generated/types";
+import { convertFamilyTrigger } from "constants/triggers";
+import {
+  GeneralSubscription,
+  Selector,
+  UserSubscriptionsQuery,
+  UserSubscriptionsQueryVariables,
+} from "gql/generated/types";
+import { USER_SUBSCRIPTIONS } from "gql/queries";
 import { ResourceType } from "types/triggers";
 
-export const processSubscriptionData = (
+export const useSubscriptionData = () => {
+  const { data } = useQuery<
+    UserSubscriptionsQuery,
+    UserSubscriptionsQueryVariables
+  >(USER_SUBSCRIPTIONS);
+
+  const globalSubscriptionIds = useMemo(() => {
+    const {
+      buildBreakId,
+      commitQueueId,
+      patchFinishId,
+      patchFirstFailureId,
+      spawnHostExpirationId,
+      spawnHostOutcomeId,
+    } = data?.userSettings?.notifications ?? {};
+    return new Set([
+      buildBreakId,
+      commitQueueId,
+      patchFinishId,
+      patchFirstFailureId,
+      spawnHostExpirationId,
+      spawnHostOutcomeId,
+    ]);
+  }, [data?.userSettings?.notifications]);
+
+  const subscriptions = useMemo(
+    () =>
+      processSubscriptionData(data?.user?.subscriptions, globalSubscriptionIds),
+    [data?.user?.subscriptions, globalSubscriptionIds]
+  );
+
+  return subscriptions;
+};
+
+const processSubscriptionData = (
   subscriptions: GeneralSubscription[],
   globalSubscriptionIds: Set<string>
 ) => {
@@ -22,6 +65,11 @@ export const processSubscriptionData = (
     subscriptions
       // Filter out a user's global subscriptions for tasks, spawn hosts, etc.
       .filter(({ id }) => !globalSubscriptionIds.has(id))
+      // For this table's purposes, FAMILY_TRIGGER = TRIGGER. Convert all family triggers to their base type.
+      .map(({ trigger, ...subscription }) => ({
+        ...subscription,
+        trigger: convertFamilyTrigger(trigger),
+      }))
       // For subscriptions that contain regex selectors or additional trigger data, append an expandable section
       .map((subscription) => {
         const hasTriggerData = !!Object.entries(subscription.triggerData ?? {})
diff --git a/src/pages/projectSettings/Context.tsx b/src/pages/projectSettings/Context.tsx
index d8fdf51527..c43377600f 100644
--- a/src/pages/projectSettings/Context.tsx
+++ b/src/pages/projectSettings/Context.tsx
@@ -203,6 +203,25 @@ const usePopulateForm = <T extends WritableTabRoutes>(
   }, [formData]); // eslint-disable-line react-hooks/exhaustive-deps
 };
 
+const useHasUnsavedTab = (): {
+  hasUnsaved: boolean;
+  unsavedTabs: ProjectSettingsTabRoutes[];
+} => {
+  const { tabs } = useProjectSettingsContext();
+  const unsavedTabs = useMemo(
+    () =>
+      Object.entries(tabs)
+        .filter(([, tabData]) => tabData.hasChanges)
+        .map(([tab]) => tab as ProjectSettingsTabRoutes),
+    [tabs]
+  );
+
+  return {
+    unsavedTabs,
+    hasUnsaved: !!unsavedTabs.length,
+  };
+};
+
 const getDefaultTabState = <T extends unknown>(
   defaultValue: T
 ): Record<WritableTabRoutes, T> =>
@@ -213,4 +232,9 @@ const getDefaultTabState = <T extends unknown>(
     }))
   );
 
-export { ProjectSettingsProvider, usePopulateForm, useProjectSettingsContext };
+export {
+  ProjectSettingsProvider,
+  useHasUnsavedTab,
+  usePopulateForm,
+  useProjectSettingsContext,
+};
diff --git a/src/pages/projectSettings/CopyProjectModal.test.tsx b/src/pages/projectSettings/CopyProjectModal.test.tsx
index 1b84d23a7d..f8898b2bb2 100644
--- a/src/pages/projectSettings/CopyProjectModal.test.tsx
+++ b/src/pages/projectSettings/CopyProjectModal.test.tsx
@@ -4,6 +4,7 @@ import { RenderFakeToastContext } from "context/toast/__mocks__";
 import {
   CopyProjectMutation,
   CopyProjectMutationVariables,
+  ProjectHealthView,
   ProjectSettingsQuery,
   ProjectSettingsQueryVariables,
   RepoSettingsQuery,
@@ -326,6 +327,7 @@ const projectSettingsMock: ApolloMock<
             },
           ],
           periodicBuilds: [],
+          projectHealthView: ProjectHealthView.Failed,
           prTestingEnabled: true,
           manualPrTestingEnabled: null,
           githubChecksEnabled: false,
diff --git a/src/pages/projectSettings/NavigationModal.tsx b/src/pages/projectSettings/NavigationModal.tsx
new file mode 100644
index 0000000000..3480ada29f
--- /dev/null
+++ b/src/pages/projectSettings/NavigationModal.tsx
@@ -0,0 +1,59 @@
+import { Body } from "@leafygreen-ui/typography";
+import {
+  matchPath,
+  unstable_useBlocker as useBlocker,
+  useParams,
+} from "react-router-dom";
+import { ConfirmationModal } from "components/ConfirmationModal";
+import { getProjectSettingsRoute, routes } from "constants/routes";
+import { useHasUnsavedTab } from "./Context";
+import { getTabTitle } from "./getTabTitle";
+
+export const NavigationModal: React.VFC = () => {
+  const { hasUnsaved, unsavedTabs } = useHasUnsavedTab();
+  const { projectIdentifier } = useParams();
+
+  const shouldConfirmNavigation = ({ nextLocation }): boolean => {
+    const isProjectSettingsRoute =
+      nextLocation &&
+      !!matchPath(`${routes.projectSettings}/*`, nextLocation.pathname);
+    if (!isProjectSettingsRoute) {
+      return hasUnsaved;
+    }
+
+    /* Identify if the user is navigating to a new project's settings via project select dropdown */
+    const currentProjectRoute = getProjectSettingsRoute(projectIdentifier);
+    const isNewProjectSettingsRoute = !matchPath(
+      `${currentProjectRoute}/*`,
+      nextLocation.pathname
+    );
+    if (isNewProjectSettingsRoute) {
+      return hasUnsaved;
+    }
+
+    return false;
+  };
+
+  const blocker = useBlocker(shouldConfirmNavigation);
+
+  return (
+    blocker.state === "blocked" && (
+      <ConfirmationModal
+        buttonText="Leave"
+        data-cy="navigation-warning-modal"
+        open
+        onCancel={() => blocker.reset?.()}
+        onConfirm={() => blocker.proceed?.()}
+        title="You have unsaved changes that will be discarded. Are you sure you want to leave?"
+        variant="danger"
+      >
+        <Body>Unsaved changes are present on the following pages:</Body>
+        <ol data-cy="unsaved-pages">
+          {unsavedTabs.map((tab) => (
+            <li key={tab}>{getTabTitle(tab).title}</li>
+          ))}
+        </ol>
+      </ConfirmationModal>
+    )
+  );
+};
diff --git a/src/pages/projectSettings/Tabs.tsx b/src/pages/projectSettings/Tabs.tsx
index f150887087..719e363c6f 100644
--- a/src/pages/projectSettings/Tabs.tsx
+++ b/src/pages/projectSettings/Tabs.tsx
@@ -6,6 +6,7 @@ import { ProjectSettingsQuery, RepoSettingsQuery } from "gql/generated/types";
 import { isProduction } from "utils/environmentVariables";
 import { useProjectSettingsContext } from "./Context";
 import { Header } from "./Header";
+import { NavigationModal } from "./NavigationModal";
 import {
   AccessTab,
   ContainersTab,
@@ -57,6 +58,7 @@ export const ProjectSettingsTabs: React.VFC<Props> = ({
 
   return (
     <Container>
+      <NavigationModal />
       <Header
         attachedRepoId={projectData?.projectRef?.repoRefId}
         id={projectId || repoId}
diff --git a/src/pages/projectSettings/tabs/NotificationsTab/NotificationsTab.tsx b/src/pages/projectSettings/tabs/NotificationsTab/NotificationsTab.tsx
index 7cae6c36d2..3398025f54 100644
--- a/src/pages/projectSettings/tabs/NotificationsTab/NotificationsTab.tsx
+++ b/src/pages/projectSettings/tabs/NotificationsTab/NotificationsTab.tsx
@@ -50,8 +50,7 @@ export const NotificationsTab: React.VFC<TabProps> = ({
 const validate = ((formData, errors) => {
   const { subscriptions } = formData;
 
-  for (let i = 0; i < subscriptions.length; i++) {
-    const subscription = subscriptions[i];
+  subscriptions.forEach((subscription, i) => {
     const { subscriptionData } = subscription;
     const { event, notification } = subscriptionData;
     const { notificationSelect } = notification;
@@ -65,12 +64,12 @@ const validate = ((formData, errors) => {
             errors.subscriptions[
               i
             ].subscriptionData?.notification?.notificationSelect?.addError(
-              "JIRA comment subscription not allowed for tasks in a project"
+              "Subscription type not allowed for tasks in a project."
             );
           }
         }
       }
     );
-  }
+  });
   return errors;
 }) satisfies ValidateProps<FormState>;
diff --git a/src/pages/projectSettings/tabs/NotificationsTab/transformers.ts b/src/pages/projectSettings/tabs/NotificationsTab/transformers.ts
index dc352f93ac..be99af9c58 100644
--- a/src/pages/projectSettings/tabs/NotificationsTab/transformers.ts
+++ b/src/pages/projectSettings/tabs/NotificationsTab/transformers.ts
@@ -1,12 +1,11 @@
 import { ProjectSettingsTabRoutes } from "constants/routes";
 import { getSubscriberText } from "constants/subscription";
-import { projectTriggers } from "constants/triggers";
+import { convertFamilyTrigger, projectTriggers } from "constants/triggers";
 import {
   BannerTheme,
   ProjectInput,
   SubscriptionInput,
 } from "gql/generated/types";
-import { TriggerType } from "types/triggers";
 import { string } from "utils";
 import { FormToGqlFunction, GqlToFormFunction } from "../types";
 import { ProjectType } from "../utils";
@@ -17,19 +16,6 @@ type Tab = ProjectSettingsTabRoutes.Notifications;
 
 const { toSentenceCase } = string;
 
-const convertFamilyTrigger = (trigger: string) => {
-  switch (trigger) {
-    case TriggerType.FAMILY_OUTCOME:
-      return TriggerType.OUTCOME;
-    case TriggerType.FAMILY_FAILURE:
-      return TriggerType.FAILURE;
-    case TriggerType.FAMILY_SUCCESS:
-      return TriggerType.SUCCESS;
-    default:
-      return trigger;
-  }
-};
-
 const getTriggerText = (trigger: string, resourceType: string) => {
   const convertedTrigger = convertFamilyTrigger(trigger);
   const triggerText =
diff --git a/src/pages/projectSettings/tabs/PeriodicBuildsTab/getFormSchema.ts b/src/pages/projectSettings/tabs/PeriodicBuildsTab/getFormSchema.ts
index 41b33666cb..f2f71ee618 100644
--- a/src/pages/projectSettings/tabs/PeriodicBuildsTab/getFormSchema.ts
+++ b/src/pages/projectSettings/tabs/PeriodicBuildsTab/getFormSchema.ts
@@ -2,6 +2,7 @@ import widgets from "components/SpruceForm/Widgets";
 import { timeZones } from "constants/fieldMaps";
 import { GetFormSchema } from "../types";
 import { form, ProjectType } from "../utils";
+import { IntervalSpecifier } from "./types";
 
 const { overrideRadioBox } = form;
 
@@ -26,11 +27,58 @@ export const getFormSchema = (
         items: {
           type: "object" as "object",
           properties: {
-            intervalHours: {
-              type: "number" as "number",
-              title: "Interval",
-              minimum: 1,
-              default: 24,
+            interval: {
+              type: "object" as "object",
+              title: "Interval Specifier",
+              properties: {
+                specifier: {
+                  type: "string" as "string",
+                  title: "",
+                  default: IntervalSpecifier.Hours,
+                  oneOf: [
+                    {
+                      type: "string" as "string",
+                      title: "Hours",
+                      enum: [IntervalSpecifier.Hours],
+                    },
+                    {
+                      type: "string" as "string",
+                      title: "Cron",
+                      enum: [IntervalSpecifier.Cron],
+                    },
+                  ],
+                },
+              },
+              dependencies: {
+                specifier: {
+                  oneOf: [
+                    {
+                      properties: {
+                        specifier: {
+                          enum: [IntervalSpecifier.Hours],
+                        },
+                        intervalHours: {
+                          type: "number" as "number",
+                          title: "Interval",
+                          minimum: 1,
+                          default: 24,
+                        },
+                      },
+                    },
+                    {
+                      properties: {
+                        specifier: {
+                          enum: [IntervalSpecifier.Cron],
+                        },
+                        cron: {
+                          type: "string" as "string",
+                          title: "Cron Expression",
+                        },
+                      },
+                    },
+                  ],
+                },
+              },
             },
             configFile: {
               type: "string" as "string",
@@ -71,7 +119,6 @@ export const getFormSchema = (
               default: new Date().toString(),
             },
           },
-          required: ["intervalHours"],
         },
       }
     ),
@@ -91,9 +138,14 @@ export const getFormSchema = (
       "ui:useExpandableCard": true,
       items: {
         "ui:displayTitle": "New Periodic Build",
-        intervalHours: {
-          "ui:data-cy": "interval-input",
-          "ui:description": "Number of hours between runs.",
+        interval: {
+          specifier: {
+            "ui:widget": widgets.SegmentedControlWidget,
+          },
+          intervalHours: {
+            "ui:data-cy": "interval-input",
+            "ui:description": "Number of hours between runs.",
+          },
         },
         configFile: {
           "ui:data-cy": "config-file-input",
diff --git a/src/pages/projectSettings/tabs/PeriodicBuildsTab/transformers.test.ts b/src/pages/projectSettings/tabs/PeriodicBuildsTab/transformers.test.ts
index 3306ffa327..9d10b5efb7 100644
--- a/src/pages/projectSettings/tabs/PeriodicBuildsTab/transformers.test.ts
+++ b/src/pages/projectSettings/tabs/PeriodicBuildsTab/transformers.test.ts
@@ -2,7 +2,7 @@ import { ProjectSettingsInput, RepoSettingsInput } from "gql/generated/types";
 import { data } from "../testData";
 import { ProjectType } from "../utils";
 import { formToGql, gqlToForm } from "./transformers";
-import { FormState } from "./types";
+import { FormState, IntervalSpecifier } from "./types";
 
 const { projectBase, repoBase } = data;
 
@@ -49,7 +49,11 @@ const repoForm: FormState = {
       alias: "",
       configFile: "evergreen.yml",
       id: "123",
-      intervalHours: 24,
+      interval: {
+        specifier: IntervalSpecifier.Hours,
+        intervalHours: 24,
+        cron: "",
+      },
       message: "",
       nextRunTime:
         "Wed Mar 30 2022 17:07:10 GMT+0000 (Coordinated Universal Time)",
@@ -59,7 +63,11 @@ const repoForm: FormState = {
       alias: "test",
       configFile: "evergreen.yml",
       id: "456",
-      intervalHours: 12,
+      interval: {
+        specifier: IntervalSpecifier.Cron,
+        intervalHours: null,
+        cron: "*/5 * * * *",
+      },
       message: "Build Message",
       nextRunTime:
         "Wed Mar 30 2022 17:07:10 GMT+0000 (Coordinated Universal Time)",
@@ -75,6 +83,7 @@ const repoResult: Pick<RepoSettingsInput, "projectRef"> = {
       {
         alias: "",
         configFile: "evergreen.yml",
+        cron: "",
         id: "123",
         intervalHours: 24,
         message: "",
@@ -83,8 +92,9 @@ const repoResult: Pick<RepoSettingsInput, "projectRef"> = {
       {
         alias: "test",
         configFile: "evergreen.yml",
+        cron: "*/5 * * * *",
         id: "456",
-        intervalHours: 12,
+        intervalHours: 0,
         message: "Build Message",
         nextRunTime: new Date("2022-03-30T17:07:10.000Z"),
       },
diff --git a/src/pages/projectSettings/tabs/PeriodicBuildsTab/transformers.ts b/src/pages/projectSettings/tabs/PeriodicBuildsTab/transformers.ts
index 47fc65a033..039659a8fc 100644
--- a/src/pages/projectSettings/tabs/PeriodicBuildsTab/transformers.ts
+++ b/src/pages/projectSettings/tabs/PeriodicBuildsTab/transformers.ts
@@ -4,25 +4,23 @@ import {
   ProjectSettingsQuery,
   RepoSettingsQuery,
 } from "gql/generated/types";
-import { string } from "utils";
 import { FormToGqlFunction, GqlToFormFunction } from "../types";
 import { ProjectType } from "../utils";
-import { FormState } from "./types";
-
-const { omitTypename } = string;
+import { FormState, IntervalSpecifier } from "./types";
 
 type Tab = ProjectSettingsTabRoutes.PeriodicBuilds;
 
 const getTitle = (
-  definition: Pick<PeriodicBuild, "message" | "intervalHours">
+  definition: Pick<PeriodicBuild, "cron" | "intervalHours" | "message">
 ) => {
   if (!definition) {
     return "";
   }
-  if (definition.message) {
-    return definition.message;
+  const { cron, intervalHours, message } = definition;
+  if (message) {
+    return message;
   }
-  return `Every ${definition.intervalHours} hours`;
+  return intervalHours ? `Every ${intervalHours} hours` : cron;
 };
 
 export const gqlToForm: GqlToFormFunction<Tab> = (
@@ -41,11 +39,34 @@ export const gqlToForm: GqlToFormFunction<Tab> = (
     periodicBuildsOverride:
       projectType !== ProjectType.AttachedProject || !!periodicBuilds,
     periodicBuilds:
-      periodicBuilds?.map((definition) =>
-        omitTypename({
-          ...definition,
-          nextRunTime: definition.nextRunTime.toString(),
-          displayTitle: getTitle(definition),
+      periodicBuilds?.map(
+        ({
+          alias,
+          configFile,
+          id,
+          intervalHours,
+          cron,
+          message,
+          nextRunTime,
+        }) => ({
+          alias,
+          configFile,
+          id,
+          message,
+          nextRunTime: nextRunTime.toString(),
+          displayTitle: getTitle({ cron, intervalHours, message }),
+          interval:
+            cron === ""
+              ? {
+                  specifier: IntervalSpecifier.Hours,
+                  cron: "",
+                  intervalHours,
+                }
+              : {
+                  specifier: IntervalSpecifier.Cron,
+                  intervalHours: null,
+                  cron,
+                },
         })
       ) ?? [],
   };
@@ -58,14 +79,24 @@ export const formToGql: FormToGqlFunction<Tab> = (
   projectRef: {
     id: projectId,
     periodicBuilds: periodicBuildsOverride
-      ? periodicBuilds.map((build) => ({
-          alias: build.alias,
-          configFile: build.configFile,
-          id: build.id || "",
-          intervalHours: build.intervalHours,
-          message: build.message,
-          nextRunTime: new Date(build.nextRunTime),
-        }))
+      ? periodicBuilds.map(
+          ({ alias, configFile, id, interval, message, nextRunTime }) => ({
+            alias,
+            configFile,
+            id: id || "",
+            message,
+            nextRunTime: new Date(nextRunTime),
+            ...(interval.specifier === IntervalSpecifier.Cron
+              ? {
+                  cron: interval.cron,
+                  intervalHours: 0,
+                }
+              : {
+                  cron: "",
+                  intervalHours: interval.intervalHours,
+                }),
+          })
+        )
       : null,
   },
 });
diff --git a/src/pages/projectSettings/tabs/PeriodicBuildsTab/types.ts b/src/pages/projectSettings/tabs/PeriodicBuildsTab/types.ts
index 2fc549c449..af87d5d36b 100644
--- a/src/pages/projectSettings/tabs/PeriodicBuildsTab/types.ts
+++ b/src/pages/projectSettings/tabs/PeriodicBuildsTab/types.ts
@@ -1,8 +1,17 @@
 import { ProjectType } from "../utils";
 
+export enum IntervalSpecifier {
+  Hours = "HOURS",
+  Cron = "CRON",
+}
+
 type FormPeriodicBuild = {
   id: string;
-  intervalHours: number;
+  interval: {
+    specifier: IntervalSpecifier;
+    intervalHours: number;
+    cron: string;
+  };
   configFile: string;
   displayTitle?: string;
   alias: string;
diff --git a/src/pages/projectSettings/tabs/VariablesTab/VariablesTab.tsx b/src/pages/projectSettings/tabs/VariablesTab/VariablesTab.tsx
index 0beed3e16f..1748cbab56 100644
--- a/src/pages/projectSettings/tabs/VariablesTab/VariablesTab.tsx
+++ b/src/pages/projectSettings/tabs/VariablesTab/VariablesTab.tsx
@@ -6,7 +6,7 @@ import {
   usePopulateForm,
   useProjectSettingsContext,
 } from "pages/projectSettings/Context";
-import { ProjectType } from "../utils";
+import { ProjectType, findDuplicateIndices } from "../utils";
 import { getFormSchema } from "./getFormSchema";
 import { PromoteVariablesModal } from "./PromoteVariablesModal";
 import { FormState, TabProps } from "./types";
@@ -89,11 +89,7 @@ export const VariablesTab: React.VFC<TabProps> = ({
 
 /* Display an error and prevent saving if a user enters a variable name that already appears in the project. */
 const validate = ((formData, errors) => {
-  const duplicateIndices = formData.vars
-    .map((e) => e.varName)
-    .map((e, i, arr) => arr.indexOf(e) !== i && i)
-    .filter((obj) => formData.vars[obj]);
-
+  const duplicateIndices = findDuplicateIndices(formData.vars, "varName");
   duplicateIndices.forEach((i) => {
     errors.vars?.[i]?.varName?.addError(
       "Value already appears in project variables."
diff --git a/src/pages/projectSettings/tabs/ViewsAndFiltersTab/ViewsAndFiltersTab.tsx b/src/pages/projectSettings/tabs/ViewsAndFiltersTab/ViewsAndFiltersTab.tsx
index 1abc1d50c8..f423ac265a 100644
--- a/src/pages/projectSettings/tabs/ViewsAndFiltersTab/ViewsAndFiltersTab.tsx
+++ b/src/pages/projectSettings/tabs/ViewsAndFiltersTab/ViewsAndFiltersTab.tsx
@@ -1,12 +1,13 @@
 import { useMemo } from "react";
-import { SpruceForm } from "components/SpruceForm";
+import { SpruceForm, ValidateProps } from "components/SpruceForm";
 import { ProjectSettingsTabRoutes } from "constants/routes";
 import {
   usePopulateForm,
   useProjectSettingsContext,
 } from "pages/projectSettings/Context";
+import { findDuplicateIndices } from "../utils";
 import { getFormSchema } from "./getFormSchema";
-import { TabProps } from "./types";
+import { TabProps, FormState } from "./types";
 
 const tab = ProjectSettingsTabRoutes.ViewsAndFilters;
 
@@ -30,6 +31,22 @@ export const ViewsAndFiltersTab: React.VFC<TabProps> = ({ projectData }) => {
       onChange={onChange}
       schema={schema}
       uiSchema={uiSchema}
+      validate={validate as any}
     />
   );
 };
+
+/* Display an error and prevent saving if a user enters a Parsley filter expression that already appears in the project. */
+const validate = ((formData, errors) => {
+  const duplicateIndices = findDuplicateIndices(
+    formData.parsleyFilters,
+    "expression"
+  );
+  duplicateIndices.forEach((i) => {
+    errors.parsleyFilters?.[i]?.expression?.addError(
+      "Filter expression already appears in this project."
+    );
+  });
+
+  return errors;
+}) satisfies ValidateProps<FormState>;
diff --git a/src/pages/projectSettings/tabs/ViewsAndFiltersTab/getFormSchema.ts b/src/pages/projectSettings/tabs/ViewsAndFiltersTab/getFormSchema.ts
index 46506a293b..92645439dc 100644
--- a/src/pages/projectSettings/tabs/ViewsAndFiltersTab/getFormSchema.ts
+++ b/src/pages/projectSettings/tabs/ViewsAndFiltersTab/getFormSchema.ts
@@ -1,4 +1,6 @@
 import { CardFieldTemplate } from "components/SpruceForm/FieldTemplates";
+import widgets from "components/SpruceForm/Widgets";
+import { ProjectHealthView } from "gql/generated/types";
 import { GetFormSchema } from "../types";
 
 export const getFormSchema = (): ReturnType<GetFormSchema> => ({
@@ -6,22 +8,118 @@ export const getFormSchema = (): ReturnType<GetFormSchema> => ({
   schema: {
     type: "object" as "object",
     properties: {
-      projectHealthView: {
+      view: {
         title: "Project Health View",
         type: "object" as "object",
+        description:
+          "This setting will define the default behavior of the Project Health page for all viewers of this project. Users can still toggle between views.",
+        properties: {
+          projectHealthView: {
+            type: "string" as "string",
+            oneOf: [
+              {
+                type: "string" as "string",
+                title: "Default view",
+                enum: [ProjectHealthView.Failed],
+                description:
+                  "Displays only task failures, making it easier to identify them, and groups tasks by status if they don't match any search criteria. Consider using it for troubleshooting specific issues.",
+              },
+              {
+                type: "string" as "string",
+                title: "All tasks view",
+                enum: [ProjectHealthView.All],
+                description:
+                  "Displays all tasks without grouping. This view can be helpful for getting a comprehensive overview of all tasks.",
+              },
+            ],
+          },
+        },
       },
       parsleyFilters: {
         title: "Parsley Filters",
-        type: "object" as "object",
+        type: "array" as "array",
+        default: [],
+        items: {
+          type: "object" as "object",
+          properties: {
+            expression: {
+              type: "string" as "string",
+              title: "Filter Expression",
+              default: "",
+              minLength: 1,
+              format: "validRegex",
+            },
+            caseSensitive: {
+              type: "boolean" as "boolean",
+              title: "Case",
+              default: false,
+              oneOf: [
+                {
+                  type: "boolean" as "boolean",
+                  title: "Insensitive",
+                  enum: [false],
+                },
+                {
+                  type: "boolean" as "boolean",
+                  title: "Sensitive",
+                  enum: [true],
+                },
+              ],
+            },
+            exactMatch: {
+              type: "boolean" as "boolean",
+              title: "Match",
+              default: true,
+              oneOf: [
+                {
+                  type: "boolean" as "boolean",
+                  title: "Exact",
+                  enum: [true],
+                },
+                {
+                  type: "boolean" as "boolean",
+                  title: "Inverse",
+                  enum: [false],
+                },
+              ],
+            },
+          },
+        },
       },
     },
   },
   uiSchema: {
-    projectHealthView: {
+    view: {
       "ui:ObjectFieldTemplate": CardFieldTemplate,
+      projectHealthView: {
+        "ui:widget": "radio",
+      },
     },
     parsleyFilters: {
-      "ui:ObjectFieldTemplate": CardFieldTemplate,
+      "ui:addButtonText": "Add filter",
+      "ui:orderable": false,
+      "ui:description":
+        "These filters will be available in the Parsley log viewer for any logs generated by this project.",
+      "ui:useExpandableCard": true,
+      "ui:data-cy": "parsley-filter-list",
+      items: {
+        "ui:displayTitle": "New Parsley Filter",
+        expression: {
+          "ui:data-cy": "parsley-filter-expression",
+        },
+        caseSensitive: {
+          "ui:widget": widgets.SegmentedControlWidget,
+          "ui:aria-controls": ["case-insensitive", "case-sensitive"],
+          "ui:data-cy": "parsley-filter-case-sensitivity",
+          "ui:sizeVariant": "small",
+        },
+        exactMatch: {
+          "ui:widget": widgets.SegmentedControlWidget,
+          "ui:aria-controls": ["exact-match", "inverse-match"],
+          "ui:data-cy": "parsley-filter-match-type",
+          "ui:sizeVariant": "small",
+        },
+      },
     },
   },
 });
diff --git a/src/pages/projectSettings/tabs/ViewsAndFiltersTab/transformers.test.ts b/src/pages/projectSettings/tabs/ViewsAndFiltersTab/transformers.test.ts
new file mode 100644
index 0000000000..92ba9deae1
--- /dev/null
+++ b/src/pages/projectSettings/tabs/ViewsAndFiltersTab/transformers.test.ts
@@ -0,0 +1,55 @@
+import { ProjectHealthView, ProjectSettingsInput } from "gql/generated/types";
+import { data } from "../testData";
+import { formToGql, gqlToForm } from "./transformers";
+import { FormState } from "./types";
+
+const { projectBase } = data;
+
+describe("project data", () => {
+  it("correctly converts from GQL to a form", () => {
+    expect(gqlToForm(projectBase)).toStrictEqual(projectForm);
+  });
+
+  it("correctly converts from a form to GQL", () => {
+    expect(formToGql(projectForm, "project")).toStrictEqual(projectResult);
+  });
+});
+
+const projectForm: FormState = {
+  parsleyFilters: [
+    {
+      displayTitle: "filter_1",
+      expression: "filter_1",
+      caseSensitive: true,
+      exactMatch: true,
+    },
+    {
+      displayTitle: "filter_2",
+      expression: "filter_2",
+      caseSensitive: false,
+      exactMatch: false,
+    },
+  ],
+  view: {
+    projectHealthView: ProjectHealthView.Failed,
+  },
+};
+
+const projectResult: Pick<ProjectSettingsInput, "projectRef"> = {
+  projectRef: {
+    id: "project",
+    parsleyFilters: [
+      {
+        expression: "filter_1",
+        caseSensitive: true,
+        exactMatch: true,
+      },
+      {
+        expression: "filter_2",
+        caseSensitive: false,
+        exactMatch: false,
+      },
+    ],
+    projectHealthView: ProjectHealthView.Failed,
+  },
+};
diff --git a/src/pages/projectSettings/tabs/ViewsAndFiltersTab/transformers.ts b/src/pages/projectSettings/tabs/ViewsAndFiltersTab/transformers.ts
index c0c010c288..0b8630f2e5 100644
--- a/src/pages/projectSettings/tabs/ViewsAndFiltersTab/transformers.ts
+++ b/src/pages/projectSettings/tabs/ViewsAndFiltersTab/transformers.ts
@@ -10,14 +10,37 @@ export const gqlToForm: GqlToFormFunction<Tab> = (
 ) => {
   if (!data) return null;
 
-  return {};
+  const {
+    projectRef: { parsleyFilters, projectHealthView },
+  } = data;
+
+  return {
+    parsleyFilters:
+      parsleyFilters?.map(({ expression, caseSensitive, exactMatch }) => ({
+        displayTitle: expression,
+        expression,
+        caseSensitive,
+        exactMatch,
+      })) ?? [],
+    view: {
+      projectHealthView,
+    },
+  };
 };
 
 export const formToGql: FormToGqlFunction<Tab> = (
-  _formState: FormState,
+  { parsleyFilters, view }: FormState,
   id: string
 ) => ({
   projectRef: {
     id,
+    parsleyFilters: parsleyFilters.map(
+      ({ expression, caseSensitive, exactMatch }) => ({
+        expression,
+        caseSensitive,
+        exactMatch,
+      })
+    ),
+    projectHealthView: view.projectHealthView,
   },
 });
diff --git a/src/pages/projectSettings/tabs/ViewsAndFiltersTab/types.ts b/src/pages/projectSettings/tabs/ViewsAndFiltersTab/types.ts
index 6ebcf3aaaa..3b37e30652 100644
--- a/src/pages/projectSettings/tabs/ViewsAndFiltersTab/types.ts
+++ b/src/pages/projectSettings/tabs/ViewsAndFiltersTab/types.ts
@@ -1,6 +1,17 @@
+import { ProjectHealthView } from "gql/generated/types";
 import { ProjectType } from "../utils";
 
-export interface FormState {}
+export interface FormState {
+  view: {
+    projectHealthView: ProjectHealthView;
+  };
+  parsleyFilters: {
+    caseSensitive: boolean;
+    displayTitle?: string;
+    exactMatch: boolean;
+    expression: string;
+  }[];
+}
 
 export type TabProps = {
   identifier: string;
diff --git a/src/pages/projectSettings/tabs/testData.ts b/src/pages/projectSettings/tabs/testData.ts
index 86597875c5..48636ee682 100644
--- a/src/pages/projectSettings/tabs/testData.ts
+++ b/src/pages/projectSettings/tabs/testData.ts
@@ -1,5 +1,6 @@
 import {
   BannerTheme,
+  ProjectHealthView,
   ProjectSettingsQuery,
   RepoSettingsQuery,
 } from "gql/generated/types";
@@ -85,6 +86,19 @@ const projectBase: ProjectSettingsQuery["projectSettings"] = {
     },
     triggers: [],
     periodicBuilds: [],
+    parsleyFilters: [
+      {
+        expression: "filter_1",
+        caseSensitive: true,
+        exactMatch: true,
+      },
+      {
+        expression: "filter_2",
+        caseSensitive: false,
+        exactMatch: false,
+      },
+    ],
+    projectHealthView: ProjectHealthView.Failed,
   },
   vars: {
     vars: { test_name: "", test_two: "val" },
@@ -226,6 +240,7 @@ const repoBase: RepoSettingsQuery["repoSettings"] = {
         configFile: "evergreen.yml",
         id: "123",
         intervalHours: 24,
+        cron: "",
         message: "",
         nextRunTime: new Date("2022-03-30T17:07:10.942Z"),
       },
@@ -233,7 +248,8 @@ const repoBase: RepoSettingsQuery["repoSettings"] = {
         alias: "test",
         configFile: "evergreen.yml",
         id: "456",
-        intervalHours: 12,
+        intervalHours: 0,
+        cron: "*/5 * * * *",
         message: "Build Message",
         nextRunTime: new Date("2022-03-30T17:07:10.942Z"),
       },
diff --git a/src/pages/projectSettings/tabs/utils/errors.test.ts b/src/pages/projectSettings/tabs/utils/errors.test.ts
new file mode 100644
index 0000000000..e58179f94c
--- /dev/null
+++ b/src/pages/projectSettings/tabs/utils/errors.test.ts
@@ -0,0 +1,25 @@
+import { findDuplicateIndices } from "./errors";
+
+describe("findDuplicateIndices", () => {
+  it("should return a list of indices that indicate the first occurrence of the duplicates", () => {
+    const testArray = [
+      { id: "xyz" },
+      { id: "tuv" },
+      { id: "abc" },
+      { id: "xyz" },
+      { id: "abc" },
+    ];
+    expect(findDuplicateIndices(testArray, "id")).toStrictEqual([0, 2]);
+  });
+
+  it("should return empty array if there are no duplicates", () => {
+    const testArray = [
+      { id: "abc" },
+      { id: "def" },
+      { id: "ghi" },
+      { id: "tuv" },
+      { id: "xyz" },
+    ];
+    expect(findDuplicateIndices(testArray, "id")).toStrictEqual([]);
+  });
+});
diff --git a/src/pages/projectSettings/tabs/utils/errors.ts b/src/pages/projectSettings/tabs/utils/errors.ts
new file mode 100644
index 0000000000..1cdacfe147
--- /dev/null
+++ b/src/pages/projectSettings/tabs/utils/errors.ts
@@ -0,0 +1,18 @@
+/**
+ * `findDuplicateIndices` finds and returns the indices of duplicates in an array.
+ * @param array - an array of objects in which to check for duplicates
+ * @param key - the key by which to compare objects
+ * @returns an array of numbers indicating the indices of duplicates
+ */
+export const findDuplicateIndices = <T = { [key: string]: any }>(
+  array: T[],
+  key: keyof T
+) => {
+  const duplicateIndices = array
+    .map((item) => item[key])
+    .map(
+      (val, index, arr) => val !== "" && arr.lastIndexOf(val) !== index && index
+    )
+    .filter((index) => array[index]);
+  return duplicateIndices;
+};
diff --git a/src/pages/projectSettings/tabs/utils/index.ts b/src/pages/projectSettings/tabs/utils/index.ts
index b523334955..4308620d0a 100644
--- a/src/pages/projectSettings/tabs/utils/index.ts
+++ b/src/pages/projectSettings/tabs/utils/index.ts
@@ -3,5 +3,7 @@ import { AliasFormType } from "./alias";
 import * as form from "./form";
 import { PatchTriggerAliasStatus, ProjectType } from "./types";
 
+export { findDuplicateIndices } from "./errors";
+
 export { alias, form, PatchTriggerAliasStatus, ProjectType };
 export type { AliasFormType };
diff --git a/src/pages/spawn/spawnHost/__snapshots__/SpawnHostCard.stories.storyshot b/src/pages/spawn/spawnHost/__snapshots__/SpawnHostCard.stories.storyshot
index 4d90cad545..43ebe0ffef 100644
--- a/src/pages/spawn/spawnHost/__snapshots__/SpawnHostCard.stories.storyshot
+++ b/src/pages/spawn/spawnHost/__snapshots__/SpawnHostCard.stories.storyshot
@@ -163,7 +163,7 @@ exports[`storybook Storyshots Pages/Spawn/Spawn Host Card Default 1`] = `
       <div>
         <span>
           <a
-            class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+            class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
             href="/spawn/volume?volume=vol-0ea662ac92f611ed4"
           >
             <span
@@ -186,7 +186,7 @@ exports[`storybook Storyshots Pages/Spawn/Spawn Host Card Default 1`] = `
       <div>
         <span>
           <a
-            class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+            class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
             href="/host/i-04ade558e1e26b0ad/ide"
             target="_self"
           >
diff --git a/src/pages/task/metadata/__snapshots__/Metadata.stories.storyshot b/src/pages/task/metadata/__snapshots__/Metadata.stories.storyshot
index 640564e6e3..e346c5e93a 100644
--- a/src/pages/task/metadata/__snapshots__/Metadata.stories.storyshot
+++ b/src/pages/task/metadata/__snapshots__/Metadata.stories.storyshot
@@ -9,7 +9,7 @@ exports[`storybook Storyshots Pages/Task/Metadata Containerized Task 1`] = `
       class="css-1l8tpk-SiderCard e1am38ss0 leafygreen-ui-1v4ednr"
     >
       <p
-        class="css-1k03zl5-Title e1ul56zb1 leafygreen-ui-ki7nen"
+        class="css-1k03zl5-Title e1ul56zb1 leafygreen-ui-1miy0xp"
       >
         Task Metadata
       </p>
@@ -17,13 +17,13 @@ exports[`storybook Storyshots Pages/Task/Metadata Containerized Task 1`] = `
         class="css-qqg5h5-Divider eyj3qof0"
       />
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
         data-cy="task-metadata-build-variant"
       >
         Build Variant:
          
         <a
-          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
           data-cy="build-variant-link"
           href="/version/spruce_ubuntu1604_e0ece5ad52ad01630bdf29f55b9382a26d6256b3_20_08_26_19_20_41/tasks?page=0&variant=%5Eubuntu1604%24"
         >
@@ -35,13 +35,13 @@ exports[`storybook Storyshots Pages/Task/Metadata Containerized Task 1`] = `
         </a>
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
         data-cy="task-metadata-project"
       >
         Project:
          
         <a
-          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
           data-cy="project-link"
           href="/project/spruce/patches"
         >
@@ -53,13 +53,13 @@ exports[`storybook Storyshots Pages/Task/Metadata Containerized Task 1`] = `
         </a>
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
       >
         Submitted by: 
         mohamed.khelif
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
       >
         Estimated time to start:
          
@@ -70,13 +70,13 @@ exports[`storybook Storyshots Pages/Task/Metadata Containerized Task 1`] = `
         </span>
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
         data-cy="task-metadata-base-commit-duration"
       >
         Base commit duration: 
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
       >
         Base commit:
          
@@ -86,19 +86,19 @@ exports[`storybook Storyshots Pages/Task/Metadata Containerized Task 1`] = `
           href="/task/spruce_ubuntu1604_e2e_test_e0ece5ad52ad01630bdf29f55b9382a26d6256b3_20_08_26_19_20_41"
         >
           <code
-            class="leafygreen-ui-y846ok"
+            class="leafygreen-ui-7u0nmx"
           >
             e0ece5a
           </code>
         </a>
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
       >
         Container:
          
         <a
-          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
           data-cy="task-pod-link"
           href="/container/pod_id"
           target="_self"
@@ -124,7 +124,7 @@ exports[`storybook Storyshots Pages/Task/Metadata Default 1`] = `
       class="css-1l8tpk-SiderCard e1am38ss0 leafygreen-ui-1v4ednr"
     >
       <p
-        class="css-1k03zl5-Title e1ul56zb1 leafygreen-ui-ki7nen"
+        class="css-1k03zl5-Title e1ul56zb1 leafygreen-ui-1miy0xp"
       >
         Task Metadata
       </p>
@@ -132,13 +132,13 @@ exports[`storybook Storyshots Pages/Task/Metadata Default 1`] = `
         class="css-qqg5h5-Divider eyj3qof0"
       />
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
         data-cy="task-metadata-build-variant"
       >
         Build Variant:
          
         <a
-          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
           data-cy="build-variant-link"
           href="/version/spruce_ubuntu1604_e0ece5ad52ad01630bdf29f55b9382a26d6256b3_20_08_26_19_20_41/tasks?page=0&variant=%5Eubuntu1604%24"
         >
@@ -150,13 +150,13 @@ exports[`storybook Storyshots Pages/Task/Metadata Default 1`] = `
         </a>
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
         data-cy="task-metadata-project"
       >
         Project:
          
         <a
-          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
           data-cy="project-link"
           href="/project/spruce/patches"
         >
@@ -168,13 +168,13 @@ exports[`storybook Storyshots Pages/Task/Metadata Default 1`] = `
         </a>
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
       >
         Submitted by: 
         mohamed.khelif
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
       >
         Estimated time to start:
          
@@ -185,13 +185,13 @@ exports[`storybook Storyshots Pages/Task/Metadata Default 1`] = `
         </span>
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
         data-cy="task-metadata-base-commit-duration"
       >
         Base commit duration: 
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
       >
         Base commit:
          
@@ -201,19 +201,19 @@ exports[`storybook Storyshots Pages/Task/Metadata Default 1`] = `
           href="/task/spruce_ubuntu1604_e2e_test_e0ece5ad52ad01630bdf29f55b9382a26d6256b3_20_08_26_19_20_41"
         >
           <code
-            class="leafygreen-ui-y846ok"
+            class="leafygreen-ui-7u0nmx"
           >
             e0ece5a
           </code>
         </a>
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
       >
         Distro:
          
         <a
-          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
           data-cy="task-distro-link"
           href="/distros##ubuntu1604-small"
           target="_self"
@@ -226,19 +226,19 @@ exports[`storybook Storyshots Pages/Task/Metadata Default 1`] = `
         </a>
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
         data-cy="task-metadata-ami"
       >
         AMI: 
         ami-0c83bb0a9f48c15bf
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
       >
         Host:
          
         <a
-          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
           data-cy="task-host-link"
           href="/host/i-0e0e62799806e037d"
           target="_self"
@@ -251,10 +251,10 @@ exports[`storybook Storyshots Pages/Task/Metadata Default 1`] = `
         </a>
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
       >
         <a
-          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
           data-cy="task-spawn-host-link"
           href="/spawn/host?distroId=ubuntu1604-small&spawnHost=True&taskId=someTaskId"
         >
@@ -279,7 +279,7 @@ exports[`storybook Storyshots Pages/Task/Metadata With Abort Message 1`] = `
       class="css-1l8tpk-SiderCard e1am38ss0 leafygreen-ui-1v4ednr"
     >
       <p
-        class="css-1k03zl5-Title e1ul56zb1 leafygreen-ui-ki7nen"
+        class="css-1k03zl5-Title e1ul56zb1 leafygreen-ui-1miy0xp"
       >
         Task Metadata
       </p>
@@ -287,13 +287,13 @@ exports[`storybook Storyshots Pages/Task/Metadata With Abort Message 1`] = `
         class="css-qqg5h5-Divider eyj3qof0"
       />
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
         data-cy="task-metadata-build-variant"
       >
         Build Variant:
          
         <a
-          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
           data-cy="build-variant-link"
           href="/version/spruce_ubuntu1604_e0ece5ad52ad01630bdf29f55b9382a26d6256b3_20_08_26_19_20_41/tasks?page=0&variant=%5Eubuntu1604%24"
         >
@@ -305,13 +305,13 @@ exports[`storybook Storyshots Pages/Task/Metadata With Abort Message 1`] = `
         </a>
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
         data-cy="task-metadata-project"
       >
         Project:
          
         <a
-          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
           data-cy="project-link"
           href="/project/spruce/patches"
         >
@@ -323,13 +323,13 @@ exports[`storybook Storyshots Pages/Task/Metadata With Abort Message 1`] = `
         </a>
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
       >
         Submitted by: 
         mohamed.khelif
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
       >
         Estimated time to start:
          
@@ -340,13 +340,13 @@ exports[`storybook Storyshots Pages/Task/Metadata With Abort Message 1`] = `
         </span>
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
         data-cy="task-metadata-base-commit-duration"
       >
         Base commit duration: 
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
       >
         Base commit:
          
@@ -356,19 +356,19 @@ exports[`storybook Storyshots Pages/Task/Metadata With Abort Message 1`] = `
           href="/task/spruce_ubuntu1604_e2e_test_e0ece5ad52ad01630bdf29f55b9382a26d6256b3_20_08_26_19_20_41"
         >
           <code
-            class="leafygreen-ui-y846ok"
+            class="leafygreen-ui-7u0nmx"
           >
             e0ece5a
           </code>
         </a>
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
       >
         Distro:
          
         <a
-          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
           data-cy="task-distro-link"
           href="/distros##ubuntu1604-small"
           target="_self"
@@ -381,19 +381,19 @@ exports[`storybook Storyshots Pages/Task/Metadata With Abort Message 1`] = `
         </a>
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
         data-cy="task-metadata-ami"
       >
         AMI: 
         ami-0c83bb0a9f48c15bf
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
       >
         Host:
          
         <a
-          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
           data-cy="task-host-link"
           href="/host/i-0e0e62799806e037d"
           target="_self"
@@ -406,10 +406,10 @@ exports[`storybook Storyshots Pages/Task/Metadata With Abort Message 1`] = `
         </a>
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
       >
         <a
-          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
           data-cy="task-spawn-host-link"
           href="/spawn/host?distroId=ubuntu1604-small&spawnHost=True&taskId=someTaskId"
         >
@@ -434,7 +434,7 @@ exports[`storybook Storyshots Pages/Task/Metadata With Dependencies 1`] = `
       class="css-1l8tpk-SiderCard e1am38ss0 leafygreen-ui-1v4ednr"
     >
       <p
-        class="css-1k03zl5-Title e1ul56zb1 leafygreen-ui-ki7nen"
+        class="css-1k03zl5-Title e1ul56zb1 leafygreen-ui-1miy0xp"
       >
         Task Metadata
       </p>
@@ -442,13 +442,13 @@ exports[`storybook Storyshots Pages/Task/Metadata With Dependencies 1`] = `
         class="css-qqg5h5-Divider eyj3qof0"
       />
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
         data-cy="task-metadata-build-variant"
       >
         Build Variant:
          
         <a
-          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
           data-cy="build-variant-link"
           href="/version/spruce_ubuntu1604_e0ece5ad52ad01630bdf29f55b9382a26d6256b3_20_08_26_19_20_41/tasks?page=0&variant=%5Eubuntu1604%24"
         >
@@ -460,13 +460,13 @@ exports[`storybook Storyshots Pages/Task/Metadata With Dependencies 1`] = `
         </a>
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
         data-cy="task-metadata-project"
       >
         Project:
          
         <a
-          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
           data-cy="project-link"
           href="/project/spruce/patches"
         >
@@ -478,13 +478,13 @@ exports[`storybook Storyshots Pages/Task/Metadata With Dependencies 1`] = `
         </a>
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
       >
         Submitted by: 
         mohamed.khelif
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
       >
         Estimated time to start:
          
@@ -495,13 +495,13 @@ exports[`storybook Storyshots Pages/Task/Metadata With Dependencies 1`] = `
         </span>
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
         data-cy="task-metadata-base-commit-duration"
       >
         Base commit duration: 
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
       >
         Base commit:
          
@@ -511,19 +511,19 @@ exports[`storybook Storyshots Pages/Task/Metadata With Dependencies 1`] = `
           href="/task/spruce_ubuntu1604_e2e_test_e0ece5ad52ad01630bdf29f55b9382a26d6256b3_20_08_26_19_20_41"
         >
           <code
-            class="leafygreen-ui-y846ok"
+            class="leafygreen-ui-7u0nmx"
           >
             e0ece5a
           </code>
         </a>
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
       >
         Distro:
          
         <a
-          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
           data-cy="task-distro-link"
           href="/distros##ubuntu1604-small"
           target="_self"
@@ -536,19 +536,19 @@ exports[`storybook Storyshots Pages/Task/Metadata With Dependencies 1`] = `
         </a>
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
         data-cy="task-metadata-ami"
       >
         AMI: 
         ami-0c83bb0a9f48c15bf
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
       >
         Host:
          
         <a
-          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
           data-cy="task-host-link"
           href="/host/i-0e0e62799806e037d"
           target="_self"
@@ -561,10 +561,10 @@ exports[`storybook Storyshots Pages/Task/Metadata With Dependencies 1`] = `
         </a>
       </p>
       <p
-        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1yli3c0"
+        class="css-1tu2ym0-Item-wordBreakCss e1ul56zb0 leafygreen-ui-1tb6tuo"
       >
         <a
-          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+          class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
           data-cy="task-spawn-host-link"
           href="/spawn/host?distroId=ubuntu1604-small&spawnHost=True&taskId=someTaskId"
         >
@@ -580,7 +580,7 @@ exports[`storybook Storyshots Pages/Task/Metadata With Dependencies 1`] = `
         data-cy="depends-on-container"
       >
         <p
-          class="css-1k03zl5-Title e1ul56zb1 leafygreen-ui-ki7nen"
+          class="css-1k03zl5-Title e1ul56zb1 leafygreen-ui-1miy0xp"
         >
           Depends On
         </p>
@@ -610,7 +610,7 @@ exports[`storybook Storyshots Pages/Task/Metadata With Dependencies 1`] = `
             class="css-19njn6m-RightContainer e1dgw5p62"
           >
             <a
-              class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+              class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
               data-cy="depends-on-link"
               href="/task/some_task_id_1"
             >
@@ -621,7 +621,7 @@ exports[`storybook Storyshots Pages/Task/Metadata With Dependencies 1`] = `
               </span>
             </a>
             <small
-              class="css-ojz0s8-Subtitle e1dgw5p61 leafygreen-ui-ppjyot"
+              class="css-ojz0s8-Subtitle e1dgw5p61 leafygreen-ui-6flbwy"
             >
               in 
               ubuntu1604
@@ -661,7 +661,7 @@ exports[`storybook Storyshots Pages/Task/Metadata With Dependencies 1`] = `
             class="css-19njn6m-RightContainer e1dgw5p62"
           >
             <a
-              class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+              class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
               data-cy="depends-on-link"
               href="/task/some_task_id_2"
             >
@@ -672,7 +672,7 @@ exports[`storybook Storyshots Pages/Task/Metadata With Dependencies 1`] = `
               </span>
             </a>
             <small
-              class="css-ojz0s8-Subtitle e1dgw5p61 leafygreen-ui-ppjyot"
+              class="css-ojz0s8-Subtitle e1dgw5p61 leafygreen-ui-6flbwy"
             >
               in 
               ubuntu1604
@@ -712,7 +712,7 @@ exports[`storybook Storyshots Pages/Task/Metadata With Dependencies 1`] = `
             class="css-19njn6m-RightContainer e1dgw5p62"
           >
             <a
-              class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+              class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
               data-cy="depends-on-link"
               href="/task/some_task_id_3"
             >
@@ -723,7 +723,7 @@ exports[`storybook Storyshots Pages/Task/Metadata With Dependencies 1`] = `
               </span>
             </a>
             <small
-              class="css-ojz0s8-Subtitle e1dgw5p61 leafygreen-ui-ppjyot"
+              class="css-ojz0s8-Subtitle e1dgw5p61 leafygreen-ui-6flbwy"
             >
               in 
               ubuntu1604
@@ -761,7 +761,7 @@ exports[`storybook Storyshots Pages/Task/Metadata With Dependencies 1`] = `
             class="css-19njn6m-RightContainer e1dgw5p62"
           >
             <a
-              class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+              class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
               data-cy="depends-on-link"
               href="/task/some_task_id_4"
             >
@@ -772,7 +772,7 @@ exports[`storybook Storyshots Pages/Task/Metadata With Dependencies 1`] = `
               </span>
             </a>
             <small
-              class="css-ojz0s8-Subtitle e1dgw5p61 leafygreen-ui-ppjyot"
+              class="css-ojz0s8-Subtitle e1dgw5p61 leafygreen-ui-6flbwy"
             >
               in 
               ubuntu1604
diff --git a/src/pages/task/metadata/index.tsx b/src/pages/task/metadata/index.tsx
index 73a0d455df..e27b105589 100644
--- a/src/pages/task/metadata/index.tsx
+++ b/src/pages/task/metadata/index.tsx
@@ -2,6 +2,7 @@ import { ApolloError } from "@apollo/client";
 import styled from "@emotion/styled";
 import { palette } from "@leafygreen-ui/palette";
 import { InlineCode } from "@leafygreen-ui/typography";
+import { Link } from "react-router-dom";
 import { useTaskAnalytics } from "analytics";
 import {
   MetadataCard,
@@ -183,11 +184,12 @@ export const Metadata: React.VFC<Props> = ({
         <MetadataItem>
           Base commit:{" "}
           <InlineCode
+            as={Link}
             data-cy="base-task-link"
-            href={getTaskRoute(baseTaskId)}
             onClick={() =>
               taskAnalytics.sendEvent({ name: "Click Base Commit" })
             }
+            to={getTaskRoute(baseTaskId)}
           >
             {baseCommit}
           </InlineCode>
diff --git a/src/pages/task/taskTabs/__snapshots__/ExecutionTasksTable.stories.storyshot b/src/pages/task/taskTabs/__snapshots__/ExecutionTasksTable.stories.storyshot
index 80d40194f0..07a7013580 100644
--- a/src/pages/task/taskTabs/__snapshots__/ExecutionTasksTable.stories.storyshot
+++ b/src/pages/task/taskTabs/__snapshots__/ExecutionTasksTable.stories.storyshot
@@ -103,7 +103,7 @@ exports[`storybook Storyshots Pages/Task/Table/Execution Tasks Table Multiple Ex
                         <span
                           class="ant-table-column-title"
                         >
-                          Patch Status
+                          Task Status
                         </span>
                         <span
                           class="ant-table-column-sorter ant-table-column-sorter-full"
@@ -284,7 +284,7 @@ exports[`storybook Storyshots Pages/Task/Table/Execution Tasks Table Multiple Ex
                       class="ant-table-cell cy-task-table-col-NAME"
                     >
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/task/some_id_5?execution=14"
                       >
                         <span
@@ -296,7 +296,7 @@ exports[`storybook Storyshots Pages/Task/Table/Execution Tasks Table Multiple Ex
                             Some fancy execution task
                           </span>
                           <p
-                            class="leafygreen-ui-1yli3c0"
+                            class="leafygreen-ui-1tb6tuo"
                           >
                             Execution 
                             15
@@ -325,7 +325,7 @@ exports[`storybook Storyshots Pages/Task/Table/Execution Tasks Table Multiple Ex
                       class="ant-table-cell cy-task-table-col-VARIANT"
                     >
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/variant-history/undefined/Windows"
                       >
                         <span
@@ -344,7 +344,7 @@ exports[`storybook Storyshots Pages/Task/Table/Execution Tasks Table Multiple Ex
                       class="ant-table-cell cy-task-table-col-NAME"
                     >
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/task/some_id_6?execution=12"
                       >
                         <span
@@ -356,7 +356,7 @@ exports[`storybook Storyshots Pages/Task/Table/Execution Tasks Table Multiple Ex
                             Another execution task
                           </span>
                           <p
-                            class="leafygreen-ui-1yli3c0"
+                            class="leafygreen-ui-1tb6tuo"
                           >
                             Execution 
                             13
@@ -385,7 +385,7 @@ exports[`storybook Storyshots Pages/Task/Table/Execution Tasks Table Multiple Ex
                       class="ant-table-cell cy-task-table-col-VARIANT"
                     >
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/variant-history/undefined/Windows"
                       >
                         <span
@@ -510,7 +510,7 @@ exports[`storybook Storyshots Pages/Task/Table/Execution Tasks Table Single Exec
                         <span
                           class="ant-table-column-title"
                         >
-                          Patch Status
+                          Task Status
                         </span>
                         <span
                           class="ant-table-column-sorter ant-table-column-sorter-full"
@@ -691,7 +691,7 @@ exports[`storybook Storyshots Pages/Task/Table/Execution Tasks Table Single Exec
                       class="ant-table-cell cy-task-table-col-NAME"
                     >
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/task/some_id_5?execution=5"
                       >
                         <span
@@ -726,7 +726,7 @@ exports[`storybook Storyshots Pages/Task/Table/Execution Tasks Table Single Exec
                       class="ant-table-cell cy-task-table-col-VARIANT"
                     >
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/variant-history/undefined/Windows"
                       >
                         <span
@@ -745,7 +745,7 @@ exports[`storybook Storyshots Pages/Task/Table/Execution Tasks Table Single Exec
                       class="ant-table-cell cy-task-table-col-NAME"
                     >
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/task/some_id_6?execution=5"
                       >
                         <span
@@ -780,7 +780,7 @@ exports[`storybook Storyshots Pages/Task/Table/Execution Tasks Table Single Exec
                       class="ant-table-cell cy-task-table-col-VARIANT"
                     >
                       <a
-                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                        class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                         href="/variant-history/undefined/Windows"
                       >
                         <span
diff --git a/src/pages/task/taskTabs/buildBaronAndAnnotations/AnnotationTicketsTable/__snapshots__/AnnotationTicketRow.stories.storyshot b/src/pages/task/taskTabs/buildBaronAndAnnotations/AnnotationTicketsTable/__snapshots__/AnnotationTicketRow.stories.storyshot
index 6de61cdb51..b2b87748d3 100644
--- a/src/pages/task/taskTabs/buildBaronAndAnnotations/AnnotationTicketsTable/__snapshots__/AnnotationTicketRow.stories.storyshot
+++ b/src/pages/task/taskTabs/buildBaronAndAnnotations/AnnotationTicketsTable/__snapshots__/AnnotationTicketRow.stories.storyshot
@@ -6,7 +6,7 @@ exports[`storybook Storyshots Pages/Task/BuildBaron/AnnotationTicketRow Default
     data-cy="annotation-ticket-row"
   >
     <a
-      class="lg-ui-0003 ekm0eth2 css-8qzidg-StyledLink-JiraSummaryLink leafygreen-ui-1cn1hqb"
+      class="lg-ui-0003 ekm0eth2 css-8qzidg-StyledLink-JiraSummaryLink leafygreen-ui-1320234"
       data-cy="EVG-123"
       href="https://www.google.com"
       target="_blank"
@@ -36,24 +36,24 @@ exports[`storybook Storyshots Pages/Task/BuildBaron/AnnotationTicketRow Default
       data-cy="EVG-123-metadata"
     >
       <small
-        class="leafygreen-ui-ppjyot"
+        class="leafygreen-ui-6flbwy"
       >
         Created: 
         Jan 2, 2020
       </small>
       <small
-        class="leafygreen-ui-ppjyot"
+        class="leafygreen-ui-6flbwy"
       >
         Updated: 
         Jan 2, 2020
       </small>
       <small
-        class="leafygreen-ui-ppjyot"
+        class="leafygreen-ui-6flbwy"
       >
         Assignee: mohamed.khelif
       </small>
       <small
-        class="leafygreen-ui-ppjyot"
+        class="leafygreen-ui-6flbwy"
       >
         Assigned Team: 
         evg-ui
diff --git a/src/pages/task/taskTabs/buildBaronAndAnnotations/BBComponents.tsx b/src/pages/task/taskTabs/buildBaronAndAnnotations/BBComponents.tsx
index 29b2b19af6..4e3b7095ec 100644
--- a/src/pages/task/taskTabs/buildBaronAndAnnotations/BBComponents.tsx
+++ b/src/pages/task/taskTabs/buildBaronAndAnnotations/BBComponents.tsx
@@ -60,7 +60,6 @@ export const JiraTicketRow: React.VFC<JiraTicketRowProps> = ({
   );
 };
 
-// @ts-expect-error
 export const TicketsTitle = styled(Subtitle)<TitleProps>`
   margin-bottom: ${(props) => (props.margin ? size.s : size.xxs)};
   margin-top: ${(props) => (props.margin ? size.m : size.l)};
diff --git a/src/pages/task/taskTabs/buildBaronAndAnnotations/CreatedTicketsTable/BBCreatedTickets.tsx b/src/pages/task/taskTabs/buildBaronAndAnnotations/CreatedTicketsTable/BBCreatedTickets.tsx
index 430d1ac743..f59fe83460 100644
--- a/src/pages/task/taskTabs/buildBaronAndAnnotations/CreatedTicketsTable/BBCreatedTickets.tsx
+++ b/src/pages/task/taskTabs/buildBaronAndAnnotations/CreatedTicketsTable/BBCreatedTickets.tsx
@@ -19,7 +19,6 @@ const BBCreatedTickets: React.VFC<CreatedTicketsProps> = ({
   <>
     {buildBaronConfigured && (
       <NonTableWrapper>
-        {/* @ts-expect-error */}
         <TicketsTitle>Create a New Ticket</TicketsTitle>
         <FileTicketButton taskId={taskId} execution={execution} />
       </NonTableWrapper>
@@ -27,7 +26,6 @@ const BBCreatedTickets: React.VFC<CreatedTicketsProps> = ({
     {tickets?.length > 0 && (
       <>
         <NonTableWrapper>
-          {/* @ts-expect-error */}
           <TicketsTitle>Tickets Created From This Task </TicketsTitle>
         </NonTableWrapper>{" "}
         <BuildBaronTable jiraIssues={tickets} />
diff --git a/src/pages/task/taskTabs/buildBaronAndAnnotations/CreatedTicketsTable/CustomCreatedTickets.tsx b/src/pages/task/taskTabs/buildBaronAndAnnotations/CreatedTicketsTable/CustomCreatedTickets.tsx
index 93a5c69c44..f76070a856 100644
--- a/src/pages/task/taskTabs/buildBaronAndAnnotations/CreatedTicketsTable/CustomCreatedTickets.tsx
+++ b/src/pages/task/taskTabs/buildBaronAndAnnotations/CreatedTicketsTable/CustomCreatedTickets.tsx
@@ -16,14 +16,12 @@ const CustomCreatedTickets: React.VFC<CustomCreatedTicketProps> = ({
 }) => (
   <>
     <NonTableWrapper>
-      {/* @ts-expect-error */}
       <TicketsTitle>Create a New Ticket</TicketsTitle>
       <FileTicketButton taskId={taskId} execution={execution} />
     </NonTableWrapper>
     {tickets?.length > 0 && (
       <>
         <NonTableWrapper>
-          {/* @ts-expect-error */}
           <TicketsTitle>Tickets Created From This Task</TicketsTitle>
         </NonTableWrapper>
         <CustomCreatedTicketsTable tickets={tickets} />
diff --git a/src/pages/task/taskTabs/buildBaronAndAnnotations/Issues/AnnotationTickets.tsx b/src/pages/task/taskTabs/buildBaronAndAnnotations/Issues/AnnotationTickets.tsx
index 7cc6f3f6eb..50559350e3 100644
--- a/src/pages/task/taskTabs/buildBaronAndAnnotations/Issues/AnnotationTickets.tsx
+++ b/src/pages/task/taskTabs/buildBaronAndAnnotations/Issues/AnnotationTickets.tsx
@@ -46,7 +46,6 @@ const AnnotationTickets: React.VFC<AnnotationTicketsProps> = ({
   return (
     <>
       <NonTableWrapper>
-        {/* @ts-expect-error */}
         <TicketsTitle>{title}</TicketsTitle>
         <Tooltip
           trigger={
diff --git a/src/pages/task/taskTabs/buildBaronAndAnnotations/JiraIssueTable/index.tsx b/src/pages/task/taskTabs/buildBaronAndAnnotations/JiraIssueTable/index.tsx
index 73f2bf0e01..4e02b662a8 100644
--- a/src/pages/task/taskTabs/buildBaronAndAnnotations/JiraIssueTable/index.tsx
+++ b/src/pages/task/taskTabs/buildBaronAndAnnotations/JiraIssueTable/index.tsx
@@ -18,7 +18,6 @@ const JiraIssueTable: React.VFC<JiraIssueTableProps> = ({ bbData }) => {
   return (
     <>
       <NonTableWrapper>
-        {/* @ts-expect-error */}
         <TicketsTitle>
           Related tickets from Jira
           <StyledLink data-cy="jira-search-link" href={jiraSearchLink}>
diff --git a/src/pages/taskQueue/index.tsx b/src/pages/taskQueue/index.tsx
index 2d1e1e3613..cca77c81fa 100644
--- a/src/pages/taskQueue/index.tsx
+++ b/src/pages/taskQueue/index.tsx
@@ -61,7 +61,6 @@ const TaskQueue = () => {
 
   return (
     <PageWrapper>
-      {/* @ts-expect-error  */}
       <StyledH2>Task Queue</StyledH2>
 
       {selectedDistro === null ? (
@@ -103,7 +102,6 @@ const TaskQueue = () => {
             /* Only show name & link if distro exists. */
             selectedDistro && (
               <TableHeader>
-                {/* @ts-expect-error  */}
                 <StyledH3> {selectedDistro.id} </StyledH3>
                 <StyledRouterLink
                   to={getAllHostsRoute({ distroId: selectedDistro.id })}
@@ -141,11 +139,9 @@ const TableHeader = styled.div`
   align-items: flex-end;
   margin: ${size.m} 0 ${size.s} 0;
 `;
-/* @ts-expect-error  */
 const StyledH2 = styled(H2)`
   margin-bottom: ${size.xs};
 `;
-/* @ts-expect-error  */
 const StyledH3 = styled(H3)`
   margin-right: ${size.s};
 `;
diff --git a/src/pages/version/Metadata.tsx b/src/pages/version/Metadata.tsx
index 0e2e1063b8..0846297efd 100644
--- a/src/pages/version/Metadata.tsx
+++ b/src/pages/version/Metadata.tsx
@@ -1,4 +1,5 @@
 import { InlineCode } from "@leafygreen-ui/typography";
+import { Link } from "react-router-dom";
 import { useVersionAnalytics } from "analytics";
 import {
   MetadataCard,
@@ -61,7 +62,7 @@ export const Metadata: React.VFC<Props> = ({ loading, version }) => {
   } = upstreamProject || {};
 
   const { repo, owner } = projectMetadata || {};
-  const { url, displayName } = externalLinksForMetadata[0] || {};
+  const { url, displayName } = externalLinksForMetadata?.[0] || {};
   return (
     <MetadataCard loading={loading} error={null}>
       <MetadataTitle>
@@ -118,9 +119,10 @@ export const Metadata: React.VFC<Props> = ({ loading, version }) => {
         <MetadataItem>
           Base commit:{" "}
           <InlineCode
+            as={Link}
             data-cy="patch-base-commit"
-            href={getVersionRoute(baseVersion?.id)}
             onClick={() => sendEvent({ name: "Click Base Commit Link" })}
+            to={getVersionRoute(baseVersion?.id)}
           >
             {shortenGithash(revision)}
           </InlineCode>
@@ -129,9 +131,10 @@ export const Metadata: React.VFC<Props> = ({ loading, version }) => {
         <MetadataItem>
           Previous commit:{" "}
           <InlineCode
+            as={Link}
             data-cy="version-previous-commit"
-            href={getVersionRoute(previousVersion?.id)}
             onClick={() => sendEvent({ name: "Click Previous Version Link" })}
+            to={getVersionRoute(previousVersion?.id)}
           >
             {shortenGithash(previousVersion?.revision)}
           </InlineCode>
diff --git a/src/pages/version/NameChangeModal/getFormSchema.ts b/src/pages/version/NameChangeModal/getFormSchema.ts
new file mode 100644
index 0000000000..85e371ee71
--- /dev/null
+++ b/src/pages/version/NameChangeModal/getFormSchema.ts
@@ -0,0 +1,27 @@
+import { SpruceFormProps } from "components/SpruceForm/types";
+
+export const getFormSchema = (
+  name: string
+): {
+  schema: SpruceFormProps["schema"];
+  uiSchema: SpruceFormProps["uiSchema"];
+} => ({
+  schema: {
+    type: "object" as "object",
+    properties: {
+      newPatchName: {
+        title: "New Patch Name",
+        type: "string" as "string",
+        default: name,
+        maxLength: 300,
+        minLength: 1,
+      },
+    },
+  },
+  uiSchema: {
+    newPatchName: {
+      "ui:widget": "textarea",
+      "ui:focusOnMount": true,
+    },
+  },
+});
diff --git a/src/pages/version/NameChangeModal/index.tsx b/src/pages/version/NameChangeModal/index.tsx
new file mode 100644
index 0000000000..39d307b498
--- /dev/null
+++ b/src/pages/version/NameChangeModal/index.tsx
@@ -0,0 +1,86 @@
+import { useState } from "react";
+import { useMutation } from "@apollo/client";
+import styled from "@emotion/styled";
+import IconButton from "@leafygreen-ui/icon-button";
+import { ConfirmationModal } from "components/ConfirmationModal";
+import Icon from "components/Icon";
+import { SpruceForm } from "components/SpruceForm";
+import { size } from "constants/tokens";
+import { useToastContext } from "context/toast";
+import {
+  UpdatePatchDescriptionMutation,
+  UpdatePatchDescriptionMutationVariables,
+} from "gql/generated/types";
+import { UPDATE_PATCH_DESCRIPTION } from "gql/mutations";
+import { getFormSchema } from "./getFormSchema";
+
+interface NameChangeModalProps {
+  originalPatchName: string;
+  patchId: string;
+}
+export const NameChangeModal: React.VFC<NameChangeModalProps> = ({
+  originalPatchName,
+  patchId,
+}) => {
+  const [formState, setFormState] = useState<{ newPatchName?: string }>({});
+  const [hasFormError, setHasFormError] = useState(false);
+  const [isOpen, setIsOpen] = useState(false);
+  const { schema, uiSchema } = getFormSchema(originalPatchName);
+  const dispatchToast = useToastContext();
+  const [updateDescription, { loading }] = useMutation<
+    UpdatePatchDescriptionMutation,
+    UpdatePatchDescriptionMutationVariables
+  >(UPDATE_PATCH_DESCRIPTION, {
+    onCompleted() {
+      setIsOpen(false);
+      dispatchToast.success("Patch name was successfully updated.");
+    },
+    onError({ message }) {
+      dispatchToast.error(`Error updating patch name: ${message}.`);
+    },
+    refetchQueries: ["Version"],
+  });
+
+  const { newPatchName } = formState;
+
+  return (
+    <>
+      <StyledIconButton
+        onClick={() => setIsOpen(true)}
+        data-cy="name-change-modal-trigger"
+        aria-label="name-change-modal-trigger"
+      >
+        <Icon glyph="Edit" />
+      </StyledIconButton>
+      <ConfirmationModal
+        buttonText="Confirm"
+        onCancel={() => setIsOpen(false)}
+        onConfirm={() => {
+          updateDescription({
+            variables: { patchId, description: newPatchName },
+          });
+        }}
+        open={isOpen}
+        title="Update Patch Name"
+        submitDisabled={
+          newPatchName === originalPatchName || hasFormError || loading
+        }
+      >
+        <SpruceForm
+          schema={schema}
+          uiSchema={uiSchema}
+          formData={formState}
+          onChange={({ formData, errors }) => {
+            setHasFormError(!!errors.length);
+            setFormState(formData);
+          }}
+        />
+      </ConfirmationModal>
+    </>
+  );
+};
+
+const StyledIconButton = styled(IconButton)`
+  vertical-align: top;
+  margin-left: ${size.xxs};
+`;
diff --git a/src/pages/version/downstreamTasks/DownstreamProjectAccordion.tsx b/src/pages/version/downstreamTasks/DownstreamProjectAccordion.tsx
index 37a7b91c5b..8fa3bba88b 100644
--- a/src/pages/version/downstreamTasks/DownstreamProjectAccordion.tsx
+++ b/src/pages/version/downstreamTasks/DownstreamProjectAccordion.tsx
@@ -4,7 +4,7 @@ import styled from "@emotion/styled";
 import { InlineCode } from "@leafygreen-ui/typography";
 import { Skeleton } from "antd";
 import { TableProps } from "antd/es/table";
-import { useParams } from "react-router-dom";
+import { Link, useParams } from "react-router-dom";
 import { useVersionAnalytics } from "analytics";
 import { Accordion } from "components/Accordion";
 import { PatchStatusBadge } from "components/PatchStatusBadge";
@@ -240,8 +240,9 @@ const DownstreamMetadata: React.VFC<DownstreamMetadataProps> = ({
     <PaddedText>
       Base commit:{" "}
       <InlineCode
+        as={Link}
         data-cy="downstream-base-commit"
-        href={getVersionRoute(baseVersionID)}
+        to={getVersionRoute(baseVersionID)}
       >
         {shortenGithash(githash)}
       </InlineCode>
diff --git a/src/pages/version/taskDuration/__snapshots__/TaskDurationTable.stories.storyshot b/src/pages/version/taskDuration/__snapshots__/TaskDurationTable.stories.storyshot
index 3ff202b4fa..a958c45713 100644
--- a/src/pages/version/taskDuration/__snapshots__/TaskDurationTable.stories.storyshot
+++ b/src/pages/version/taskDuration/__snapshots__/TaskDurationTable.stories.storyshot
@@ -266,7 +266,7 @@ exports[`storybook Storyshots Pages/Task/Table/Task Duration Table Default 1`] =
                     class="leafygreen-ui-1auv844"
                   >
                     <a
-                      class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                      class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                       href="/task/evg_ubuntu1604_container_test_rest_data_fd73e06c7bc6c5dcdf7a671dece0153916e64212_23_01_04_16_01_18"
                     >
                       <span
@@ -331,7 +331,7 @@ exports[`storybook Storyshots Pages/Task/Table/Task Duration Table Default 1`] =
                       width="100%"
                     />
                     <p
-                      class="css-1whedkk-DurationLabel e1gfyhbu0 leafygreen-ui-10bthx5"
+                      class="css-1whedkk-DurationLabel e1gfyhbu0 leafygreen-ui-110o31d"
                     >
                       1h 20m
                     </p>
@@ -355,7 +355,7 @@ exports[`storybook Storyshots Pages/Task/Table/Task Duration Table Default 1`] =
                     class="leafygreen-ui-1auv844"
                   >
                     <a
-                      class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                      class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                       href="/task/evg_ubuntu1604_container_test_model_distro_fd73e06c7bc6c5dcdf7a671dece0153916e64212_23_01_04_16_01_18"
                     >
                       <span
@@ -420,7 +420,7 @@ exports[`storybook Storyshots Pages/Task/Table/Task Duration Table Default 1`] =
                       width="99.99987604722023%"
                     />
                     <p
-                      class="css-1whedkk-DurationLabel e1gfyhbu0 leafygreen-ui-10bthx5"
+                      class="css-1whedkk-DurationLabel e1gfyhbu0 leafygreen-ui-110o31d"
                     >
                       1h 20m
                     </p>
@@ -444,7 +444,7 @@ exports[`storybook Storyshots Pages/Task/Table/Task Duration Table Default 1`] =
                     class="leafygreen-ui-1auv844"
                   >
                     <a
-                      class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                      class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                       href="/task/evg_ubuntu1604_container_test_agent_internal_fd73e06c7bc6c5dcdf7a671dece0153916e64212_23_01_04_16_01_18"
                     >
                       <span
@@ -509,7 +509,7 @@ exports[`storybook Storyshots Pages/Task/Table/Task Duration Table Default 1`] =
                       width="99.999442212491%"
                     />
                     <p
-                      class="css-1whedkk-DurationLabel e1gfyhbu0 leafygreen-ui-10bthx5"
+                      class="css-1whedkk-DurationLabel e1gfyhbu0 leafygreen-ui-110o31d"
                     >
                       1h 20m
                     </p>
@@ -533,7 +533,7 @@ exports[`storybook Storyshots Pages/Task/Table/Task Duration Table Default 1`] =
                     class="leafygreen-ui-1auv844"
                   >
                     <a
-                      class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                      class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                       href="/task/evg_ubuntu1604_container_test_evergreen_fd73e06c7bc6c5dcdf7a671dece0153916e64212_23_01_04_16_01_18"
                     >
                       <span
@@ -598,7 +598,7 @@ exports[`storybook Storyshots Pages/Task/Table/Task Duration Table Default 1`] =
                       width="99.9991529893382%"
                     />
                     <p
-                      class="css-1whedkk-DurationLabel e1gfyhbu0 leafygreen-ui-10bthx5"
+                      class="css-1whedkk-DurationLabel e1gfyhbu0 leafygreen-ui-110o31d"
                     >
                       1h 20m
                     </p>
@@ -622,7 +622,7 @@ exports[`storybook Storyshots Pages/Task/Table/Task Duration Table Default 1`] =
                     class="leafygreen-ui-1auv844"
                   >
                     <a
-                      class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                      class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                       href="/task/evg_ubuntu1604_container_test_model_artifact_fd73e06c7bc6c5dcdf7a671dece0153916e64212_23_01_04_16_01_18"
                     >
                       <span
@@ -687,7 +687,7 @@ exports[`storybook Storyshots Pages/Task/Table/Task Duration Table Default 1`] =
                       width="99.9968185453191%"
                     />
                     <p
-                      class="css-1whedkk-DurationLabel e1gfyhbu0 leafygreen-ui-10bthx5"
+                      class="css-1whedkk-DurationLabel e1gfyhbu0 leafygreen-ui-110o31d"
                     >
                       1h 20m
                     </p>
@@ -711,7 +711,7 @@ exports[`storybook Storyshots Pages/Task/Table/Task Duration Table Default 1`] =
                     class="leafygreen-ui-1auv844"
                   >
                     <a
-                      class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                      class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                       href="/task/evg_ubuntu1604_container_test_thirdparty_fd73e06c7bc6c5dcdf7a671dece0153916e64212_23_01_04_16_01_18"
                     >
                       <span
@@ -776,7 +776,7 @@ exports[`storybook Storyshots Pages/Task/Table/Task Duration Table Default 1`] =
                       width="99.99632273419999%"
                     />
                     <p
-                      class="css-1whedkk-DurationLabel e1gfyhbu0 leafygreen-ui-10bthx5"
+                      class="css-1whedkk-DurationLabel e1gfyhbu0 leafygreen-ui-110o31d"
                     >
                       1h 20m
                     </p>
@@ -800,7 +800,7 @@ exports[`storybook Storyshots Pages/Task/Table/Task Duration Table Default 1`] =
                     class="leafygreen-ui-1auv844"
                   >
                     <a
-                      class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                      class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                       href="/task/evg_ubuntu1604_container_test_model_event_fd73e06c7bc6c5dcdf7a671dece0153916e64212_23_01_04_16_01_18"
                     >
                       <span
@@ -865,7 +865,7 @@ exports[`storybook Storyshots Pages/Task/Table/Task Duration Table Default 1`] =
                       width="99.99574428789438%"
                     />
                     <p
-                      class="css-1whedkk-DurationLabel e1gfyhbu0 leafygreen-ui-10bthx5"
+                      class="css-1whedkk-DurationLabel e1gfyhbu0 leafygreen-ui-110o31d"
                     >
                       1h 20m
                     </p>
@@ -889,7 +889,7 @@ exports[`storybook Storyshots Pages/Task/Table/Task Duration Table Default 1`] =
                     class="leafygreen-ui-1auv844"
                   >
                     <a
-                      class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                      class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                       href="/task/evg_ubuntu1604_container_test_model_testresult_fd73e06c7bc6c5dcdf7a671dece0153916e64212_23_01_04_16_01_18"
                     >
                       <span
@@ -954,7 +954,7 @@ exports[`storybook Storyshots Pages/Task/Table/Task Duration Table Default 1`] =
                       width="99.99516584158876%"
                     />
                     <p
-                      class="css-1whedkk-DurationLabel e1gfyhbu0 leafygreen-ui-10bthx5"
+                      class="css-1whedkk-DurationLabel e1gfyhbu0 leafygreen-ui-110o31d"
                     >
                       1h 20m
                     </p>
@@ -978,7 +978,7 @@ exports[`storybook Storyshots Pages/Task/Table/Task Duration Table Default 1`] =
                     class="leafygreen-ui-1auv844"
                   >
                     <a
-                      class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                      class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                       href="/task/evg_ubuntu1604_container_test_model_alertrecord_fd73e06c7bc6c5dcdf7a671dece0153916e64212_23_01_04_16_01_18"
                     >
                       <span
@@ -1043,7 +1043,7 @@ exports[`storybook Storyshots Pages/Task/Table/Task Duration Table Default 1`] =
                       width="99.9948353008427%"
                     />
                     <p
-                      class="css-1whedkk-DurationLabel e1gfyhbu0 leafygreen-ui-10bthx5"
+                      class="css-1whedkk-DurationLabel e1gfyhbu0 leafygreen-ui-110o31d"
                     >
                       1h 20m
                     </p>
@@ -1067,7 +1067,7 @@ exports[`storybook Storyshots Pages/Task/Table/Task Duration Table Default 1`] =
                     class="leafygreen-ui-1auv844"
                   >
                     <a
-                      class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1cn1hqb"
+                      class="lg-ui-0003 css-84rhzu-StyledLink leafygreen-ui-1320234"
                       href="/task/evg_ubuntu1604_container_test_model_patch_fd73e06c7bc6c5dcdf7a671dece0153916e64212_23_01_04_16_01_18"
                     >
                       <span
@@ -1132,7 +1132,7 @@ exports[`storybook Storyshots Pages/Task/Table/Task Duration Table Default 1`] =
                       width="99.99429817213034%"
                     />
                     <p
-                      class="css-1whedkk-DurationLabel e1gfyhbu0 leafygreen-ui-10bthx5"
+                      class="css-1whedkk-DurationLabel e1gfyhbu0 leafygreen-ui-110o31d"
                     >
                       1h 20m
                     </p>
diff --git a/src/test_utils/hooks.ts b/src/test_utils/hooks.ts
new file mode 100644
index 0000000000..26baf7d417
--- /dev/null
+++ b/src/test_utils/hooks.ts
@@ -0,0 +1,68 @@
+import { DependencyList, EffectCallback, useEffect, useRef } from "react";
+
+/**
+ * `usePrevious` is a custom hook that returns the previous value of a given value
+ * @param value
+ * @param initialValue
+ * @returns - the previous value
+ */
+const usePrevious = <T>(value: T, initialValue: T) => {
+  const ref = useRef(initialValue);
+  useEffect(() => {
+    ref.current = value;
+  });
+  return ref.current;
+};
+
+/**
+ * `useEffectDebugger` is a custom hook that logs the changed dependencies of a useEffect hook
+ *
+ * @param effectHook - the effect hook
+ * @param dependencies - an array of dependencies
+ * @param dependencyNames - an array of strings that correspond to the dependencies
+ */
+const useEffectDebugger = (
+  effectHook: EffectCallback,
+  dependencies: DependencyList,
+  dependencyNames: string[] = []
+) => {
+  if (process.env.NODE_ENV !== "development") {
+    console.warn(
+      "[use-effect-debugger] This hook should only be used in development!"
+    );
+  }
+  if (dependencies.length !== dependencyNames.length) {
+    console.warn(
+      "[use-effect-debugger] The number of dependencies and dependency names should be the same!"
+    );
+  }
+  const previousDeps = usePrevious(dependencies, []);
+
+  const changedDeps = dependencies.reduce(
+    (accum: Record<string, { before: any; after: any }>, dependency, index) => {
+      if (dependency !== previousDeps[index]) {
+        const keyName = dependencyNames[index] || index;
+        return {
+          ...accum,
+          [keyName]: {
+            before: previousDeps[index],
+            after: dependency,
+          },
+        };
+      }
+
+      return accum;
+    },
+    {} as Record<string, { before: any; after: any }>
+  );
+
+  if (Object.keys(changedDeps).length) {
+    console.log("[use-effect-debugger] ");
+    console.table(changedDeps);
+  }
+
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  useEffect(effectHook, dependencies);
+};
+
+export { useEffectDebugger };
diff --git a/src/types/leafygreen.ts b/src/types/leafygreen.ts
index 221b347a0f..dc2961c82b 100644
--- a/src/types/leafygreen.ts
+++ b/src/types/leafygreen.ts
@@ -2,7 +2,6 @@ import Banner from "@leafygreen-ui/banner";
 import Button from "@leafygreen-ui/button";
 import Card from "@leafygreen-ui/card";
 import { Tabs } from "@leafygreen-ui/tabs";
-import { H1, H2, H3, Overline, Subtitle } from "@leafygreen-ui/typography";
 
 export type BannerType = React.ComponentType<
   Omit<React.ComponentProps<typeof Banner>, "as">
@@ -16,26 +15,6 @@ export type CardType = React.ComponentType<
   Omit<React.ComponentProps<typeof Card>, "as">
 >;
 
-export type SubtitleType = React.ComponentType<
-  Omit<React.ComponentProps<typeof Subtitle>, "as">
->;
-
-export type OverlineType = React.ComponentType<
-  Omit<React.ComponentProps<typeof Overline>, "as">
->;
-
-export type H1Type = React.ComponentType<
-  Omit<React.ComponentProps<typeof H1>, "as">
->;
-
-export type H2Type = React.ComponentType<
-  Omit<React.ComponentProps<typeof H2>, "as">
->;
-
-export type H3Type = React.ComponentType<
-  Omit<React.ComponentProps<typeof H3>, "as">
->;
-
 export type TabsType = React.ComponentType<
   Omit<React.ComponentProps<typeof Tabs>, "as">
 >;
diff --git a/src/types/triggers.ts b/src/types/triggers.ts
index 7c2d8ec460..ad5396eb13 100644
--- a/src/types/triggers.ts
+++ b/src/types/triggers.ts
@@ -7,15 +7,6 @@ export enum ResourceType {
   Version = "VERSION",
 }
 
-export const resourceTypeToCopy = {
-  [ResourceType.Build]: "Build",
-  [ResourceType.CommitQueue]: "Commit Queue",
-  [ResourceType.Host]: "Host",
-  [ResourceType.Patch]: "Patch",
-  [ResourceType.Task]: "Task",
-  [ResourceType.Version]: "Version",
-};
-
 export enum ProjectTriggerLevel {
   TASK = "task",
   BUILD = "build",
@@ -39,26 +30,6 @@ export enum TriggerType {
   FIRST_FAILURE_VERSION_NAME = "first-failure-in-version-with-name",
 }
 
-export const triggerToCopy = {
-  [TriggerType.OUTCOME]: "Outcome",
-  [TriggerType.FAILURE]: "Failure",
-  [TriggerType.SUCCESS]: "Success",
-  [TriggerType.FAMILY_OUTCOME]: "Outcome",
-  [TriggerType.FAMILY_FAILURE]: "Failure",
-  [TriggerType.FAMILY_SUCCESS]: "Success",
-  [TriggerType.RUNTIME_CHANGE]: "Runtime changes by %",
-  [TriggerType.EXCEEDS_DURATION]: "Runtime exceeds duration",
-  [TriggerType.TASK_STARTED]: "Task started",
-  [TriggerType.TASK_FAILED_OR_BLOCKED]: "Task failed or blocked",
-  [TriggerType.REGRESSION]: "Regression",
-  [TriggerType.TEST_REGRESSION]: "Test regression",
-  [TriggerType.FIRST_FAILURE_BUILD]: "First failure",
-  [TriggerType.FIRST_FAILURE_BUILD]: "First failure in build",
-  [TriggerType.FIRST_FAILURE_VERSION]: "First failure in version",
-  [TriggerType.FIRST_FAILURE_VERSION_NAME]:
-    "First failure in version with name",
-};
-
 export enum TaskTriggers {
   TASK_STARTS = "task-starts",
   TASK_FINISHES = "task-finishes",
diff --git a/yarn.lock b/yarn.lock
index c2c7debb1b..c806ee40b3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -126,7 +126,7 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.7.tgz#61caffb60776e49a57ba61a88f02bedd8714f6bc"
   integrity sha512-KYMqFYTaenzMK4yUtf4EW9wc4N9ef80FsbMtkwool5zpwl4YrT1SdWYSTRcT94KO4hannogdS+LxY7L+arP3gA==
 
-"@babel/core@7.21.8", "@babel/core@^7.11.6", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.14.0", "@babel/core@^7.16.0", "@babel/core@^7.20.12", "@babel/core@^7.20.2", "@babel/core@^7.21.4", "@babel/core@^7.7.5", "@babel/core@~7.21.0":
+"@babel/core@^7.11.6", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.14.0", "@babel/core@^7.16.0", "@babel/core@^7.20.12", "@babel/core@^7.20.2", "@babel/core@^7.21.4", "@babel/core@^7.7.5", "@babel/core@~7.21.0":
   version "7.21.8"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.8.tgz#2a8c7f0f53d60100ba4c32470ba0281c92aa9aa4"
   integrity sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ==
@@ -2281,12 +2281,12 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.12.5":
-  version "7.14.8"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.8.tgz#7119a56f421018852694290b9f9148097391b446"
-  integrity sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==
+"@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3":
+  version "7.22.3"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.3.tgz#0a7fce51d43adbf0f7b517a71f4c3aaca92ebcbb"
+  integrity sha512-XsDuspWKLUsxwCp6r7EhsExHtYfbe5oAGQ19kqngTdCPUoPQzOPdUbD/pB9PJiwb2ptYKQDjSJT3R6dC+EPqfQ==
   dependencies:
-    regenerator-runtime "^0.13.4"
+    regenerator-runtime "^0.13.11"
 
 "@babel/runtime@^7.13.10", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7":
   version "7.15.4"
@@ -2295,7 +2295,7 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.16.3", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.0", "@babel/runtime@^7.18.3":
+"@babel/runtime@^7.16.3", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.0":
   version "7.18.3"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.3.tgz#c7b654b57f6f63cf7f8b418ac9ca04408c4579f4"
   integrity sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==
@@ -2327,7 +2327,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.10.5", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.12", "@babel/types@^7.12.13", "@babel/types@^7.12.7", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.17.12", "@babel/types@^7.18.13", "@babel/types@^7.18.2", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.2.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.4", "@babel/types@^7.21.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@~7.21.2":
+"@babel/types@^7.0.0", "@babel/types@^7.10.5", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.12", "@babel/types@^7.12.13", "@babel/types@^7.12.7", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.17.12", "@babel/types@^7.18.13", "@babel/types@^7.18.2", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.2.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@~7.21.2":
   version "7.21.5"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.5.tgz#18dfbd47c39d3904d5db3d3dc2cc80bedb60e5b6"
   integrity sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==
@@ -2336,6 +2336,15 @@
     "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.21.4":
+  version "7.22.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.4.tgz#56a2653ae7e7591365dabf20b76295410684c071"
+  integrity sha512-Tx9x3UBHTTsMSW85WB2kphxYQVvrZ/t1FxD88IpSgIjiUJlCm9z+xWIDwyo1vffTwSqteqyznB8ZE9vYYk16zA==
+  dependencies:
+    "@babel/helper-string-parser" "^7.21.5"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    to-fast-properties "^2.0.0"
+
 "@base2/pretty-print-object@1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@base2/pretty-print-object/-/pretty-print-object-1.0.1.tgz#371ba8be66d556812dc7fb169ebc3c08378f69d4"
@@ -2346,17 +2355,17 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@bugsnag/browser@^7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@bugsnag/browser/-/browser-7.18.0.tgz#87debfbe8ce3685bd7b9053eed56551c96f5427d"
-  integrity sha512-lIdM6+mazFkkPwYSbfcBDFMLJ7++WoCuWnaVeaV3HcA7V9RHC+l5CmRSEyRatsiv2xfLPAIasTxAbCCc4WPgCg==
+"@bugsnag/browser@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@bugsnag/browser/-/browser-7.20.2.tgz#1db0c52fbe6b90217c4efd7ac79e16ccb7336b78"
+  integrity sha512-4J4s53ZpYr3hHA+QjxUjOI6U+A8+XuUVH45UshE87Jp2Y4mV8ML2DovejqJS8J8yjdbnh2z1Wtg/v3WUNt4ayQ==
   dependencies:
-    "@bugsnag/core" "^7.18.0"
+    "@bugsnag/core" "^7.19.0"
 
-"@bugsnag/core@^7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@bugsnag/core/-/core-7.18.0.tgz#67d43db24ff1da54d05a5a11931bd398e4986436"
-  integrity sha512-j5YVnbrQbs2WUFnhXERPm68XooUrdNrbJISsiK5+mnbWJrdGkIw8+p5sROV72fiuuQlLtV3jiEJHlSErZggLBw==
+"@bugsnag/core@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@bugsnag/core/-/core-7.19.0.tgz#7663a4addb1322e8315a4012dc9db2aad3fea53b"
+  integrity sha512-2KGwdaLD9PhR7Wk7xPi3jGuGsKTatc/28U4TOZIDU3CgC2QhGjubwiXSECel5gwxhZ3jACKcMKSV2ovHhv1NrA==
   dependencies:
     "@bugsnag/cuid" "^3.0.0"
     "@bugsnag/safe-json-stringify" "^6.0.0"
@@ -2369,20 +2378,20 @@
   resolved "https://registry.yarnpkg.com/@bugsnag/cuid/-/cuid-3.0.0.tgz#2ee7642a30aee6dc86f5e7f824653741e42e5c35"
   integrity sha512-LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg==
 
-"@bugsnag/js@7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@bugsnag/js/-/js-7.18.0.tgz#48261838a893a5e452f09ea75f27ad7ad964f199"
-  integrity sha512-engv7itP6E5VcqapikA/ZPgnnImxZLMRZMyu14dgld/RCjCm3XFLhGcscnN8jJkTmp366e5Xqo8Lq7y9aI6Yhw==
+"@bugsnag/js@7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@bugsnag/js/-/js-7.20.2.tgz#218ec77d1df8b70d9353d4f2f2ccd3e51a331786"
+  integrity sha512-Q08k0h0h6NFwFGkFmib39Uln2WpvJdqT1EGF1JlyYiGW03Y+VopVb9r37pZrRrN9IY08mxaIEO8la5xeaWAs6A==
   dependencies:
-    "@bugsnag/browser" "^7.18.0"
-    "@bugsnag/node" "^7.18.0"
+    "@bugsnag/browser" "^7.20.2"
+    "@bugsnag/node" "^7.19.0"
 
-"@bugsnag/node@^7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@bugsnag/node/-/node-7.18.0.tgz#54300bb5bbece9464c601a50d72e2380183ff981"
-  integrity sha512-jXFIJ3DF4AJZ16j5WsUF+Fe8zgtPdBOryRoqdNvTMWBHI6mVtTyn2clTPYjasocV9rdi9hC3cWxilLGlLacnaQ==
+"@bugsnag/node@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@bugsnag/node/-/node-7.19.0.tgz#6a8e5d0f5e73a1d0bad19537def1a7ff65e19787"
+  integrity sha512-c4snyxx5d/fsMogmgehFBGc//daH6+4XCplia4zrEQYltjaQ+l8ud0dPx623DgJl/2j1+2zlRc7y7IHSd7Gm5w==
   dependencies:
-    "@bugsnag/core" "^7.18.0"
+    "@bugsnag/core" "^7.19.0"
     byline "^5.0.0"
     error-stack-parser "^2.0.2"
     iserror "^0.0.2"
@@ -2417,13 +2426,6 @@
   resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
   integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
 
-"@cspotcode/source-map-support@^0.8.0":
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
-  integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
-  dependencies:
-    "@jridgewell/trace-mapping" "0.3.9"
-
 "@ctrl/tinycolor@^3.4.0":
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/@ctrl/tinycolor/-/tinycolor-3.4.1.tgz#75b4c27948c81e88ccd3a8902047bcd797f38d32"
@@ -2485,6 +2487,23 @@
   resolved "https://registry.yarnpkg.com/@emmetio/scanner/-/scanner-1.0.0.tgz#065b2af6233fe7474d44823e3deb89724af42b5f"
   integrity sha512-8HqW8EVqjnCmWXVpqAOZf+EGESdkR27odcMMMGefgKXtar00SoYNSryGv//TELI4T3QFsECo78p+0lmalk/CFA==
 
+"@emotion/babel-plugin@11.11.0", "@emotion/babel-plugin@^11.11.0":
+  version "11.11.0"
+  resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz#c2d872b6a7767a9d176d007f5b31f7d504bb5d6c"
+  integrity sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==
+  dependencies:
+    "@babel/helper-module-imports" "^7.16.7"
+    "@babel/runtime" "^7.18.3"
+    "@emotion/hash" "^0.9.1"
+    "@emotion/memoize" "^0.8.1"
+    "@emotion/serialize" "^1.1.2"
+    babel-plugin-macros "^3.1.0"
+    convert-source-map "^1.5.0"
+    escape-string-regexp "^4.0.0"
+    find-root "^1.1.0"
+    source-map "^0.5.7"
+    stylis "4.2.0"
+
 "@emotion/babel-plugin@^11.0.0":
   version "11.3.0"
   resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.3.0.tgz#3a16850ba04d8d9651f07f3fb674b3436a4fb9d7"
@@ -2503,24 +2522,6 @@
     source-map "^0.5.7"
     stylis "^4.0.3"
 
-"@emotion/babel-plugin@^11.1.2", "@emotion/babel-plugin@^11.10.0":
-  version "11.10.2"
-  resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.10.2.tgz#879db80ba622b3f6076917a1e6f648b1c7d008c7"
-  integrity sha512-xNQ57njWTFVfPAc3cjfuaPdsgLp5QOSuRsj9MA6ndEhH/AzuZM86qIQzt6rq+aGBwj3n5/TkLmU5lhAfdRmogA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/plugin-syntax-jsx" "^7.17.12"
-    "@babel/runtime" "^7.18.3"
-    "@emotion/hash" "^0.9.0"
-    "@emotion/memoize" "^0.8.0"
-    "@emotion/serialize" "^1.1.0"
-    babel-plugin-macros "^3.1.0"
-    convert-source-map "^1.5.0"
-    escape-string-regexp "^4.0.0"
-    find-root "^1.1.0"
-    source-map "^0.5.7"
-    stylis "4.0.13"
-
 "@emotion/cache@^11.1.3":
   version "11.4.0"
   resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.4.0.tgz#293fc9d9a7a38b9aad8e9337e5014366c3b09ac0"
@@ -2532,24 +2533,35 @@
     "@emotion/weak-memoize" "^0.2.5"
     stylis "^4.0.3"
 
-"@emotion/cache@^11.10.0":
-  version "11.10.3"
-  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.10.3.tgz#c4f67904fad10c945fea5165c3a5a0583c164b87"
-  integrity sha512-Psmp/7ovAa8appWh3g51goxu/z3iVms7JXOreq136D8Bbn6dYraPnmL6mdM8GThEx9vwSn92Fz+mGSjBzN8UPQ==
+"@emotion/cache@^11.11.0":
+  version "11.11.0"
+  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.11.0.tgz#809b33ee6b1cb1a625fef7a45bc568ccd9b8f3ff"
+  integrity sha512-P34z9ssTCBi3e9EI1ZsWpNHcfY1r09ZO0rZbRO2ob3ZQMnFI35jB536qoXbkdesr5EUhYi22anuEJuyxifaqAQ==
   dependencies:
-    "@emotion/memoize" "^0.8.0"
-    "@emotion/sheet" "^1.2.0"
-    "@emotion/utils" "^1.2.0"
-    "@emotion/weak-memoize" "^0.3.0"
-    stylis "4.0.13"
+    "@emotion/memoize" "^0.8.1"
+    "@emotion/sheet" "^1.2.2"
+    "@emotion/utils" "^1.2.1"
+    "@emotion/weak-memoize" "^0.3.1"
+    stylis "4.2.0"
 
-"@emotion/css-prettifier@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@emotion/css-prettifier/-/css-prettifier-1.1.0.tgz#1b5ac1588af9525e583f56fa898abb7edb3c7d9e"
-  integrity sha512-ALZCKBcpC9FeA0D6HLc4Et3bwY06fOG63CqLtWwk4W/u7+bWjorRxS9yikcJ2aTmlKur/ST9eWm5ohzBmWlTOQ==
+"@emotion/css-prettifier@^1.1.3":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@emotion/css-prettifier/-/css-prettifier-1.1.3.tgz#014ff59a87a3be5f2ce555b70f096af66b2dc845"
+  integrity sha512-KNv23+VQ+pcw3ebd1vSEl11CQ6SKAG5EQkrinjVGsfw3ZTWe6/tpWQrsvFLqCtU2LRiLPi04KgFCE4A9+crfpQ==
   dependencies:
-    "@emotion/memoize" "^0.8.0"
-    stylis "4.0.13"
+    "@emotion/memoize" "^0.8.1"
+    stylis "4.2.0"
+
+"@emotion/css@11.11.0":
+  version "11.11.0"
+  resolved "https://registry.yarnpkg.com/@emotion/css/-/css-11.11.0.tgz#dad6a27a77d5e5cbb0287674c3ace76d762563ca"
+  integrity sha512-m4g6nKzZyiKyJ3WOfdwrBdcujVcpaScIWHAnyNKPm/A/xJKwfXPfQAbEVi1kgexWTDakmg+r2aDj0KvnMTo4oQ==
+  dependencies:
+    "@emotion/babel-plugin" "^11.11.0"
+    "@emotion/cache" "^11.11.0"
+    "@emotion/serialize" "^1.1.2"
+    "@emotion/sheet" "^1.2.2"
+    "@emotion/utils" "^1.2.1"
 
 "@emotion/css@^11.1.3":
   version "11.1.3"
@@ -2562,71 +2574,61 @@
     "@emotion/sheet" "^1.0.0"
     "@emotion/utils" "^1.0.0"
 
-"@emotion/css@^11.9.0":
-  version "11.10.0"
-  resolved "https://registry.yarnpkg.com/@emotion/css/-/css-11.10.0.tgz#270b4fdf2419e59cb07081d0e9f7940d88b8b443"
-  integrity sha512-dH9f+kSCucc8ilMg0MUA1AemabcyzYpe5EKX24F528PJjD7HyIY/VBNJHxfUdc8l400h2ncAjR6yEDu+DBj2cg==
-  dependencies:
-    "@emotion/babel-plugin" "^11.10.0"
-    "@emotion/cache" "^11.10.0"
-    "@emotion/serialize" "^1.1.0"
-    "@emotion/sheet" "^1.2.0"
-    "@emotion/utils" "^1.2.0"
-
-"@emotion/eslint-plugin@11.0.0":
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/@emotion/eslint-plugin/-/eslint-plugin-11.0.0.tgz#7666b750df62dc33a93bb1e09086f1caaecadc6f"
-  integrity sha512-V5w/LgV61xta+U6LKht3WQqfjTLueU2mh1aRTcK5OfkRhZ4OZFE0Inq/oVwLCq5g3Hzoaq27PRm+Tk9W18QScw==
+"@emotion/eslint-plugin@11.11.0":
+  version "11.11.0"
+  resolved "https://registry.yarnpkg.com/@emotion/eslint-plugin/-/eslint-plugin-11.11.0.tgz#9f19ecf64ba67c4472576c4c82f6bd4df646be61"
+  integrity sha512-jCOYqU/0Sqm+g+6D7QuIlG99q8YAF0T7BP98zQF/MPZKfbcm46z5mizXn0YlhZ9AYZfNtZ1DeODXdncYxZzR4Q==
 
 "@emotion/hash@^0.8.0":
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
   integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
 
-"@emotion/hash@^0.9.0":
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.9.0.tgz#c5153d50401ee3c027a57a177bc269b16d889cb7"
-  integrity sha512-14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ==
+"@emotion/hash@^0.9.1":
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.9.1.tgz#4ffb0055f7ef676ebc3a5a91fb621393294e2f43"
+  integrity sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ==
 
-"@emotion/is-prop-valid@^1.0.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.2.0.tgz#7f2d35c97891669f7e276eb71c83376a5dc44c83"
-  integrity sha512-3aDpDprjM0AwaxGE09bOPkNxHpBd+kA6jty3RnaEXdweX1DF1U3VQpPYb0g1IStAuK7SVQ1cy+bNBBKp4W3Fjg==
+"@emotion/is-prop-valid@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.2.1.tgz#23116cf1ed18bfeac910ec6436561ecb1a3885cc"
+  integrity sha512-61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw==
   dependencies:
-    "@emotion/memoize" "^0.8.0"
+    "@emotion/memoize" "^0.8.1"
 
-"@emotion/jest@^11.9.1":
-  version "11.10.0"
-  resolved "https://registry.yarnpkg.com/@emotion/jest/-/jest-11.10.0.tgz#a39c16d0a5794254e0e4c5caf3f11278a64ae4a4"
-  integrity sha512-jeevEzauWrjDPWt9BGITjKzgLd31Q6kZ35gmH77f+LSaU/Ie1bFfxroum0nQNPEHS+kUxh6unv9DQIw+DEr5Ug==
+"@emotion/jest@11.11.0":
+  version "11.11.0"
+  resolved "https://registry.yarnpkg.com/@emotion/jest/-/jest-11.11.0.tgz#4d64b33052308739dcdd7396fd2bc902f7244f82"
+  integrity sha512-XZlnmdUZ32YjQnInsCFk/plKpkV/NXN1Ab4YoNvXN887MeR3Hr5ZsTyoblIW8AWwdfQiZHHphaPMb56lk6Ofdw==
   dependencies:
     "@babel/runtime" "^7.18.3"
-    "@emotion/css-prettifier" "^1.1.0"
+    "@emotion/css-prettifier" "^1.1.3"
     chalk "^4.1.0"
     specificity "^0.4.1"
-    stylis "4.0.13"
+    stylis "4.2.0"
 
 "@emotion/memoize@^0.7.4", "@emotion/memoize@^0.7.5":
   version "0.7.5"
   resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50"
   integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==
 
-"@emotion/memoize@^0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.8.0.tgz#f580f9beb67176fa57aae70b08ed510e1b18980f"
-  integrity sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA==
+"@emotion/memoize@^0.8.1":
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.8.1.tgz#c1ddb040429c6d21d38cc945fe75c818cfb68e17"
+  integrity sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==
 
-"@emotion/react@11.1.4":
-  version "11.1.4"
-  resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.1.4.tgz#ddee4247627ff7dd7d0c6ae52f1cfd6b420357d2"
-  integrity sha512-9gkhrW8UjV4IGRnEe4/aGPkUxoGS23aD9Vu6JCGfEDyBYL+nGkkRBoMFGAzCT9qFdyUvQp4UUtErbKWxq/JS4A==
+"@emotion/react@11.11.0":
+  version "11.11.0"
+  resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.11.0.tgz#408196b7ef8729d8ad08fc061b03b046d1460e02"
+  integrity sha512-ZSK3ZJsNkwfjT3JpDAWJZlrGD81Z3ytNDsxw1LKq1o+xkmO5pnWfr6gmCC8gHEFf3nSSX/09YrG67jybNPxSUw==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@emotion/cache" "^11.1.3"
-    "@emotion/serialize" "^1.0.0"
-    "@emotion/sheet" "^1.0.1"
-    "@emotion/utils" "^1.0.0"
-    "@emotion/weak-memoize" "^0.2.5"
+    "@babel/runtime" "^7.18.3"
+    "@emotion/babel-plugin" "^11.11.0"
+    "@emotion/cache" "^11.11.0"
+    "@emotion/serialize" "^1.1.2"
+    "@emotion/use-insertion-effect-with-fallbacks" "^1.0.1"
+    "@emotion/utils" "^1.2.1"
+    "@emotion/weak-memoize" "^0.3.1"
     hoist-non-react-statics "^3.3.1"
 
 "@emotion/serialize@^1.0.0", "@emotion/serialize@^1.0.2":
@@ -2640,15 +2642,15 @@
     "@emotion/utils" "^1.0.0"
     csstype "^3.0.2"
 
-"@emotion/serialize@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.1.0.tgz#b1f97b1011b09346a40e9796c37a3397b4ea8ea8"
-  integrity sha512-F1ZZZW51T/fx+wKbVlwsfchr5q97iW8brAnXmsskz4d0hVB4O3M/SiA3SaeH06x02lSNzkkQv+n3AX3kCXKSFA==
+"@emotion/serialize@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.1.2.tgz#017a6e4c9b8a803bd576ff3d52a0ea6fa5a62b51"
+  integrity sha512-zR6a/fkFP4EAcCMQtLOhIgpprZOwNmCldtpaISpvz348+DP4Mz8ZoKaGGCQpbzepNIUWbq4w6hNZkwDyKoS+HA==
   dependencies:
-    "@emotion/hash" "^0.9.0"
-    "@emotion/memoize" "^0.8.0"
-    "@emotion/unitless" "^0.8.0"
-    "@emotion/utils" "^1.2.0"
+    "@emotion/hash" "^0.9.1"
+    "@emotion/memoize" "^0.8.1"
+    "@emotion/unitless" "^0.8.1"
+    "@emotion/utils" "^1.2.1"
     csstype "^3.0.2"
 
 "@emotion/server@^11.4.0":
@@ -2666,56 +2668,62 @@
   resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.2.tgz#1d9ffde531714ba28e62dac6a996a8b1089719d0"
   integrity sha512-QQPB1B70JEVUHuNtzjHftMGv6eC3Y9wqavyarj4x4lg47RACkeSfNo5pxIOKizwS9AEFLohsqoaxGQj4p0vSIw==
 
-"@emotion/sheet@^1.0.1", "@emotion/sheet@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.2.0.tgz#771b1987855839e214fc1741bde43089397f7be5"
-  integrity sha512-OiTkRgpxescko+M51tZsMq7Puu/KP55wMT8BgpcXVG2hqXc0Vo0mfymJ/Uj24Hp0i083ji/o0aLddh08UEjq8w==
+"@emotion/sheet@^1.2.2":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.2.2.tgz#d58e788ee27267a14342303e1abb3d508b6d0fec"
+  integrity sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA==
 
-"@emotion/styled@11.0.0":
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-11.0.0.tgz#698196c2822746360a8644a73a5d842b2d1a78a5"
-  integrity sha512-498laccxJlBiJqrr2r/fx9q+Pr55D0URP2UyOkoSGLjevb8LLAFWueqthsQ5XijE66iGo7y3rzzEYdA7CHmZEQ==
+"@emotion/styled@11.11.0":
+  version "11.11.0"
+  resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-11.11.0.tgz#26b75e1b5a1b7a629d7c0a8b708fbf5a9cdce346"
+  integrity sha512-hM5Nnvu9P3midq5aaXj4I+lnSfNi7Pmd4EWk1fOZ3pxookaQTNew6bp4JaCBYM4HVFZF9g7UjJmsUmC2JlxOng==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@emotion/babel-plugin" "^11.0.0"
-    "@emotion/is-prop-valid" "^1.0.0"
-    "@emotion/serialize" "^1.0.0"
-    "@emotion/utils" "^1.0.0"
+    "@babel/runtime" "^7.18.3"
+    "@emotion/babel-plugin" "^11.11.0"
+    "@emotion/is-prop-valid" "^1.2.1"
+    "@emotion/serialize" "^1.1.2"
+    "@emotion/use-insertion-effect-with-fallbacks" "^1.0.1"
+    "@emotion/utils" "^1.2.1"
 
 "@emotion/unitless@^0.7.5":
   version "0.7.5"
   resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed"
   integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
 
-"@emotion/unitless@^0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.8.0.tgz#a4a36e9cbdc6903737cd20d38033241e1b8833db"
-  integrity sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw==
+"@emotion/unitless@^0.8.1":
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.8.1.tgz#182b5a4704ef8ad91bde93f7a860a88fd92c79a3"
+  integrity sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==
 
 "@emotion/use-insertion-effect-with-fallbacks@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.0.tgz#ffadaec35dbb7885bd54de3fa267ab2f860294df"
   integrity sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==
 
+"@emotion/use-insertion-effect-with-fallbacks@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz#08de79f54eb3406f9daaf77c76e35313da963963"
+  integrity sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==
+
 "@emotion/utils@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.0.0.tgz#abe06a83160b10570816c913990245813a2fd6af"
   integrity sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA==
 
-"@emotion/utils@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.2.0.tgz#9716eaccbc6b5ded2ea5a90d65562609aab0f561"
-  integrity sha512-sn3WH53Kzpw8oQ5mgMmIzzyAaH2ZqFEbozVVBSYp538E06OSE6ytOp7pRAjNQR+Q/orwqdQYJSe2m3hCOeznkw==
+"@emotion/utils@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.2.1.tgz#bbab58465738d31ae4cb3dbb6fc00a5991f755e4"
+  integrity sha512-Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg==
 
 "@emotion/weak-memoize@^0.2.5":
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
   integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==
 
-"@emotion/weak-memoize@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz#ea89004119dc42db2e1dba0f97d553f7372f6fcb"
-  integrity sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg==
+"@emotion/weak-memoize@^0.3.1":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz#d0fce5d07b0620caa282b5131c297bb60f9d87e6"
+  integrity sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==
 
 "@envelop/core@^2.0.0":
   version "2.3.1"
@@ -3000,10 +3008,10 @@
   resolved "https://registry.yarnpkg.com/@fal-works/esbuild-plugin-global-externals/-/esbuild-plugin-global-externals-2.1.2.tgz#c05ed35ad82df8e6ac616c68b92c2282bd083ba4"
   integrity sha512-cEee/Z+I12mZcFJshKcCqC8tuX5hG3s+d+9nZ3LabqKF1vKdF41B92pJVCBggjAGORAeOzyyDDKrZwIkLffeOQ==
 
-"@graphql-codegen/cli@3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/cli/-/cli-3.1.0.tgz#a650adbdc8f13074818c91161673f39c2ed8b57d"
-  integrity sha512-MUYyHkh/n8XVuONk7AYvJV/ObZDlPGwyevl8ch21jNFNj2M5PM39WViHKmIYwVw2n4fDmoh3BNdaeHQs1wb4HA==
+"@graphql-codegen/cli@3.2.2":
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/cli/-/cli-3.2.2.tgz#1a94bc1ff9cfb7d618859336017d523689ab7d15"
+  integrity sha512-u+dm/SW1heLnUL4Tyf5Uv0AxOFhTCmUPHKwRLq2yE8MPhv7+Ti4vxxUP/XGoaMNRuHlN37wLI7tpFLV1Hhm22Q==
   dependencies:
     "@babel/generator" "^7.18.13"
     "@babel/template" "^7.18.10"
@@ -3020,23 +3028,23 @@
     "@graphql-tools/prisma-loader" "^7.2.49"
     "@graphql-tools/url-loader" "^7.13.2"
     "@graphql-tools/utils" "^9.0.0"
+    "@parcel/watcher" "^2.1.0"
     "@whatwg-node/fetch" "^0.8.0"
     chalk "^4.1.0"
-    chokidar "^3.5.2"
     cosmiconfig "^7.0.0"
-    cosmiconfig-typescript-loader "^4.3.0"
     debounce "^1.2.0"
     detect-indent "^6.0.0"
-    graphql-config "^4.4.0"
+    graphql-config "^4.5.0"
     inquirer "^8.0.0"
     is-glob "^4.0.1"
+    jiti "^1.17.1"
     json-to-pretty-yaml "^1.2.2"
     listr2 "^4.0.5"
     log-symbols "^4.0.0"
+    micromatch "^4.0.5"
     shell-quote "^1.7.3"
     string-env-interpolation "^1.0.1"
     ts-log "^2.2.3"
-    ts-node "^10.9.1"
     tslib "^2.4.0"
     yaml "^1.10.0"
     yargs "^17.0.0"
@@ -3063,6 +3071,18 @@
     lodash "~4.17.0"
     tslib "~2.5.0"
 
+"@graphql-codegen/plugin-helpers@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-4.2.0.tgz#8324914d0f99162a223cfa01796cdd6be972d2ae"
+  integrity sha512-THFTCfg+46PXlXobYJ/OoCX6pzjI+9woQqCjdyKtgoI0tn3Xq2HUUCiidndxUpEYVrXb5pRiRXb7b/ZbMQqD0A==
+  dependencies:
+    "@graphql-tools/utils" "^9.0.0"
+    change-case-all "1.0.15"
+    common-tags "1.8.2"
+    import-from "4.0.0"
+    lodash "~4.17.0"
+    tslib "~2.5.0"
+
 "@graphql-codegen/schema-ast@^3.0.1":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@graphql-codegen/schema-ast/-/schema-ast-3.0.1.tgz#37b458bb57b95715a9eb4259341c856dae2a461d"
@@ -3072,32 +3092,43 @@
     "@graphql-tools/utils" "^9.0.0"
     tslib "~2.5.0"
 
-"@graphql-codegen/typescript-operations@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-operations/-/typescript-operations-3.0.1.tgz#a190622f15b13bdbf274d8619850e1b8eea5aba1"
-  integrity sha512-Td1d483cQr7XJj/zXrbqVUEi2QK56DT7EToFheZrBFArIQCUEGK+Xgw6GhEmZaTwWYODxavzy1jmTTJC2fEuTw==
+"@graphql-codegen/typescript-operations@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-operations/-/typescript-operations-3.0.2.tgz#41793f996b3f89f4fc348bce6ee509aefb2e4515"
+  integrity sha512-FYi5QcOsBZZvBKlzBQ+jpBCUxMo9g3fTYa2v1+rqooG6SiW/lQyk2CNL5tsYAt6TLmH3rws8rzSUil0DWNsflQ==
   dependencies:
     "@graphql-codegen/plugin-helpers" "^4.1.0"
-    "@graphql-codegen/typescript" "^3.0.1"
-    "@graphql-codegen/visitor-plugin-common" "3.0.1"
+    "@graphql-codegen/typescript" "^3.0.2"
+    "@graphql-codegen/visitor-plugin-common" "3.0.2"
     auto-bind "~4.0.0"
     tslib "~2.5.0"
 
-"@graphql-codegen/typescript@3.0.1", "@graphql-codegen/typescript@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript/-/typescript-3.0.1.tgz#e949a7d7e8325bea9cf938c30af2313043e91a09"
-  integrity sha512-HvozJg7eHqywmYvXa7+nmjw+v3+f8ilFv9VbRvmjhj/zBw3VKGT2n/85ZhVyuWjY2KrDLzl6BqeXttWsW5Wo4w==
+"@graphql-codegen/typescript@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript/-/typescript-3.0.2.tgz#6099c0632188ad9c6d41a5b66116ded0bf5c6076"
+  integrity sha512-qD6QkTB+2eJmIaZ6Tihv6HRz7daWWLz9uw5vwCmPeZN6XL2RINZGLkR7D8BQzLDlNGMrpQ4SeSM9o3ZALSCIuQ==
   dependencies:
     "@graphql-codegen/plugin-helpers" "^4.1.0"
     "@graphql-codegen/schema-ast" "^3.0.1"
-    "@graphql-codegen/visitor-plugin-common" "3.0.1"
+    "@graphql-codegen/visitor-plugin-common" "3.0.2"
     auto-bind "~4.0.0"
     tslib "~2.5.0"
 
-"@graphql-codegen/visitor-plugin-common@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-3.0.1.tgz#dbfc2ba55d8a1908e4bd7f751dbfe4241961f948"
-  integrity sha512-Qek+Ywy094Km7Vc1TzKBN9ICvtYwPdqZUliPO77urMSveP+2+G2O9Tjx546dW4A1O6rhEfexbenc2DqTAe7iLQ==
+"@graphql-codegen/typescript@^3.0.2":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript/-/typescript-3.0.4.tgz#e12dc106a2722ebc7d18556980ccf47fa9d0805f"
+  integrity sha512-x4O47447DZrWNtE/l5CU9QzzW4m1RbmCEdijlA3s2flG/y1Ckqdemob4CWfilSm5/tZ3w1junVDY616RDTSvZw==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^4.2.0"
+    "@graphql-codegen/schema-ast" "^3.0.1"
+    "@graphql-codegen/visitor-plugin-common" "3.1.1"
+    auto-bind "~4.0.0"
+    tslib "~2.5.0"
+
+"@graphql-codegen/visitor-plugin-common@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-3.0.2.tgz#784c0faaa7e0773072ea5de464fdcae8d7765564"
+  integrity sha512-dKblRFrB0Fdl3+nPlzlLBka+TN/EGwr/q09mwry0H58z3j6gXkMbsdPr+dc8MhgOV7w/8egRvSPIvd7m6eFCnw==
   dependencies:
     "@graphql-codegen/plugin-helpers" "^4.1.0"
     "@graphql-tools/optimize" "^1.3.0"
@@ -3110,6 +3141,22 @@
     parse-filepath "^1.0.2"
     tslib "~2.5.0"
 
+"@graphql-codegen/visitor-plugin-common@3.1.1":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-3.1.1.tgz#50c2aa3c537a805ce68d2f115d0a9811b151428c"
+  integrity sha512-uAfp+zu/009R3HUAuTK2AamR1bxIltM6rrYYI6EXSmkM3rFtFsLTuJhjUDj98HcUCszJZrADppz8KKLGRUVlNg==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^4.2.0"
+    "@graphql-tools/optimize" "^1.3.0"
+    "@graphql-tools/relay-operation-optimizer" "^6.5.0"
+    "@graphql-tools/utils" "^9.0.0"
+    auto-bind "~4.0.0"
+    change-case-all "1.0.15"
+    dependency-graph "^0.11.0"
+    graphql-tag "^2.11.0"
+    parse-filepath "^1.0.2"
+    tslib "~2.5.0"
+
 "@graphql-eslint/eslint-plugin@3.18.0":
   version "3.18.0"
   resolved "https://registry.yarnpkg.com/@graphql-eslint/eslint-plugin/-/eslint-plugin-3.18.0.tgz#071b5580d1d47ac0f25fd4296fea4105ddd8e401"
@@ -3868,14 +3915,6 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c"
   integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==
 
-"@jridgewell/trace-mapping@0.3.9":
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
-  integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
 "@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.17":
   version "0.3.17"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
@@ -4220,7 +4259,7 @@
     "@leafygreen-ui/palette" "^4.0.0"
     "@leafygreen-ui/tokens" "^2.0.1"
 
-"@leafygreen-ui/icon-button@^15.0.10":
+"@leafygreen-ui/icon-button@^15.0.10", "@leafygreen-ui/icon-button@^15.0.9":
   version "15.0.10"
   resolved "https://registry.yarnpkg.com/@leafygreen-ui/icon-button/-/icon-button-15.0.10.tgz#eda3ee2b799452d907c374806232dd7fd2bfc019"
   integrity sha512-GbMxbPLEIUVOSmzJkVJrpQAfvrKjTgjkM9TSkL06sJ0f7ghcIO6mOpoonML6BLFqOTFXuyUZ/3C0jQQDvO+Glw==
@@ -4403,6 +4442,21 @@
     "@leafygreen-ui/typography" "^16.4.0"
     lodash "^4.17.21"
 
+"@leafygreen-ui/pagination@1.0.7":
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/@leafygreen-ui/pagination/-/pagination-1.0.7.tgz#2edb56416b8affa1a6a794aff6d20309e053e063"
+  integrity sha512-3UPXd185AowfmoYPj2aen8CFVeDULCcwcKoP6XZ0zM5VO5wIaFEvXjpcnTvtV5SdAQRMvWqP3vggpg4f8kwVyw==
+  dependencies:
+    "@leafygreen-ui/emotion" "^4.0.4"
+    "@leafygreen-ui/hooks" "^7.7.3"
+    "@leafygreen-ui/icon" "^11.15.0"
+    "@leafygreen-ui/icon-button" "^15.0.9"
+    "@leafygreen-ui/lib" "^10.3.2"
+    "@leafygreen-ui/select" "^10.3.4"
+    "@leafygreen-ui/tokens" "^2.1.0"
+    "@leafygreen-ui/typography" "^16.4.0"
+    lodash "^4.17.21"
+
 "@leafygreen-ui/palette@3.4.4":
   version "3.4.4"
   resolved "https://registry.yarnpkg.com/@leafygreen-ui/palette/-/palette-3.4.4.tgz#d5a8fd85b4eaa27d8a61ffa70288f8f3451e5670"
@@ -4722,27 +4776,20 @@
     "@leafygreen-ui/palette" "^3.4.4"
     "@leafygreen-ui/tokens" "^1.4.0"
 
-"@leafygreen-ui/tokens@1.4.1", "@leafygreen-ui/tokens@^1.4.0", "@leafygreen-ui/tokens@^1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@leafygreen-ui/tokens/-/tokens-1.4.1.tgz#67e068d5fbc560acd463d78f6c64ddf95598d60f"
-  integrity sha512-ap9IdpQy+wg8IG9rJbWZB9F9zihhixClz68UFcwJMbDqcvxcqRPBvRpkbqiJdAPwOSrbYZfrHSGEtdJk9bzZAg==
-  dependencies:
-    "@leafygreen-ui/palette" "^3.4.5"
-
-"@leafygreen-ui/tokens@^2.0.0", "@leafygreen-ui/tokens@^2.0.1", "@leafygreen-ui/tokens@^2.0.2", "@leafygreen-ui/tokens@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@leafygreen-ui/tokens/-/tokens-2.0.3.tgz#1922456580c4ac65b4552488df6b3cdd55787706"
-  integrity sha512-gLRmjaT27MNkcL+NF6l4f/1fVCNhObjLY+sqb6dYKCtIYOTh8sXXEu5eHRng79hhYqAWHzo8rPYD1VJSAVia6Q==
-  dependencies:
-    "@leafygreen-ui/palette" "^4.0.4"
-
-"@leafygreen-ui/tokens@^2.1.0":
+"@leafygreen-ui/tokens@2.1.0", "@leafygreen-ui/tokens@^2.0.0", "@leafygreen-ui/tokens@^2.0.1", "@leafygreen-ui/tokens@^2.0.2", "@leafygreen-ui/tokens@^2.0.3", "@leafygreen-ui/tokens@^2.1.0":
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/@leafygreen-ui/tokens/-/tokens-2.1.0.tgz#9677750169876536447b2944c4caaca7c0a4fa4e"
   integrity sha512-sn+vveqrWYq0ubKuo5i1q8DS8IVIyApxyjwR0j4QoxW0w1ina9DOgK5KG1XIptw/i1kGQEMCw/5rOfqQWLv3Kw==
   dependencies:
     "@leafygreen-ui/palette" "^4.0.4"
 
+"@leafygreen-ui/tokens@^1.4.0", "@leafygreen-ui/tokens@^1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@leafygreen-ui/tokens/-/tokens-1.4.1.tgz#67e068d5fbc560acd463d78f6c64ddf95598d60f"
+  integrity sha512-ap9IdpQy+wg8IG9rJbWZB9F9zihhixClz68UFcwJMbDqcvxcqRPBvRpkbqiJdAPwOSrbYZfrHSGEtdJk9bzZAg==
+  dependencies:
+    "@leafygreen-ui/palette" "^3.4.5"
+
 "@leafygreen-ui/tooltip@9.1.6":
   version "9.1.6"
   resolved "https://registry.yarnpkg.com/@leafygreen-ui/tooltip/-/tooltip-9.1.6.tgz#0a750a3d043a0049b5c74bd317aa026073e7a377"
@@ -4807,7 +4854,19 @@
     lodash "^4.17.21"
     polished "^4.2.2"
 
-"@leafygreen-ui/typography@15.1.0", "@leafygreen-ui/typography@^15.0.0", "@leafygreen-ui/typography@^15.1.0":
+"@leafygreen-ui/typography@16.4.1":
+  version "16.4.1"
+  resolved "https://registry.yarnpkg.com/@leafygreen-ui/typography/-/typography-16.4.1.tgz#0f5f124dfb02c58b67f70b64f74503dc5813b16e"
+  integrity sha512-UKvuAiCPa5jv8QNZHZDfVqfCzEPodNX5tpOVFeSLzt5hs8IBTCsxXqxPgzzapRHR+5NzebpyNmZEou5ZKtpa0Q==
+  dependencies:
+    "@leafygreen-ui/emotion" "^4.0.4"
+    "@leafygreen-ui/icon" "^11.14.0"
+    "@leafygreen-ui/lib" "^10.3.3"
+    "@leafygreen-ui/palette" "^4.0.4"
+    "@leafygreen-ui/polymorphic" "^1.3.1"
+    "@leafygreen-ui/tokens" "^2.1.0"
+
+"@leafygreen-ui/typography@^15.0.0", "@leafygreen-ui/typography@^15.1.0":
   version "15.1.0"
   resolved "https://registry.yarnpkg.com/@leafygreen-ui/typography/-/typography-15.1.0.tgz#e0d99598de2141d938ddbe10a8bfb7328aae1ffd"
   integrity sha512-ajvxMdjZjlPpBIdM2eIjFGzFdH8Av42Y/dY7EsO0Cfbq+xxAcmzP5jhtGHwkgECIgkxuJW2B9tPUxu98AbN4Ow==
@@ -4893,6 +4952,16 @@
   dependencies:
     esbuild "^0.14.14"
 
+"@parcel/watcher@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.1.0.tgz#5f32969362db4893922c526a842d8af7a8538545"
+  integrity sha512-8s8yYjd19pDSsBpbkOHnT6Z2+UJSuLQx61pCFM0s5wSRvKCEMDjd/cHY3/GI1szHIWbpXpsJdg3V6ISGGx9xDw==
+  dependencies:
+    is-glob "^4.0.3"
+    micromatch "^4.0.5"
+    node-addon-api "^3.2.1"
+    node-gyp-build "^4.3.0"
+
 "@peculiar/asn1-schema@^2.1.6", "@peculiar/asn1-schema@^2.3.0":
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.3.3.tgz#21418e1f3819e0b353ceff0c2dad8ccb61acd777"
@@ -5852,26 +5921,6 @@
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
   integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
 
-"@tsconfig/node10@^1.0.7":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
-  integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==
-
-"@tsconfig/node12@^1.0.7":
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
-  integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
-
-"@tsconfig/node14@^1.0.0":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
-  integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
-
-"@tsconfig/node16@^1.0.2":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e"
-  integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==
-
 "@types/aria-query@^4.2.0":
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.1.tgz#78b5433344e2f92e8b306c06a5622c50c245bf6b"
@@ -6697,7 +6746,7 @@ acorn-walk@^7.2.0:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
   integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
 
-acorn-walk@^8.0.2, acorn-walk@^8.1.1:
+acorn-walk@^8.0.2:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
@@ -6712,7 +6761,7 @@ acorn@^8.1.0, acorn@^8.8.0, acorn@^8.8.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
   integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
 
-acorn@^8.4.1, acorn@^8.7.1:
+acorn@^8.7.1:
   version "8.7.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
   integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
@@ -6918,11 +6967,6 @@ are-we-there-yet@^2.0.0:
     delegates "^1.0.0"
     readable-stream "^3.6.0"
 
-arg@^4.1.0:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
-  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
-
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -7759,7 +7803,7 @@ check-more-types@^2.24.0:
   resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600"
   integrity sha1-FCD/sQ/URNz8ebQ4kbv//TKoRgA=
 
-chokidar@^3.5.1, chokidar@^3.5.2, chokidar@^3.5.3:
+chokidar@^3.5.1, chokidar@^3.5.3:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
   integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
@@ -8118,7 +8162,12 @@ content-type@~1.0.4:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
-convert-source-map@^1.5.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
+convert-source-map@^1.5.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
+  integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
+
+convert-source-map@^1.6.0, convert-source-map@^1.7.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
   integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
@@ -8194,11 +8243,6 @@ core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
-cosmiconfig-typescript-loader@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.3.0.tgz#c4259ce474c9df0f32274ed162c0447c951ef073"
-  integrity sha512-NTxV1MFfZDLPiBMjxbHRwSh5LaLcPMwNdCutmnHJCKoVnlvldPWlllonKwrsRJ5pYZBIBGRWWU2tfvzxgeSW5Q==
-
 cosmiconfig@8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.0.0.tgz#e9feae014eab580f858f8a0288f38997a7bebe97"
@@ -8221,9 +8265,9 @@ cosmiconfig@^6.0.0:
     yaml "^1.7.2"
 
 cosmiconfig@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3"
-  integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6"
+  integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==
   dependencies:
     "@types/parse-json" "^4.0.0"
     import-fresh "^3.2.1"
@@ -8231,11 +8275,6 @@ cosmiconfig@^7.0.0:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
-create-require@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
-  integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
-
 cross-fetch@^3.0.4:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.0.6.tgz#3a4040bc8941e653e0e9cf17f29ebcd177d3365c"
@@ -8320,9 +8359,9 @@ cssstyle@^2.3.0:
     cssom "~0.3.6"
 
 csstype@^3.0.2:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340"
-  integrity sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b"
+  integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==
 
 cypress@12.7.0:
   version "12.7.0"
@@ -8623,11 +8662,6 @@ diff-sequences@^29.4.3:
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.4.3.tgz#9314bc1fabe09267ffeca9cbafc457d8499a13f2"
   integrity sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==
 
-diff@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
-  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
-
 dir-glob@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
@@ -10320,6 +10354,23 @@ graphql-config@^4.4.0:
     string-env-interpolation "1.0.1"
     tslib "^2.4.0"
 
+graphql-config@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/graphql-config/-/graphql-config-4.5.0.tgz#257c2338950b8dce295a27f75c5f6c39f8f777b2"
+  integrity sha512-x6D0/cftpLUJ0Ch1e5sj1TZn6Wcxx4oMfmhaG9shM0DKajA9iR+j1z86GSTQ19fShbGvrSSvbIQsHku6aQ6BBw==
+  dependencies:
+    "@graphql-tools/graphql-file-loader" "^7.3.7"
+    "@graphql-tools/json-file-loader" "^7.3.7"
+    "@graphql-tools/load" "^7.5.5"
+    "@graphql-tools/merge" "^8.2.6"
+    "@graphql-tools/url-loader" "^7.9.7"
+    "@graphql-tools/utils" "^9.0.0"
+    cosmiconfig "8.0.0"
+    jiti "1.17.1"
+    minimatch "4.2.3"
+    string-env-interpolation "1.0.1"
+    tslib "^2.4.0"
+
 graphql-depth-limit@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/graphql-depth-limit/-/graphql-depth-limit-1.1.0.tgz#59fe6b2acea0ab30ee7344f4c75df39cc18244e8"
@@ -10788,7 +10839,7 @@ is-arguments@^1.0.4:
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
+  integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
 
 is-bigint@^1.0.1:
   version "1.0.4"
@@ -10834,7 +10885,14 @@ is-ci@^3.0.0:
   dependencies:
     ci-info "^3.2.0"
 
-is-core-module@^2.8.1, is-core-module@^2.9.0:
+is-core-module@^2.11.0, is-core-module@^2.9.0:
+  version "2.12.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd"
+  integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==
+  dependencies:
+    has "^1.0.3"
+
+is-core-module@^2.8.1:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
   integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==
@@ -11648,6 +11706,16 @@ jest@29.5.0:
     import-local "^3.0.2"
     jest-cli "^29.5.0"
 
+jiti@1.17.1:
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.17.1.tgz#264daa43ee89a03e8be28c3d712ccc4eb9f1e8ed"
+  integrity sha512-NZIITw8uZQFuzQimqjUxIrIcEdxYDFIe/0xYfIlVXTkiBjjyBEvgasj5bb0/cHtPRD/NziPbT312sFrkI5ALpw==
+
+jiti@^1.17.1:
+  version "1.18.2"
+  resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.18.2.tgz#80c3ef3d486ebf2450d9335122b32d121f2a83cd"
+  integrity sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==
+
 js-cookie@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.1.tgz#9e39b4c6c2f56563708d7d31f6f5f21873a92414"
@@ -11977,9 +12045,9 @@ lilconfig@2.0.5:
   integrity sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==
 
 lines-and-columns@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
-  integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
+  integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
 linkify-html@4.1.0:
   version "4.1.0"
@@ -12217,11 +12285,6 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   dependencies:
     semver "^6.0.0"
 
-make-error@^1.1.1:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
-  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
-
 makeerror@1.0.12:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
@@ -12379,6 +12442,13 @@ minimatch@4.2.1:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-4.2.3.tgz#b4dcece1d674dee104bb0fb833ebb85a78cbbca6"
+  integrity sha512-lIUdtK5hdofgCTu3aT0sOaHsYR37viUuIc0rwnnDXImbwFRcumyLMeZaM0t0I/fgxS6s6JMfu0rLD1Wz9pv1ng==
+  dependencies:
+    brace-expansion "^1.1.7"
+
 minimatch@^5.0.1:
   version "5.1.6"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
@@ -12528,6 +12598,11 @@ no-case@^3.0.4:
     lower-case "^2.0.2"
     tslib "^2.0.3"
 
+node-addon-api@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
+  integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
+
 node-dir@^0.1.10, node-dir@^0.1.17:
   version "0.1.17"
   resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5"
@@ -12557,6 +12632,11 @@ node-fetch@2.6.7, node-fetch@^2.6.7:
   dependencies:
     whatwg-url "^5.0.0"
 
+node-gyp-build@^4.3.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz#0c52e4cbf54bbd28b709820ef7b6a3c2d6209055"
+  integrity sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==
+
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
@@ -14195,10 +14275,10 @@ regenerate@^1.4.0, regenerate@^1.4.2:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
-regenerator-runtime@^0.13.4:
-  version "0.13.9"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
-  integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
+regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.4:
+  version "0.13.11"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
+  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
 
 regenerator-runtime@^0.13.7:
   version "0.13.7"
@@ -14407,7 +14487,7 @@ resolve.exports@^2.0.0:
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.1.tgz#cee884cd4e3f355660e501fa3276b27d7ffe5a20"
   integrity sha512-OEJWVeimw8mgQuj3HfkNl4KqRevH7lzeQNaWRPfx0PPse7Jk6ozcsG4FKVgtzDsC1KUF+YlTHh17NcgHOPykLw==
 
-resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0:
+resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.22.0:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
   integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
@@ -14416,6 +14496,15 @@ resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.17
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+resolve@^1.19.0:
+  version "1.22.2"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
+  integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
+  dependencies:
+    is-core-module "^2.11.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
 resolve@^2.0.0-next.3:
   version "2.0.0-next.4"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.4.tgz#3d37a113d6429f496ec4752d2a2e58efb1fd4660"
@@ -14474,14 +14563,7 @@ rollup-plugin-visualizer@^5.6.0:
     source-map "^0.7.3"
     yargs "^17.3.1"
 
-"rollup@^2.25.0 || ^3.3.0":
-  version "3.20.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.20.0.tgz#ce7bd88449a776b9f75bf4e35959e25fbd3f51b1"
-  integrity sha512-YsIfrk80NqUDrxrjWPXUa7PWvAfegZEXHuPsEZg58fGCdjL1I9C1i/NaG+L+27kxxwkrG/QEDEQc8s/ynXWWGQ==
-  optionalDependencies:
-    fsevents "~2.3.2"
-
-rollup@^3.21.0:
+"rollup@^2.25.0 || ^3.3.0", rollup@^3.21.0:
   version "3.21.8"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.21.8.tgz#fc768008fe2c953f18210370fd70fe1ffff59e2c"
   integrity sha512-SSFV2T2fWtQ/vvBip85u2Nr0GNKireabH9d7nXswBg+XSH+jbVDSYptRAEbCEsquhs503rpPA9POYAp0/Jhasw==
@@ -14842,7 +14924,7 @@ source-map-support@^0.5.16:
 source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+  integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
 source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   version "0.6.1"
@@ -15153,10 +15235,10 @@ style-to-object@0.4.1:
   dependencies:
     inline-style-parser "0.1.1"
 
-stylis@4.0.13:
-  version "4.0.13"
-  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz#f5db332e376d13cc84ecfe5dace9a2a51d954c91"
-  integrity sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==
+stylis@4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.2.0.tgz#79daee0208964c8fe695a42fcffcac633a211a51"
+  integrity sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==
 
 stylis@^4.0.3:
   version "4.0.10"
@@ -15386,7 +15468,7 @@ tmpl@1.0.5:
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
+  integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
 
 to-regex-range@^5.0.1:
   version "5.0.1"
@@ -15457,25 +15539,6 @@ ts-log@^2.2.3:
   resolved "https://registry.yarnpkg.com/ts-log/-/ts-log-2.2.3.tgz#4da5640fe25a9fb52642cd32391c886721318efb"
   integrity sha512-XvB+OdKSJ708Dmf9ore4Uf/q62AYDTzFcAdxc8KNML1mmAWywRFVt/dn1KYJH8Agt5UJNujfM3znU5PxgAzA2w==
 
-ts-node@^10.9.1:
-  version "10.9.1"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
-  integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
-  dependencies:
-    "@cspotcode/source-map-support" "^0.8.0"
-    "@tsconfig/node10" "^1.0.7"
-    "@tsconfig/node12" "^1.0.7"
-    "@tsconfig/node14" "^1.0.0"
-    "@tsconfig/node16" "^1.0.2"
-    acorn "^8.4.1"
-    acorn-walk "^8.1.1"
-    arg "^4.1.0"
-    create-require "^1.1.0"
-    diff "^4.0.1"
-    make-error "^1.1.1"
-    v8-compile-cache-lib "^3.0.1"
-    yn "3.1.1"
-
 tsconfck@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/tsconfck/-/tsconfck-2.1.1.tgz#9b51603d2712d1f4740fa14748ca886a2e1893e5"
@@ -15865,11 +15928,6 @@ uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-v8-compile-cache-lib@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
-  integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
-
 v8-compile-cache@^2.0.3:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"
@@ -16005,10 +16063,10 @@ vite-tsconfig-paths@4.2.0:
     globrex "^0.1.2"
     tsconfck "^2.1.0"
 
-vite@4.3.7:
-  version "4.3.7"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-4.3.7.tgz#04f98ab0f4689490545b2f6fa0515e95072bb298"
-  integrity sha512-MTIFpbIm9v7Hh5b0wSBgkcWzSBz7SAa6K/cBTwS4kUiQJfQLFlZZRJRQgqunCVzhTPCk674tW+0Qaqh3Q00dBg==
+vite@4.3.9:
+  version "4.3.9"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-4.3.9.tgz#db896200c0b1aa13b37cdc35c9e99ee2fdd5f96d"
+  integrity sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg==
   dependencies:
     esbuild "^0.17.5"
     postcss "^8.4.23"
@@ -16379,12 +16437,7 @@ yaml-ast-parser@^0.0.43:
   resolved "https://registry.yarnpkg.com/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz#e8a23e6fb4c38076ab92995c5dca33f3d3d7c9bb"
   integrity sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==
 
-yaml@^1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
-  integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==
-
-yaml@^1.7.2:
+yaml@^1.10.0, yaml@^1.7.2:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
@@ -16468,11 +16521,6 @@ yauzl@^2.10.0:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
 
-yn@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
-  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
-
 yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"