From 3e252af626771a74b16c1965c9d6a3ef7bcfef3f Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Fri, 8 May 2026 11:07:22 -0400
Subject: [PATCH 01/70] Rollup subscriptions by prefix for tabular display

---
 .../admin/Settings/PrefixAlerts/types.ts      | 20 ++++-
 .../useAlertSubscriptionsStore.ts             | 16 ++++
 src/components/tables/PrefixAlerts/Rows.tsx   | 73 +++++++++----------
 src/components/tables/PrefixAlerts/index.tsx  | 68 +++++++++++------
 src/components/tables/PrefixAlerts/shared.ts  |  4 -
 src/components/tables/PrefixAlerts/types.ts   |  6 +-
 .../tables/cells/prefixAlerts/EditButton.tsx  | 11 +--
 src/utils/notification-utils.ts               | 23 ++++++
 8 files changed, 139 insertions(+), 82 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/types.ts b/src/components/admin/Settings/PrefixAlerts/types.ts
index 268e6595f8..8910f61f28 100644
--- a/src/components/admin/Settings/PrefixAlerts/types.ts
+++ b/src/components/admin/Settings/PrefixAlerts/types.ts
@@ -35,9 +35,8 @@ export interface DialogActionProps {
 }
 
 export interface EditButtonProps extends TableCellProps {
-    alertTypes: ReducedAlertSubscription['alertTypes'];
-    email: string;
     prefix: string;
+    subscriptionMetadata: SubscriptionMetadata;
 }
 
 export interface EmailDictionary {
@@ -48,6 +47,23 @@ export interface EmailListFieldProps {
     staticEmail?: string;
 }
 
+interface GlobalSetting {
+    [property: string]: boolean | number | string;
+}
+
+interface GlobalSettingDictionary {
+    [alertType: string]: GlobalSetting;
+}
+
 export interface PrefixFieldProps {
     staticPrefix?: string;
 }
+
+export interface SubscriptionMetadata {
+    settings: GlobalSettingDictionary;
+    subscriptions: ReducedAlertSubscription[];
+}
+
+export interface SubscriptionMetadataDictionary {
+    [prefix: string]: SubscriptionMetadata;
+}
diff --git a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
index 79a7889e92..1878df0452 100644
--- a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
@@ -1,5 +1,6 @@
 import type { PostgrestError } from '@supabase/postgrest-js';
 import type { ReducedAlertSubscription } from 'src/api/types';
+import type { SubscriptionMetadataDictionary } from 'src/components/admin/Settings/PrefixAlerts/types';
 import type { AlertTypeInfo } from 'src/gql-types/graphql';
 import type { CombinedError } from 'urql';
 
@@ -8,6 +9,7 @@ import { devtools } from 'zustand/middleware';
 
 import produce from 'immer';
 
+import { bundleSubscriptionsByPrefix } from 'src/utils/notification-utils';
 import { devtoolsOptions } from 'src/utils/store-utils';
 
 interface AlertSubscriptionState {
@@ -20,6 +22,7 @@ interface AlertSubscriptionState {
         ReducedAlertSubscription,
         'alertTypes' | 'catalogPrefix' | 'email'
     >;
+    subscriptionMetadata: SubscriptionMetadataDictionary;
     resetState: () => void;
     setAlertTypes: (values: AlertTypeInfo[], initialize?: boolean) => void;
     setEmailErrorsExist: (
@@ -31,6 +34,7 @@ interface AlertSubscriptionState {
     setSaveErrors: (value: AlertSubscriptionState['saveErrors']) => void;
     setSubscribedEmail: (value: string) => void;
     setSubscribedPrefix: (value: string, errors: string | null) => void;
+    setSubscriptionMetadata: (value: ReducedAlertSubscription[]) => void;
 }
 
 const getInitialState = (): Pick<
@@ -41,6 +45,7 @@ const getInitialState = (): Pick<
     | 'prefixErrorsExist'
     | 'saveErrors'
     | 'subscription'
+    | 'subscriptionMetadata'
 > => ({
     alertTypes: [],
     emailErrorsExist: false,
@@ -48,6 +53,7 @@ const getInitialState = (): Pick<
     prefixErrorsExist: false,
     saveErrors: [],
     subscription: { alertTypes: [], catalogPrefix: '', email: '' },
+    subscriptionMetadata: {},
 });
 
 const name = 'estuary.alert-subscriptions-store';
@@ -119,6 +125,16 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                     false,
                     'subscribed prefix set'
                 ),
+
+            setSubscriptionMetadata: (value) =>
+                set(
+                    produce((state: AlertSubscriptionState) => {
+                        state.subscriptionMetadata =
+                            bundleSubscriptionsByPrefix(value);
+                    }),
+                    false,
+                    'subscription metadata set'
+                ),
         };
     }, devtoolsOptions(name))
 );
diff --git a/src/components/tables/PrefixAlerts/Rows.tsx b/src/components/tables/PrefixAlerts/Rows.tsx
index 38e0c368a3..f7d809faab 100644
--- a/src/components/tables/PrefixAlerts/Rows.tsx
+++ b/src/components/tables/PrefixAlerts/Rows.tsx
@@ -1,61 +1,56 @@
-import type { ChipDisplay } from 'src/components/shared/ChipList/types';
 import type {
     RowProps,
     RowsProps,
 } from 'src/components/tables/PrefixAlerts/types';
 
-import { useMemo } from 'react';
-
 import { TableCell, TableRow } from '@mui/material';
 
 import ChipListCell from 'src/components/tables/cells/ChipList';
 import AlertEditButton from 'src/components/tables/cells/prefixAlerts/EditButton';
-import { sortByAlertType } from 'src/utils/misc-utils';
 
-function Row({ alertTypeDefs, row }: RowProps) {
-    const evaluatedAlertTypes: ChipDisplay[] = useMemo(
-        () =>
-            row.alertTypes
-                .map((alertType) =>
-                    alertTypeDefs.find((def) => def.alertType === alertType)
-                )
-                .filter((def) => typeof def !== 'undefined')
-                .sort((first, second) =>
-                    sortByAlertType(
-                        {
-                            isSystemAlert: first.isSystem,
-                            value: first.displayName,
-                        },
-                        {
-                            isSystemAlert: second.isSystem,
-                            value: second.displayName,
-                        },
-                        'asc'
-                    )
-                )
-                .map(({ displayName, isSystem }) => ({
-                    display: displayName,
-                    diminishedText: isSystem,
-                })),
-        [alertTypeDefs, row.alertTypes]
-    );
+function Row({ row }: RowProps) {
+    const { subscriptions } = row;
+
+    // const evaluatedAlertTypes: ChipDisplay[] = useMemo(
+    //     () =>
+    //         row.alertTypes
+    //             .map((alertType) =>
+    //                 alertTypeDefs.find((def) => def.alertType === alertType)
+    //             )
+    //             .filter((def) => typeof def !== 'undefined')
+    //             .sort((first, second) =>
+    //                 sortByAlertType(
+    //                     {
+    //                         isSystemAlert: first.isSystem,
+    //                         value: first.displayName,
+    //                     },
+    //                     {
+    //                         isSystemAlert: second.isSystem,
+    //                         value: second.displayName,
+    //                     },
+    //                     'asc'
+    //                 )
+    //             )
+    //             .map(({ displayName, isSystem }) => ({
+    //                 display: displayName,
+    //                 diminishedText: isSystem,
+    //             })),
+    //     [alertTypeDefs, row.alertTypes]
+    // );
 
     return (
         <TableRow>
-            <TableCell>{row.catalogPrefix}</TableCell>
+            <TableCell>{subscriptions[0].catalogPrefix}</TableCell>
 
             <ChipListCell
                 maxChips={3}
                 stripPath={false}
-                values={evaluatedAlertTypes}
+                values={subscriptions.map(({ email }) => email)}
             />
 
-            <TableCell>{row.email}</TableCell>
-
             <AlertEditButton
-                alertTypes={row.alertTypes}
-                email={row.email}
-                prefix={row.catalogPrefix}
+                prefix={subscriptions[0].catalogPrefix}
+                subscriptionMetadata={row}
             />
         </TableRow>
     );
@@ -67,7 +62,7 @@ function Rows({ alertTypeDefs, data }: RowsProps) {
             {data.map((datum, index) => (
                 <Row
                     alertTypeDefs={alertTypeDefs}
-                    key={`${datum.catalogPrefix}-${datum.email}-${index}`}
+                    key={`${datum.subscriptions[0].catalogPrefix}-${index}`}
                     row={datum}
                 />
             ))}
diff --git a/src/components/tables/PrefixAlerts/index.tsx b/src/components/tables/PrefixAlerts/index.tsx
index a825ff4960..2c4b1efc37 100644
--- a/src/components/tables/PrefixAlerts/index.tsx
+++ b/src/components/tables/PrefixAlerts/index.tsx
@@ -1,4 +1,4 @@
-import type { ReducedAlertSubscriptionQueryResponse } from 'src/api/types';
+import type { SubscriptionMetadataDictionary } from 'src/components/admin/Settings/PrefixAlerts/types';
 import type { AlertTypeInfo } from 'src/gql-types/graphql';
 import type { TableState } from 'src/types';
 
@@ -6,6 +6,8 @@ import { useEffect, useMemo, useRef, useState } from 'react';
 
 import { Box, Stack, Table, TableContainer } from '@mui/material';
 
+import { useShallow } from 'zustand/react/shallow';
+
 import { debounce } from 'lodash';
 import { useUnmount } from 'react-use';
 
@@ -23,34 +25,45 @@ import TableFilter from 'src/components/tables/PrefixAlerts/TableFilter';
 import { useGetAlertSubscriptions } from 'src/context/AlertSubscriptions';
 import { useGetAlertTypes } from 'src/context/AlertType';
 import { TableStatuses } from 'src/types';
+import { bundleSubscriptionsByPrefix } from 'src/utils/notification-utils';
 
 function PrefixAlertTable() {
     const [{ data, error, fetching }] = useGetAlertSubscriptions();
     const [alertTypeResponse] = useGetAlertTypes();
 
-    const setInitializationError = useAlertSubscriptionsStore(
-        (state) => state.setInitializationError
-    );
+    const [setInitializationError, setSubscriptionMetadata] =
+        useAlertSubscriptionsStore(
+            useShallow((state) => [
+                state.setInitializationError,
+                state.setSubscriptionMetadata,
+            ])
+        );
 
     const [searchQuery, setSearchQuery] = useState<string>('');
     const [tableState, setTableState] = useState<TableState>({
         status: TableStatuses.LOADING,
     });
 
-    const processedData: ReducedAlertSubscriptionQueryResponse['alertSubscriptions'] =
-        useMemo(() => {
-            if (!data) {
-                return [];
-            }
-
-            return searchQuery
-                ? data.alertSubscriptions.filter(
-                      ({ catalogPrefix, email }) =>
-                          catalogPrefix.includes(searchQuery) ||
-                          email.includes(searchQuery)
-                  )
-                : data.alertSubscriptions;
-        }, [data, searchQuery]);
+    const processedData: SubscriptionMetadataDictionary = useMemo(() => {
+        if (!data) {
+            return {};
+        }
+
+        const evaluatedData = searchQuery
+            ? data.alertSubscriptions.filter(
+                  ({ catalogPrefix, email }) =>
+                      catalogPrefix.includes(searchQuery) ||
+                      email.includes(searchQuery)
+              )
+            : data.alertSubscriptions;
+
+        return bundleSubscriptionsByPrefix(evaluatedData);
+    }, [data, searchQuery]);
+
+    const processedDataExists = useMemo(
+        () => Object.keys(processedData).length > 0,
+        [processedData]
+    );
 
     const alertTypeDefs: AlertTypeInfo[] = useMemo(
         () =>
@@ -71,13 +84,21 @@ function PrefixAlertTable() {
     useEffect(() => {
         if (!fetching && !alertTypeResponse.fetching) {
             setInitializationError(error);
+            setSubscriptionMetadata(data?.alertSubscriptions ?? []);
         }
-    }, [alertTypeResponse.fetching, error, fetching, setInitializationError]);
+    }, [
+        alertTypeResponse.fetching,
+        data?.alertSubscriptions,
+        error,
+        fetching,
+        setInitializationError,
+        setSubscriptionMetadata,
+    ]);
 
     useEffect(() => {
         if (fetching || alertTypeResponse.fetching) {
             setTableState({ status: TableStatuses.LOADING });
-        } else if (processedData.length > 0) {
+        } else if (processedDataExists) {
             displayLoadingState.current?.cancel();
 
             setTableState({
@@ -94,8 +115,8 @@ function PrefixAlertTable() {
         }
     }, [
         alertTypeResponse.fetching,
+        processedDataExists,
         fetching,
-        processedData.length,
         searchQuery,
     ]);
 
@@ -144,11 +165,10 @@ function PrefixAlertTable() {
                             disableDoclink: true,
                         }}
                         rows={
-                            processedData.length > 0 &&
-                            alertTypeDefs.length > 0 ? (
+                            processedDataExists && alertTypeDefs.length > 0 ? (
                                 <Rows
                                     alertTypeDefs={alertTypeDefs}
-                                    data={processedData}
+                                    data={Object.values(processedData)}
                                 />
                             ) : null
                         }
diff --git a/src/components/tables/PrefixAlerts/shared.ts b/src/components/tables/PrefixAlerts/shared.ts
index ecba51906e..b02cbbd9e1 100644
--- a/src/components/tables/PrefixAlerts/shared.ts
+++ b/src/components/tables/PrefixAlerts/shared.ts
@@ -15,10 +15,6 @@ export const columns: TableColumns[] = [
         field: 'catalog_prefix',
         headerIntlKey: 'entityTable.data.catalogPrefix',
     },
-    {
-        field: null,
-        headerIntlKey: 'entityTable.data.alertTypes',
-    },
     {
         field: null,
         headerIntlKey: 'alerts.config.table.label.alertMethod',
diff --git a/src/components/tables/PrefixAlerts/types.ts b/src/components/tables/PrefixAlerts/types.ts
index 0cc3ffa643..f9335c6771 100644
--- a/src/components/tables/PrefixAlerts/types.ts
+++ b/src/components/tables/PrefixAlerts/types.ts
@@ -1,15 +1,15 @@
 import type { Dispatch, SetStateAction } from 'react';
-import type { ReducedAlertSubscription } from 'src/api/types';
+import type { SubscriptionMetadata } from 'src/components/admin/Settings/PrefixAlerts/types';
 import type { AlertTypeInfo } from 'src/gql-types/graphql';
 
 export interface RowProps {
     alertTypeDefs: AlertTypeInfo[];
-    row: ReducedAlertSubscription;
+    row: SubscriptionMetadata;
 }
 
 export interface RowsProps {
     alertTypeDefs: AlertTypeInfo[];
-    data: ReducedAlertSubscription[];
+    data: SubscriptionMetadata[];
 }
 
 export interface TableFilterProps {
diff --git a/src/components/tables/cells/prefixAlerts/EditButton.tsx b/src/components/tables/cells/prefixAlerts/EditButton.tsx
index c44462397f..a040722cc4 100644
--- a/src/components/tables/cells/prefixAlerts/EditButton.tsx
+++ b/src/components/tables/cells/prefixAlerts/EditButton.tsx
@@ -7,22 +7,16 @@ import { Button, TableCell } from '@mui/material';
 import { useIntl } from 'react-intl';
 
 import AlertSubscriptionDialog from 'src/components/admin/Settings/PrefixAlerts/Dialog';
-import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
 
 function AlertEditButton({
-    alertTypes,
-    email,
     prefix,
+    subscriptionMetadata,
     ...props
 }: EditButtonProps) {
     const intl = useIntl();
 
     const [open, setOpen] = useState(false);
 
-    const setSubscribedEmail = useAlertSubscriptionsStore(
-        (state) => state.setSubscribedEmail
-    );
-
     return (
         <TableCell {...props}>
             <Button
@@ -30,7 +24,6 @@ function AlertEditButton({
                 onClick={(event) => {
                     event.preventDefault();
 
-                    setSubscribedEmail(email);
                     setOpen(true);
                 }}
             >
@@ -40,12 +33,10 @@ function AlertEditButton({
             <AlertSubscriptionDialog
                 descriptionId="alerts.config.dialog.update.description"
                 enableDeletion
-                existingAlertTypes={alertTypes}
                 headerId="alerts.config.dialog.update.header"
                 open={open}
                 setOpen={setOpen}
                 staticPrefix={prefix}
-                staticEmail={email}
             />
         </TableCell>
     );
diff --git a/src/utils/notification-utils.ts b/src/utils/notification-utils.ts
index 2f406fa113..ddbb7475a7 100644
--- a/src/utils/notification-utils.ts
+++ b/src/utils/notification-utils.ts
@@ -1,4 +1,6 @@
 import type { OptionsObject } from 'notistack';
+import type { ReducedAlertSubscription } from 'src/api/types';
+import type { SubscriptionMetadataDictionary } from 'src/components/admin/Settings/PrefixAlerts/types';
 
 export const snackbarSettings: OptionsObject = {
     anchorOrigin: {
@@ -8,3 +10,24 @@ export const snackbarSettings: OptionsObject = {
     preventDuplicate: true,
     variant: 'info',
 };
+
+export const bundleSubscriptionsByPrefix = (
+    data: ReducedAlertSubscription[]
+) => {
+    const subscriptionMetadata: SubscriptionMetadataDictionary = {};
+
+    data.forEach((query) => {
+        const { catalogPrefix } = query;
+
+        if (Object.hasOwn(subscriptionMetadata, catalogPrefix)) {
+            subscriptionMetadata[catalogPrefix].subscriptions.push(query);
+        } else {
+            subscriptionMetadata[catalogPrefix] = {
+                settings: {},
+                subscriptions: [query],
+            };
+        }
+    });
+
+    return subscriptionMetadata;
+};

From efa7fb38fabc69fcf99434ce606db6c12c65ed6a Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Fri, 8 May 2026 13:49:52 -0400
Subject: [PATCH 02/70] Add recipients section to subscription dialogs

---
 .../PrefixAlerts/Dialog/AlertTypeField.tsx    |  16 +--
 .../PrefixAlerts/Dialog/EmailListField.tsx    |  40 +++---
 .../PrefixAlerts/Dialog/PrefixField.tsx       |  58 ++++-----
 .../Dialog/SubscriberInfo/Details.tsx         |  41 ++++++
 .../Dialog/SubscriberInfo/Summary.tsx         | 118 ++++++++++++++++++
 .../Dialog/SubscriberInfo/index.tsx           |  33 +++++
 .../PrefixAlerts/Dialog/SubscriberSection.tsx |  48 +++++++
 .../Settings/PrefixAlerts/Dialog/index.tsx    |  12 +-
 .../admin/Settings/PrefixAlerts/types.ts      |  13 ++
 .../useAlertSubscriptionsStore.ts             |   4 +
 src/lang/en-US/Alerts.ts                      |   1 +
 11 files changed, 312 insertions(+), 72 deletions(-)
 create mode 100644 src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx
 create mode 100644 src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
 create mode 100644 src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
 create mode 100644 src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection.tsx

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeField.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeField.tsx
index 571a6f75be..a0c6609f8b 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeField.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeField.tsx
@@ -3,7 +3,7 @@ import type { AlertTypeInfo } from 'src/gql-types/graphql';
 
 import { useEffect } from 'react';
 
-import { Grid, Skeleton } from '@mui/material';
+import { Skeleton } from '@mui/material';
 
 import AlertTypeSelector from 'src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeSelector';
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
@@ -43,16 +43,10 @@ const AlertTypeField = ({ existingAlertTypes }: AlertTypeFieldProps) => {
         }
     }, [error, setServerError]);
 
-    return (
-        <Grid size={12}>
-            {fetching || !data ? (
-                <Skeleton height={38} width={490} />
-            ) : (
-                <AlertTypeSelector
-                    options={data.alertTypes ?? DEFAULT_OPTIONS}
-                />
-            )}
-        </Grid>
+    return fetching || !data ? (
+        <Skeleton height={38} width={490} />
+    ) : (
+        <AlertTypeSelector options={data.alertTypes ?? DEFAULT_OPTIONS} />
     );
 };
 
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/EmailListField.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/EmailListField.tsx
index 839a649e99..6c42c84b92 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/EmailListField.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/EmailListField.tsx
@@ -1,6 +1,6 @@
 import type { EmailListFieldProps } from 'src/components/admin/Settings/PrefixAlerts/types';
 
-import { Grid, TextField } from '@mui/material';
+import { TextField } from '@mui/material';
 
 import { useIntl } from 'react-intl';
 
@@ -9,27 +9,23 @@ import EmailSelector from 'src/components/admin/Settings/PrefixAlerts/EmailSelec
 const EmailListField = ({ staticEmail }: EmailListFieldProps) => {
     const intl = useIntl();
 
-    return (
-        <Grid size={{ xs: 12, md: 7 }}>
-            {staticEmail ? (
-                <TextField
-                    InputProps={{
-                        sx: { borderRadius: 3 },
-                    }}
-                    disabled
-                    fullWidth
-                    label={intl.formatMessage({
-                        id: 'data.email',
-                    })}
-                    required
-                    size="small"
-                    value={staticEmail}
-                    variant="outlined"
-                />
-            ) : (
-                <EmailSelector />
-            )}
-        </Grid>
+    return staticEmail ? (
+        <TextField
+            InputProps={{
+                sx: { borderRadius: 3 },
+            }}
+            disabled
+            fullWidth
+            label={intl.formatMessage({
+                id: 'data.email',
+            })}
+            required
+            size="small"
+            value={staticEmail}
+            variant="outlined"
+        />
+    ) : (
+        <EmailSelector />
     );
 };
 
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/PrefixField.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/PrefixField.tsx
index 9a79e7ad0a..eb4f0e3b56 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/PrefixField.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/PrefixField.tsx
@@ -1,6 +1,6 @@
 import type { PrefixFieldProps } from 'src/components/admin/Settings/PrefixAlerts/types';
 
-import { Grid, TextField } from '@mui/material';
+import { TextField } from '@mui/material';
 
 import { useIntl } from 'react-intl';
 import { useMount } from 'react-use';
@@ -21,35 +21,31 @@ export default function PrefixField({ staticPrefix }: PrefixFieldProps) {
         }
     });
 
-    return (
-        <Grid size={{ xs: 12, md: 5 }}>
-            {staticPrefix ? (
-                <TextField
-                    InputProps={{
-                        sx: { borderRadius: 3 },
-                    }}
-                    disabled
-                    fullWidth
-                    label={intl.formatMessage({
-                        id: 'common.tenant',
-                    })}
-                    required
-                    size="small"
-                    value={staticPrefix}
-                    variant="outlined"
-                />
-            ) : (
-                <PrefixedName
-                    label={intl.formatMessage({
-                        id: 'common.tenant',
-                    })}
-                    onChange={setSubscribedPrefix}
-                    prefixOnly
-                    required
-                    size="small"
-                    validateOnLoad
-                />
-            )}
-        </Grid>
+    return staticPrefix ? (
+        <TextField
+            InputProps={{
+                sx: { borderRadius: 3 },
+            }}
+            disabled
+            fullWidth
+            label={intl.formatMessage({
+                id: 'common.tenant',
+            })}
+            required
+            size="small"
+            value={staticPrefix}
+            variant="outlined"
+        />
+    ) : (
+        <PrefixedName
+            label={intl.formatMessage({
+                id: 'common.tenant',
+            })}
+            onChange={setSubscribedPrefix}
+            prefixOnly
+            required
+            size="small"
+            validateOnLoad
+        />
     );
 }
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx
new file mode 100644
index 0000000000..4099e53ee7
--- /dev/null
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx
@@ -0,0 +1,41 @@
+import type { SubscriberAccordionProps } from 'src/components/admin/Settings/PrefixAlerts/types';
+
+import { AccordionDetails, Stack, useTheme } from '@mui/material';
+
+import AlertTypeField from 'src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeField';
+import EmailListField from 'src/components/admin/Settings/PrefixAlerts/Dialog/EmailListField';
+import { defaultOutline, defaultOutline_hovered } from 'src/context/Theme';
+
+const Details = ({
+    alertTypes,
+    email,
+    expanded,
+    hovered,
+}: SubscriberAccordionProps) => {
+    const theme = useTheme();
+
+    const borderStyle =
+        hovered && expanded
+            ? defaultOutline_hovered[theme.palette.mode]
+            : defaultOutline[theme.palette.mode];
+
+    return (
+        <AccordionDetails
+            style={{
+                borderBottom: borderStyle,
+                borderLeft: borderStyle,
+                borderRight: borderStyle,
+                borderBottomLeftRadius: '6px',
+                borderBottomRightRadius: '6px',
+            }}
+        >
+            <Stack spacing={3}>
+                <EmailListField staticEmail={email} />
+
+                <AlertTypeField existingAlertTypes={alertTypes} />
+            </Stack>
+        </AccordionDetails>
+    );
+};
+
+export default Details;
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
new file mode 100644
index 0000000000..c00025deb8
--- /dev/null
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
@@ -0,0 +1,118 @@
+import type { SubscriberSummaryProps } from 'src/components/admin/Settings/PrefixAlerts/types';
+import type { ChipDisplay } from 'src/components/shared/ChipList/types';
+import type { AlertTypeInfo } from 'src/gql-types/graphql';
+
+import { useMemo } from 'react';
+
+import {
+    AccordionSummary,
+    accordionSummaryClasses,
+    Stack,
+    Typography,
+    useTheme,
+} from '@mui/material';
+
+import { NavArrowDown } from 'iconoir-react';
+
+import ChipList from 'src/components/shared/ChipList';
+import { useGetAlertTypes } from 'src/context/AlertType';
+import { defaultOutline, defaultOutlineColor_hovered } from 'src/context/Theme';
+import { sortByAlertType } from 'src/utils/misc-utils';
+
+const Summary = ({
+    alertTypes,
+    email,
+    expanded,
+    setHovered,
+}: SubscriberSummaryProps) => {
+    const theme = useTheme();
+
+    const [alertTypeResponse] = useGetAlertTypes();
+
+    const alertTypeDefs: AlertTypeInfo[] = useMemo(
+        () =>
+            !alertTypeResponse.data ? [] : alertTypeResponse.data.alertTypes,
+        [alertTypeResponse.data]
+    );
+
+    const evaluatedAlertTypes: ChipDisplay[] = useMemo(
+        () =>
+            alertTypes
+                .map((alertType) =>
+                    alertTypeDefs.find((def) => def.alertType === alertType)
+                )
+                .filter((def) => typeof def !== 'undefined')
+                .sort((first, second) =>
+                    sortByAlertType(
+                        {
+                            isSystemAlert: first.isSystem,
+                            value: first.displayName,
+                        },
+                        {
+                            isSystemAlert: second.isSystem,
+                            value: second.displayName,
+                        },
+                        'asc'
+                    )
+                )
+                .map(({ displayName, isSystem }) => ({
+                    display: displayName,
+                    diminishedText: isSystem,
+                })),
+        [alertTypeDefs, alertTypes]
+    );
+
+    return (
+        <AccordionSummary
+            expandIcon={
+                <NavArrowDown style={{ color: theme.palette.text.primary }} />
+            }
+            onMouseOver={() => setHovered(true)}
+            onMouseOut={() => setHovered(false)}
+            sx={{
+                'backgroundColor':
+                    theme.palette.mode === 'dark' ? 'transparent' : 'white',
+                'border': defaultOutline[theme.palette.mode],
+                'borderBottom': expanded ? 'none' : undefined,
+                'borderRadius': 3,
+                'borderBottomLeftRadius': expanded ? 'unset' : undefined,
+                'borderBottomRightRadius': expanded ? 'unset' : undefined,
+                'minHeight': 40,
+                'px': 1,
+                '&:hover': {
+                    borderColor:
+                        defaultOutlineColor_hovered[theme.palette.mode],
+                },
+                '&:hover::after': {
+                    backgroundColor: 'transparent',
+                },
+                [`& .${accordionSummaryClasses.content}`]: {
+                    alignItems: 'center',
+                    my: 1,
+                    [`&.${accordionSummaryClasses.expanded}`]: {
+                        my: 0,
+                    },
+                },
+                [`&.${accordionSummaryClasses.expanded}`]: {
+                    minHeight: 40,
+                },
+            }}
+        >
+            <Stack spacing="2px" style={{ marginRight: 24 }}>
+                <Typography style={{ fontWeight: 500, paddingLeft: 12 }}>
+                    {email}
+                </Typography>
+
+                {expanded ? null : (
+                    <ChipList
+                        maxChips={3}
+                        stripPath={false}
+                        values={evaluatedAlertTypes}
+                    />
+                )}
+            </Stack>
+        </AccordionSummary>
+    );
+};
+
+export default Summary;
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
new file mode 100644
index 0000000000..75b4f46868
--- /dev/null
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
@@ -0,0 +1,33 @@
+import type { SubscriberInfoProps } from 'src/components/admin/Settings/PrefixAlerts/types';
+
+import { useState } from 'react';
+
+import { Accordion } from '@mui/material';
+
+import Details from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details';
+import Summary from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary';
+
+const SubscriberInfo = ({ alertTypes, email }: SubscriberInfoProps) => {
+    const [expanded, setExpanded] = useState(false);
+    const [hovered, setHovered] = useState(false);
+
+    return (
+        <Accordion expanded={expanded} onChange={() => setExpanded(!expanded)}>
+            <Summary
+                alertTypes={alertTypes}
+                email={email}
+                expanded={expanded}
+                setHovered={setHovered}
+            />
+
+            <Details
+                alertTypes={alertTypes}
+                email={email}
+                expanded={expanded}
+                hovered={hovered}
+            />
+        </Accordion>
+    );
+};
+
+export default SubscriberInfo;
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection.tsx
new file mode 100644
index 0000000000..49154eaa8d
--- /dev/null
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection.tsx
@@ -0,0 +1,48 @@
+import type { SubscriptionMetadata } from 'src/components/admin/Settings/PrefixAlerts/types';
+
+import { Stack, Typography } from '@mui/material';
+
+import { useShallow } from 'zustand/react/shallow';
+
+import { useIntl } from 'react-intl';
+
+import SubscriberInfo from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo';
+import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
+import { hasOwnProperty } from 'src/utils/misc-utils';
+
+const SubscriberSection = () => {
+    const intl = useIntl();
+
+    const subscriptionMetadata: SubscriptionMetadata =
+        useAlertSubscriptionsStore(
+            useShallow((state) =>
+                state.catalogPrefix.length > 0 &&
+                hasOwnProperty(state.subscriptionMetadata, state.catalogPrefix)
+                    ? state.subscriptionMetadata[state.catalogPrefix]
+                    : { settings: {}, subscriptions: [] }
+            )
+        );
+
+    return (
+        <Stack spacing="10px" style={{ width: '100%' }}>
+            <Typography style={{ fontWeight: 500, marginBottom: 8 }}>
+                {intl.formatMessage(
+                    { id: 'alerts.config.dialog.label.subscribers' },
+                    { count: subscriptionMetadata.subscriptions.length }
+                )}
+            </Typography>
+
+            {subscriptionMetadata.subscriptions.map(
+                ({ alertTypes, catalogPrefix, email }, index) => (
+                    <SubscriberInfo
+                        alertTypes={alertTypes}
+                        email={email}
+                        key={`${catalogPrefix}-${email}-${index}`}
+                    />
+                )
+            )}
+        </Stack>
+    );
+};
+
+export default SubscriberSection;
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
index fefc0e3f26..5f5ca6781e 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
@@ -6,19 +6,17 @@ import {
     Dialog,
     DialogActions,
     DialogContent,
-    Grid,
     Stack,
 } from '@mui/material';
 
 import { useIntl } from 'react-intl';
 import { useUnmount } from 'react-use';
 
-import AlertTypeField from 'src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeField';
 import DeleteButton from 'src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton';
-import EmailListField from 'src/components/admin/Settings/PrefixAlerts/Dialog/EmailListField';
 import PrefixField from 'src/components/admin/Settings/PrefixAlerts/Dialog/PrefixField';
 import SaveButton from 'src/components/admin/Settings/PrefixAlerts/Dialog/SaveButton';
 import ServerErrors from 'src/components/admin/Settings/PrefixAlerts/Dialog/ServerErrors';
+import SubscriberSection from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection';
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
 import MessageWithLink from 'src/components/content/MessageWithLink';
 import DialogTitleWithClose from 'src/components/shared/Dialog/TitleWithClose';
@@ -63,13 +61,11 @@ const AlertSubscriptionDialog = ({
                     <MessageWithLink messageID={descriptionId} />
                 </Box>
 
-                <Grid container spacing={2}>
+                <Stack spacing={4}>
                     <PrefixField staticPrefix={staticPrefix} />
 
-                    <EmailListField staticEmail={staticEmail} />
-
-                    <AlertTypeField existingAlertTypes={existingAlertTypes} />
-                </Grid>
+                    <SubscriberSection />
+                </Stack>
             </DialogContent>
 
             <DialogActions
diff --git a/src/components/admin/Settings/PrefixAlerts/types.ts b/src/components/admin/Settings/PrefixAlerts/types.ts
index 8910f61f28..d5935aacf9 100644
--- a/src/components/admin/Settings/PrefixAlerts/types.ts
+++ b/src/components/admin/Settings/PrefixAlerts/types.ts
@@ -59,6 +59,19 @@ export interface PrefixFieldProps {
     staticPrefix?: string;
 }
 
+export interface SubscriberAccordionProps {
+    alertTypes: ReducedAlertSubscription['alertTypes'];
+    email: string;
+    hovered?: boolean;
+    expanded?: boolean;
+}
+
+export interface SubscriberInfoProps
+    extends Omit<SubscriberAccordionProps, 'expanded' | 'hovered'> {}
+
+export interface SubscriberSummaryProps extends SubscriberAccordionProps {
+    setHovered: Dispatch<SetStateAction<boolean>>;
+}
 export interface SubscriptionMetadata {
     settings: GlobalSettingDictionary;
     subscriptions: ReducedAlertSubscription[];
diff --git a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
index 1878df0452..d2792ff508 100644
--- a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
@@ -14,6 +14,7 @@ import { devtoolsOptions } from 'src/utils/store-utils';
 
 interface AlertSubscriptionState {
     alertTypes: AlertTypeInfo[];
+    catalogPrefix: string;
     emailErrorsExist: boolean;
     initializationError: CombinedError | PostgrestError | null | undefined;
     prefixErrorsExist: boolean;
@@ -40,6 +41,7 @@ interface AlertSubscriptionState {
 const getInitialState = (): Pick<
     AlertSubscriptionState,
     | 'alertTypes'
+    | 'catalogPrefix'
     | 'emailErrorsExist'
     | 'initializationError'
     | 'prefixErrorsExist'
@@ -48,6 +50,7 @@ const getInitialState = (): Pick<
     | 'subscriptionMetadata'
 > => ({
     alertTypes: [],
+    catalogPrefix: '',
     emailErrorsExist: false,
     initializationError: null,
     prefixErrorsExist: false,
@@ -120,6 +123,7 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                 set(
                     produce((state: AlertSubscriptionState) => {
                         state.subscription.catalogPrefix = value;
+                        state.catalogPrefix = value;
                         state.prefixErrorsExist = Boolean(errors);
                     }),
                     false,
diff --git a/src/lang/en-US/Alerts.ts b/src/lang/en-US/Alerts.ts
index e72cca99fe..8e265578fe 100644
--- a/src/lang/en-US/Alerts.ts
+++ b/src/lang/en-US/Alerts.ts
@@ -8,6 +8,7 @@ export const Alerts: Record<string, string> = {
     'alerts.config.dialog.error.generic': `An issue was encountered {operation} an alert subscription.`,
     'alerts.config.dialog.error.term.delete': `deleting`,
     'alerts.config.dialog.error.term.modify': `creating or updating`,
+    'alerts.config.dialog.label.subscribers': `Recipients ({count})`,
     'alerts.config.dialog.generate.description': `Choose where you'd like notifications to be sent. Email addresses can be for mailing lists, {docLink}, or individual users.`,
     'alerts.config.dialog.generate.description.docLink': `Slack channels`,
     'alerts.config.dialog.generate.description.docPath': `https://slack.com/intl/en-au/help/articles/206819278-Send-emails-to-Slack`,

From 69fbdcc9f96ca90e8ff8549e3eda1e7248b5c644 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Fri, 8 May 2026 14:00:00 -0400
Subject: [PATCH 03/70] Adjust state selectors in SubscriberSection component

---
 .../PrefixAlerts/Dialog/SubscriberSection.tsx | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection.tsx
index 49154eaa8d..4b7cf8bcb8 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection.tsx
@@ -1,8 +1,8 @@
 import type { SubscriptionMetadata } from 'src/components/admin/Settings/PrefixAlerts/types';
 
-import { Stack, Typography } from '@mui/material';
+import { useMemo } from 'react';
 
-import { useShallow } from 'zustand/react/shallow';
+import { Stack, Typography } from '@mui/material';
 
 import { useIntl } from 'react-intl';
 
@@ -13,26 +13,31 @@ import { hasOwnProperty } from 'src/utils/misc-utils';
 const SubscriberSection = () => {
     const intl = useIntl();
 
-    const subscriptionMetadata: SubscriptionMetadata =
-        useAlertSubscriptionsStore(
-            useShallow((state) =>
-                state.catalogPrefix.length > 0 &&
-                hasOwnProperty(state.subscriptionMetadata, state.catalogPrefix)
-                    ? state.subscriptionMetadata[state.catalogPrefix]
-                    : { settings: {}, subscriptions: [] }
-            )
-        );
+    const catalogPrefix = useAlertSubscriptionsStore(
+        (state) => state.catalogPrefix
+    );
+    const subscriptionMetadata = useAlertSubscriptionsStore(
+        (state) => state.subscriptionMetadata
+    );
+
+    const targetSubscriptionMetadata: SubscriptionMetadata = useMemo(
+        () =>
+            hasOwnProperty(subscriptionMetadata, catalogPrefix)
+                ? subscriptionMetadata[catalogPrefix]
+                : { settings: {}, subscriptions: [] },
+        [catalogPrefix, subscriptionMetadata]
+    );
 
     return (
         <Stack spacing="10px" style={{ width: '100%' }}>
             <Typography style={{ fontWeight: 500, marginBottom: 8 }}>
                 {intl.formatMessage(
                     { id: 'alerts.config.dialog.label.subscribers' },
-                    { count: subscriptionMetadata.subscriptions.length }
+                    { count: targetSubscriptionMetadata.subscriptions.length }
                 )}
             </Typography>
 
-            {subscriptionMetadata.subscriptions.map(
+            {targetSubscriptionMetadata.subscriptions.map(
                 ({ alertTypes, catalogPrefix, email }, index) => (
                     <SubscriberInfo
                         alertTypes={alertTypes}

From af15c7f8c3b815ad0cbd48e653d4f108149345da Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Fri, 8 May 2026 15:47:19 -0400
Subject: [PATCH 04/70] Adjust how AlertTypeSelector updates client state

---
 src/api/alerts.ts                             |  1 -
 src/api/types.ts                              |  2 +-
 .../PrefixAlerts/Dialog/AlertTypeField.tsx    | 28 ++-----
 .../PrefixAlerts/Dialog/AlertTypeSelector.tsx | 25 ++++---
 .../Dialog/SubscriberInfo/Details.tsx         |  7 +-
 .../Dialog/SubscriberInfo/Summary.tsx         |  5 +-
 .../Dialog/SubscriberInfo/index.tsx           |  8 +-
 .../PrefixAlerts/Dialog/SubscriberSection.tsx |  7 +-
 .../Settings/PrefixAlerts/Dialog/index.tsx    |  1 -
 .../admin/Settings/PrefixAlerts/types.ts      |  6 +-
 .../useAlertSubscriptionsStore.ts             | 74 ++++++++++++++++---
 11 files changed, 104 insertions(+), 60 deletions(-)

diff --git a/src/api/alerts.ts b/src/api/alerts.ts
index d5af31a99e..437c9daffd 100644
--- a/src/api/alerts.ts
+++ b/src/api/alerts.ts
@@ -68,7 +68,6 @@ const AlertSubscriptionQuery = gql<
             alertTypes
             catalogPrefix
             email
-            updatedAt
         }
     }
 `;
diff --git a/src/api/types.ts b/src/api/types.ts
index 11d406c4a7..dd6d46f50b 100644
--- a/src/api/types.ts
+++ b/src/api/types.ts
@@ -56,7 +56,7 @@ export interface LiveSpecsExtQuery_GroupedUpdates {
 
 export type ReducedAlertSubscription = Pick<
     AlertSubscription,
-    'alertTypes' | 'catalogPrefix' | 'email' | 'updatedAt'
+    'alertTypes' | 'catalogPrefix' | 'email'
 >;
 
 export interface ReducedAlertSubscriptionQueryResponse {
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeField.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeField.tsx
index a0c6609f8b..c48532722e 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeField.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeField.tsx
@@ -10,33 +10,14 @@ import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAler
 import { useGetAlertTypes } from 'src/context/AlertType';
 
 const DEFAULT_OPTIONS: AlertTypeInfo[] = [];
-const AlertTypeField = ({ existingAlertTypes }: AlertTypeFieldProps) => {
+
+const AlertTypeField = ({ subscription }: AlertTypeFieldProps) => {
     const [{ fetching, data, error }] = useGetAlertTypes();
 
     const setServerError = useAlertSubscriptionsStore(
         (state) => state.setSaveErrors
     );
 
-    const setAlertTypes = useAlertSubscriptionsStore(
-        (state) => state.setAlertTypes
-    );
-
-    useEffect(() => {
-        if (!fetching && data?.alertTypes) {
-            const existingAlertTypeDefs = existingAlertTypes
-                ? data.alertTypes.filter(({ alertType }) =>
-                      existingAlertTypes.includes(alertType)
-                  )
-                : null;
-
-            setAlertTypes(
-                existingAlertTypeDefs === null
-                    ? data.alertTypes.filter(({ isSystem }) => isSystem)
-                    : existingAlertTypeDefs
-            );
-        }
-    }, [data?.alertTypes, existingAlertTypes, fetching, setAlertTypes]);
-
     useEffect(() => {
         if (error) {
             setServerError([error]);
@@ -46,7 +27,10 @@ const AlertTypeField = ({ existingAlertTypes }: AlertTypeFieldProps) => {
     return fetching || !data ? (
         <Skeleton height={38} width={490} />
     ) : (
-        <AlertTypeSelector options={data.alertTypes ?? DEFAULT_OPTIONS} />
+        <AlertTypeSelector
+            subscription={subscription}
+            options={data.alertTypes ?? DEFAULT_OPTIONS}
+        />
     );
 };
 
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeSelector.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeSelector.tsx
index 27243b1c55..0828fd37b9 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeSelector.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeSelector.tsx
@@ -22,16 +22,16 @@ import { diminishedTextColor } from 'src/context/Theme';
 import { OutlinedChip } from 'src/styledComponents/chips/OutlinedChip';
 import { basicSort_string, sortByAlertType } from 'src/utils/misc-utils';
 
-const AlertTypeSelector = ({ options }: AlertTypeSelectorProps) => {
+const AlertTypeSelector = ({
+    options,
+    subscription,
+}: AlertTypeSelectorProps) => {
     const intl = useIntl();
     const theme = useTheme();
 
     const serverError = useAlertSubscriptionsStore(
         (state) => state.initializationError
     );
-    const alertTypes = useAlertSubscriptionsStore(
-        (state) => state.subscription.alertTypes
-    );
     const setAlertTypes = useAlertSubscriptionsStore(
         (state) => state.setAlertTypes
     );
@@ -41,10 +41,13 @@ const AlertTypeSelector = ({ options }: AlertTypeSelectorProps) => {
         [options]
     );
 
-    const values: AlertTypeInfo[] = useMemo(
-        () => options.filter(({ alertType }) => alertTypes.includes(alertType)),
-        [options, alertTypes]
-    );
+    const values: AlertTypeInfo[] = useMemo(() => {
+        const alertTypes = subscription?.alertTypes ?? [];
+
+        return options.filter(({ alertType }) =>
+            alertTypes.includes(alertType)
+        );
+    }, [options, subscription?.alertTypes]);
 
     return (
         <FormControl fullWidth>
@@ -59,7 +62,11 @@ const AlertTypeSelector = ({ options }: AlertTypeSelectorProps) => {
                 onChange={(_event, values) => {
                     const evaluatedValues = union(values, systemAlerts);
 
-                    setAlertTypes(evaluatedValues);
+                    setAlertTypes(
+                        evaluatedValues,
+                        subscription?.catalogPrefix,
+                        subscription?.email
+                    );
                 }}
                 options={options.sort((first, second) =>
                     basicSort_string(
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx
index 4099e53ee7..cbf1a1f199 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx
@@ -7,8 +7,7 @@ import EmailListField from 'src/components/admin/Settings/PrefixAlerts/Dialog/Em
 import { defaultOutline, defaultOutline_hovered } from 'src/context/Theme';
 
 const Details = ({
-    alertTypes,
-    email,
+    subscription,
     expanded,
     hovered,
 }: SubscriberAccordionProps) => {
@@ -19,6 +18,8 @@ const Details = ({
             ? defaultOutline_hovered[theme.palette.mode]
             : defaultOutline[theme.palette.mode];
 
+    const { email } = subscription;
+
     return (
         <AccordionDetails
             style={{
@@ -32,7 +33,7 @@ const Details = ({
             <Stack spacing={3}>
                 <EmailListField staticEmail={email} />
 
-                <AlertTypeField existingAlertTypes={alertTypes} />
+                <AlertTypeField subscription={subscription} />
             </Stack>
         </AccordionDetails>
     );
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
index c00025deb8..fd576d9c7a 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
@@ -20,8 +20,7 @@ import { defaultOutline, defaultOutlineColor_hovered } from 'src/context/Theme';
 import { sortByAlertType } from 'src/utils/misc-utils';
 
 const Summary = ({
-    alertTypes,
-    email,
+    subscription,
     expanded,
     setHovered,
 }: SubscriberSummaryProps) => {
@@ -35,6 +34,8 @@ const Summary = ({
         [alertTypeResponse.data]
     );
 
+    const { alertTypes, email } = subscription;
+
     const evaluatedAlertTypes: ChipDisplay[] = useMemo(
         () =>
             alertTypes
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
index 75b4f46868..6d6357aead 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
@@ -7,22 +7,20 @@ import { Accordion } from '@mui/material';
 import Details from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details';
 import Summary from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary';
 
-const SubscriberInfo = ({ alertTypes, email }: SubscriberInfoProps) => {
+const SubscriberInfo = ({ subscription }: SubscriberInfoProps) => {
     const [expanded, setExpanded] = useState(false);
     const [hovered, setHovered] = useState(false);
 
     return (
         <Accordion expanded={expanded} onChange={() => setExpanded(!expanded)}>
             <Summary
-                alertTypes={alertTypes}
-                email={email}
+                subscription={subscription}
                 expanded={expanded}
                 setHovered={setHovered}
             />
 
             <Details
-                alertTypes={alertTypes}
-                email={email}
+                subscription={subscription}
                 expanded={expanded}
                 hovered={hovered}
             />
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection.tsx
index 4b7cf8bcb8..557dc3bc62 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection.tsx
@@ -38,11 +38,10 @@ const SubscriberSection = () => {
             </Typography>
 
             {targetSubscriptionMetadata.subscriptions.map(
-                ({ alertTypes, catalogPrefix, email }, index) => (
+                (subscription, index) => (
                     <SubscriberInfo
-                        alertTypes={alertTypes}
-                        email={email}
-                        key={`${catalogPrefix}-${email}-${index}`}
+                        subscription={subscription}
+                        key={`${subscription.catalogPrefix}-${subscription.email}-${index}`}
                     />
                 )
             )}
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
index 5f5ca6781e..4a90a2c025 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
@@ -26,7 +26,6 @@ const TITLE_ID = 'alert-subscription-dialog-title';
 const AlertSubscriptionDialog = ({
     descriptionId,
     enableDeletion,
-    existingAlertTypes,
     headerId,
     open,
     setOpen,
diff --git a/src/components/admin/Settings/PrefixAlerts/types.ts b/src/components/admin/Settings/PrefixAlerts/types.ts
index d5935aacf9..cd053d0b61 100644
--- a/src/components/admin/Settings/PrefixAlerts/types.ts
+++ b/src/components/admin/Settings/PrefixAlerts/types.ts
@@ -23,10 +23,11 @@ export interface AlertSubscriptionResponse
 }
 
 export interface AlertTypeFieldProps {
-    existingAlertTypes?: ReducedAlertSubscription['alertTypes'];
+    subscription?: ReducedAlertSubscription;
 }
 
 export interface AlertTypeSelectorProps {
+    subscription?: ReducedAlertSubscription;
     options: AlertTypeInfo[];
 }
 
@@ -60,8 +61,7 @@ export interface PrefixFieldProps {
 }
 
 export interface SubscriberAccordionProps {
-    alertTypes: ReducedAlertSubscription['alertTypes'];
-    email: string;
+    subscription: ReducedAlertSubscription;
     hovered?: boolean;
     expanded?: boolean;
 }
diff --git a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
index d2792ff508..95cefcfc3e 100644
--- a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
@@ -9,6 +9,7 @@ import { devtools } from 'zustand/middleware';
 
 import produce from 'immer';
 
+import { hasOwnProperty } from 'src/utils/misc-utils';
 import { bundleSubscriptionsByPrefix } from 'src/utils/notification-utils';
 import { devtoolsOptions } from 'src/utils/store-utils';
 
@@ -25,7 +26,11 @@ interface AlertSubscriptionState {
     >;
     subscriptionMetadata: SubscriptionMetadataDictionary;
     resetState: () => void;
-    setAlertTypes: (values: AlertTypeInfo[], initialize?: boolean) => void;
+    setAlertTypes: (
+        values: AlertTypeInfo[],
+        catalogPrefix?: string,
+        email?: string
+    ) => void;
     setEmailErrorsExist: (
         value: AlertSubscriptionState['emailErrorsExist']
     ) => void;
@@ -66,18 +71,69 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
         return {
             ...getInitialState(),
 
-            resetState: () => set(getInitialState(), false, 'state reset'),
+            resetState: () =>
+                set(
+                    produce((state: AlertSubscriptionState) => {
+                        return {
+                            ...getInitialState(),
+                            subscriptionMetadata: state.subscriptionMetadata,
+                        };
+                    }),
+                    false,
+                    'state reset'
+                ),
 
-            setAlertTypes: (values, initialize) =>
+            setAlertTypes: (values, catalogPrefix, email) =>
                 set(
                     produce((state: AlertSubscriptionState) => {
-                        if (initialize) {
-                            state.alertTypes = values;
-                        } else {
-                            state.subscription.alertTypes = values.map(
-                                ({ alertType: name }) => name
-                            );
+                        if (!catalogPrefix || !email) {
+                            return;
+                        }
+
+                        const alertTypes = values.map(
+                            ({ alertType: name }) => name
+                        );
+
+                        if (
+                            catalogPrefix.length === 0 ||
+                            !hasOwnProperty(
+                                state.subscriptionMetadata,
+                                catalogPrefix
+                            )
+                        ) {
+                            state.subscriptionMetadata[catalogPrefix] = {
+                                settings: {},
+                                subscriptions: [
+                                    { alertTypes, catalogPrefix, email },
+                                ],
+                            };
+
+                            return;
                         }
+
+                        const existingSubscriptions =
+                            state.subscriptionMetadata[catalogPrefix]
+                                .subscriptions;
+
+                        const targetIndex = existingSubscriptions.findIndex(
+                            (subscription) => subscription.email === email
+                        );
+
+                        if (targetIndex === -1) {
+                            state.subscriptionMetadata[catalogPrefix] = {
+                                settings: {},
+                                subscriptions: [
+                                    ...existingSubscriptions,
+                                    { alertTypes, catalogPrefix, email },
+                                ],
+                            };
+
+                            return;
+                        }
+
+                        state.subscriptionMetadata[catalogPrefix].subscriptions[
+                            targetIndex
+                        ].alertTypes = alertTypes;
                     }),
                     false,
                     'alert types set'

From 9c6f3259585088da8357363d84feaed6582abf51 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Wed, 13 May 2026 09:59:28 -0400
Subject: [PATCH 05/70] Consolidate CSS border styles for subscriber accordion
 components

---
 .../Dialog/SubscriberInfo/Details.tsx         | 19 +---------
 .../Dialog/SubscriberInfo/Summary.tsx         | 22 +----------
 .../Dialog/SubscriberInfo/index.tsx           | 37 ++++++++++++-------
 .../admin/Settings/PrefixAlerts/types.ts      |  6 +--
 4 files changed, 28 insertions(+), 56 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx
index cbf1a1f199..3d0f86c6ce 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx
@@ -1,31 +1,16 @@
 import type { SubscriberAccordionProps } from 'src/components/admin/Settings/PrefixAlerts/types';
 
-import { AccordionDetails, Stack, useTheme } from '@mui/material';
+import { AccordionDetails, Stack } from '@mui/material';
 
 import AlertTypeField from 'src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeField';
 import EmailListField from 'src/components/admin/Settings/PrefixAlerts/Dialog/EmailListField';
-import { defaultOutline, defaultOutline_hovered } from 'src/context/Theme';
-
-const Details = ({
-    subscription,
-    expanded,
-    hovered,
-}: SubscriberAccordionProps) => {
-    const theme = useTheme();
-
-    const borderStyle =
-        hovered && expanded
-            ? defaultOutline_hovered[theme.palette.mode]
-            : defaultOutline[theme.palette.mode];
 
+const Details = ({ subscription }: SubscriberAccordionProps) => {
     const { email } = subscription;
 
     return (
         <AccordionDetails
             style={{
-                borderBottom: borderStyle,
-                borderLeft: borderStyle,
-                borderRight: borderStyle,
                 borderBottomLeftRadius: '6px',
                 borderBottomRightRadius: '6px',
             }}
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
index fd576d9c7a..d9b263f53d 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
@@ -1,4 +1,4 @@
-import type { SubscriberSummaryProps } from 'src/components/admin/Settings/PrefixAlerts/types';
+import type { SubscriberAccordionProps } from 'src/components/admin/Settings/PrefixAlerts/types';
 import type { ChipDisplay } from 'src/components/shared/ChipList/types';
 import type { AlertTypeInfo } from 'src/gql-types/graphql';
 
@@ -16,14 +16,9 @@ import { NavArrowDown } from 'iconoir-react';
 
 import ChipList from 'src/components/shared/ChipList';
 import { useGetAlertTypes } from 'src/context/AlertType';
-import { defaultOutline, defaultOutlineColor_hovered } from 'src/context/Theme';
 import { sortByAlertType } from 'src/utils/misc-utils';
 
-const Summary = ({
-    subscription,
-    expanded,
-    setHovered,
-}: SubscriberSummaryProps) => {
+const Summary = ({ expanded, subscription }: SubscriberAccordionProps) => {
     const theme = useTheme();
 
     const [alertTypeResponse] = useGetAlertTypes();
@@ -68,22 +63,9 @@ const Summary = ({
             expandIcon={
                 <NavArrowDown style={{ color: theme.palette.text.primary }} />
             }
-            onMouseOver={() => setHovered(true)}
-            onMouseOut={() => setHovered(false)}
             sx={{
-                'backgroundColor':
-                    theme.palette.mode === 'dark' ? 'transparent' : 'white',
-                'border': defaultOutline[theme.palette.mode],
-                'borderBottom': expanded ? 'none' : undefined,
-                'borderRadius': 3,
-                'borderBottomLeftRadius': expanded ? 'unset' : undefined,
-                'borderBottomRightRadius': expanded ? 'unset' : undefined,
                 'minHeight': 40,
                 'px': 1,
-                '&:hover': {
-                    borderColor:
-                        defaultOutlineColor_hovered[theme.palette.mode],
-                },
                 '&:hover::after': {
                     backgroundColor: 'transparent',
                 },
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
index 6d6357aead..1ea4913204 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
@@ -2,28 +2,37 @@ import type { SubscriberInfoProps } from 'src/components/admin/Settings/PrefixAl
 
 import { useState } from 'react';
 
-import { Accordion } from '@mui/material';
+import { Accordion, useTheme } from '@mui/material';
 
 import Details from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details';
 import Summary from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary';
+import { defaultOutline, defaultOutlineColor_hovered } from 'src/context/Theme';
 
 const SubscriberInfo = ({ subscription }: SubscriberInfoProps) => {
+    const theme = useTheme();
+
     const [expanded, setExpanded] = useState(false);
-    const [hovered, setHovered] = useState(false);
 
     return (
-        <Accordion expanded={expanded} onChange={() => setExpanded(!expanded)}>
-            <Summary
-                subscription={subscription}
-                expanded={expanded}
-                setHovered={setHovered}
-            />
-
-            <Details
-                subscription={subscription}
-                expanded={expanded}
-                hovered={hovered}
-            />
+        <Accordion
+            expanded={expanded}
+            onChange={() => setExpanded(!expanded)}
+            sx={{
+                'backgroundColor':
+                    theme.palette.mode === 'dark' ? 'transparent' : 'white',
+                'border': defaultOutline[theme.palette.mode],
+                '&:hover': {
+                    borderColor:
+                        defaultOutlineColor_hovered[theme.palette.mode],
+                },
+                [`&:first-of-type`]: {
+                    borderRadius: '6px',
+                },
+            }}
+        >
+            <Summary subscription={subscription} expanded={expanded} />
+
+            <Details subscription={subscription} />
         </Accordion>
     );
 };
diff --git a/src/components/admin/Settings/PrefixAlerts/types.ts b/src/components/admin/Settings/PrefixAlerts/types.ts
index cd053d0b61..d80008ec12 100644
--- a/src/components/admin/Settings/PrefixAlerts/types.ts
+++ b/src/components/admin/Settings/PrefixAlerts/types.ts
@@ -62,16 +62,12 @@ export interface PrefixFieldProps {
 
 export interface SubscriberAccordionProps {
     subscription: ReducedAlertSubscription;
-    hovered?: boolean;
     expanded?: boolean;
 }
 
 export interface SubscriberInfoProps
-    extends Omit<SubscriberAccordionProps, 'expanded' | 'hovered'> {}
+    extends Omit<SubscriberAccordionProps, 'expanded'> {}
 
-export interface SubscriberSummaryProps extends SubscriberAccordionProps {
-    setHovered: Dispatch<SetStateAction<boolean>>;
-}
 export interface SubscriptionMetadata {
     settings: GlobalSettingDictionary;
     subscriptions: ReducedAlertSubscription[];

From bbddfe5f6f32c0a1d8e7278c297194814200f2ed Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Wed, 13 May 2026 10:21:04 -0400
Subject: [PATCH 06/70] Move accordion expand arrow from right to left

---
 .../Dialog/SubscriberInfo/Details.tsx         |  3 +-
 .../Dialog/SubscriberInfo/Summary.tsx         | 36 ++++++++++++-------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx
index 3d0f86c6ce..4398d7ff47 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx
@@ -11,8 +11,7 @@ const Details = ({ subscription }: SubscriberAccordionProps) => {
     return (
         <AccordionDetails
             style={{
-                borderBottomLeftRadius: '6px',
-                borderBottomRightRadius: '6px',
+                paddingLeft: 32,
             }}
         >
             <Stack spacing={3}>
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
index d9b263f53d..ae1e87d6c2 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
@@ -7,12 +7,13 @@ import { useMemo } from 'react';
 import {
     AccordionSummary,
     accordionSummaryClasses,
+    Box,
     Stack,
     Typography,
     useTheme,
 } from '@mui/material';
 
-import { NavArrowDown } from 'iconoir-react';
+import { NavArrowDown, NavArrowRight } from 'iconoir-react';
 
 import ChipList from 'src/components/shared/ChipList';
 import { useGetAlertTypes } from 'src/context/AlertType';
@@ -60,9 +61,6 @@ const Summary = ({ expanded, subscription }: SubscriberAccordionProps) => {
 
     return (
         <AccordionSummary
-            expandIcon={
-                <NavArrowDown style={{ color: theme.palette.text.primary }} />
-            }
             sx={{
                 'minHeight': 40,
                 'px': 1,
@@ -82,16 +80,30 @@ const Summary = ({ expanded, subscription }: SubscriberAccordionProps) => {
             }}
         >
             <Stack spacing="2px" style={{ marginRight: 24 }}>
-                <Typography style={{ fontWeight: 500, paddingLeft: 12 }}>
-                    {email}
-                </Typography>
+                <Stack direction="row">
+                    {expanded ? (
+                        <NavArrowDown
+                            style={{ color: theme.palette.text.primary }}
+                        />
+                    ) : (
+                        <NavArrowRight
+                            style={{ color: theme.palette.text.primary }}
+                        />
+                    )}
+
+                    <Typography style={{ fontWeight: 500, paddingLeft: 4 }}>
+                        {email}
+                    </Typography>
+                </Stack>
 
                 {expanded ? null : (
-                    <ChipList
-                        maxChips={3}
-                        stripPath={false}
-                        values={evaluatedAlertTypes}
-                    />
+                    <Box style={{ paddingLeft: 12 }}>
+                        <ChipList
+                            maxChips={3}
+                            stripPath={false}
+                            values={evaluatedAlertTypes}
+                        />
+                    </Box>
                 )}
             </Stack>
         </AccordionSummary>

From fd90dcc3f5fbe856c02da6727a86103b7c2162ed Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Wed, 13 May 2026 10:55:11 -0400
Subject: [PATCH 07/70] Move delete button from DialogActions to accordion

---
 .../PrefixAlerts/Dialog/DeleteButton.tsx      | 20 ++++------
 .../Dialog/SubscriberInfo/Details.tsx         |  6 +--
 .../Dialog/SubscriberInfo/Summary.tsx         | 39 ++++++++++++-------
 .../Dialog/SubscriberInfo/index.tsx           |  8 ++--
 .../Settings/PrefixAlerts/Dialog/index.tsx    | 13 +------
 .../admin/Settings/PrefixAlerts/types.ts      |  3 --
 6 files changed, 40 insertions(+), 49 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
index d1a4f6a3a4..5155cdba95 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
@@ -1,16 +1,14 @@
-import type { DialogActionProps } from 'src/components/admin/Settings/PrefixAlerts/types';
+import { IconButton, useTheme } from '@mui/material';
 
-import { Button } from '@mui/material';
-
-import { useIntl } from 'react-intl';
+import { Xmark } from 'iconoir-react';
 
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
 import { useModifyAlertSubscription } from 'src/components/admin/Settings/PrefixAlerts/useModifyAlertSubscription';
 
-const DeleteButton = ({ closeDialog }: DialogActionProps) => {
-    const intl = useIntl();
+const DeleteButton = () => {
+    const theme = useTheme();
 
-    const { loading, onClick } = useModifyAlertSubscription(closeDialog, true);
+    const { loading, onClick } = useModifyAlertSubscription(() => {}, true);
 
     const prefixErrorsExist = useAlertSubscriptionsStore(
         (state) => state.prefixErrorsExist
@@ -21,8 +19,7 @@ const DeleteButton = ({ closeDialog }: DialogActionProps) => {
     );
 
     return (
-        <Button
-            color="error"
+        <IconButton
             disabled={Boolean(
                 prefixErrorsExist ||
                     loading ||
@@ -32,10 +29,9 @@ const DeleteButton = ({ closeDialog }: DialogActionProps) => {
             loading={loading}
             onClick={onClick}
             size="small"
-            variant="outlined"
         >
-            {intl.formatMessage({ id: 'cta.delete' })}
-        </Button>
+            <Xmark style={{ color: theme.palette.text.primary }} />
+        </IconButton>
     );
 };
 
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx
index 4398d7ff47..850677cefb 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx
@@ -9,11 +9,7 @@ const Details = ({ subscription }: SubscriberAccordionProps) => {
     const { email } = subscription;
 
     return (
-        <AccordionDetails
-            style={{
-                paddingLeft: 32,
-            }}
-        >
+        <AccordionDetails style={{ paddingLeft: 32, paddingRight: 32 }}>
             <Stack spacing={3}>
                 <EmailListField staticEmail={email} />
 
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
index ae1e87d6c2..54f4b0ddf7 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
@@ -15,6 +15,7 @@ import {
 
 import { NavArrowDown, NavArrowRight } from 'iconoir-react';
 
+import DeleteButton from 'src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton';
 import ChipList from 'src/components/shared/ChipList';
 import { useGetAlertTypes } from 'src/context/AlertType';
 import { sortByAlertType } from 'src/utils/misc-utils';
@@ -79,21 +80,31 @@ const Summary = ({ expanded, subscription }: SubscriberAccordionProps) => {
                 },
             }}
         >
-            <Stack spacing="2px" style={{ marginRight: 24 }}>
-                <Stack direction="row">
-                    {expanded ? (
-                        <NavArrowDown
-                            style={{ color: theme.palette.text.primary }}
-                        />
-                    ) : (
-                        <NavArrowRight
-                            style={{ color: theme.palette.text.primary }}
-                        />
-                    )}
+            <Stack style={{ width: '100%' }}>
+                <Stack
+                    direction="row"
+                    style={{
+                        alignItems: 'center',
+                        justifyContent: 'space-between',
+                    }}
+                >
+                    <Stack direction="row">
+                        {expanded ? (
+                            <NavArrowDown
+                                style={{ color: theme.palette.text.primary }}
+                            />
+                        ) : (
+                            <NavArrowRight
+                                style={{ color: theme.palette.text.primary }}
+                            />
+                        )}
+
+                        <Typography style={{ fontWeight: 500, paddingLeft: 4 }}>
+                            {email}
+                        </Typography>
+                    </Stack>
 
-                    <Typography style={{ fontWeight: 500, paddingLeft: 4 }}>
-                        {email}
-                    </Typography>
+                    <DeleteButton />
                 </Stack>
 
                 {expanded ? null : (
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
index 1ea4913204..ddf2d4d008 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
@@ -1,4 +1,4 @@
-import type { SubscriberInfoProps } from 'src/components/admin/Settings/PrefixAlerts/types';
+import type { SubscriberAccordionProps } from 'src/components/admin/Settings/PrefixAlerts/types';
 
 import { useState } from 'react';
 
@@ -8,7 +8,9 @@ import Details from 'src/components/admin/Settings/PrefixAlerts/Dialog/Subscribe
 import Summary from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary';
 import { defaultOutline, defaultOutlineColor_hovered } from 'src/context/Theme';
 
-const SubscriberInfo = ({ subscription }: SubscriberInfoProps) => {
+const SubscriberInfo = ({
+    subscription,
+}: Omit<SubscriberAccordionProps, 'expanded'>) => {
     const theme = useTheme();
 
     const [expanded, setExpanded] = useState(false);
@@ -30,7 +32,7 @@ const SubscriberInfo = ({ subscription }: SubscriberInfoProps) => {
                 },
             }}
         >
-            <Summary subscription={subscription} expanded={expanded} />
+            <Summary expanded={expanded} subscription={subscription} />
 
             <Details subscription={subscription} />
         </Accordion>
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
index 4a90a2c025..8352884155 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
@@ -12,7 +12,6 @@ import {
 import { useIntl } from 'react-intl';
 import { useUnmount } from 'react-use';
 
-import DeleteButton from 'src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton';
 import PrefixField from 'src/components/admin/Settings/PrefixAlerts/Dialog/PrefixField';
 import SaveButton from 'src/components/admin/Settings/PrefixAlerts/Dialog/SaveButton';
 import ServerErrors from 'src/components/admin/Settings/PrefixAlerts/Dialog/ServerErrors';
@@ -67,17 +66,7 @@ const AlertSubscriptionDialog = ({
                 </Stack>
             </DialogContent>
 
-            <DialogActions
-                style={{
-                    justifyContent: enableDeletion
-                        ? 'space-between'
-                        : 'flex-end',
-                }}
-            >
-                {enableDeletion ? (
-                    <DeleteButton closeDialog={() => closeDialog()} />
-                ) : null}
-
+            <DialogActions>
                 <Stack direction="row" spacing={1}>
                     <Button
                         variant="outlined"
diff --git a/src/components/admin/Settings/PrefixAlerts/types.ts b/src/components/admin/Settings/PrefixAlerts/types.ts
index d80008ec12..5ab560d806 100644
--- a/src/components/admin/Settings/PrefixAlerts/types.ts
+++ b/src/components/admin/Settings/PrefixAlerts/types.ts
@@ -65,9 +65,6 @@ export interface SubscriberAccordionProps {
     expanded?: boolean;
 }
 
-export interface SubscriberInfoProps
-    extends Omit<SubscriberAccordionProps, 'expanded'> {}
-
 export interface SubscriptionMetadata {
     settings: GlobalSettingDictionary;
     subscriptions: ReducedAlertSubscription[];

From 6280f929a356cc9b10d8322efd188442a0115cc2 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Wed, 13 May 2026 12:04:21 -0400
Subject: [PATCH 08/70] Move delete button outside Summary component

---
 .../PrefixAlerts/Dialog/DeleteButton.tsx      | 33 +++++++++++------
 .../Dialog/SubscriberInfo/Summary.tsx         | 37 +++++++------------
 .../Dialog/SubscriberInfo/index.tsx           | 15 +++++++-
 .../admin/Settings/PrefixAlerts/types.ts      |  6 ++-
 4 files changed, 52 insertions(+), 39 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
index 5155cdba95..8eadd18b3a 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
@@ -3,13 +3,11 @@ import { IconButton, useTheme } from '@mui/material';
 import { Xmark } from 'iconoir-react';
 
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
-import { useModifyAlertSubscription } from 'src/components/admin/Settings/PrefixAlerts/useModifyAlertSubscription';
+import { disabledButtonText } from 'src/context/Theme';
 
 const DeleteButton = () => {
     const theme = useTheme();
 
-    const { loading, onClick } = useModifyAlertSubscription(() => {}, true);
-
     const prefixErrorsExist = useAlertSubscriptionsStore(
         (state) => state.prefixErrorsExist
     );
@@ -18,19 +16,30 @@ const DeleteButton = () => {
         (state) => state.subscription
     );
 
+    const disabled = Boolean(
+        prefixErrorsExist ||
+            subscription.catalogPrefix.length === 0 ||
+            subscription.email.length === 0
+    );
+
     return (
         <IconButton
-            disabled={Boolean(
-                prefixErrorsExist ||
-                    loading ||
-                    subscription.catalogPrefix.length === 0 ||
-                    subscription.email.length === 0
-            )}
-            loading={loading}
-            onClick={onClick}
+            disabled={disabled}
+            onClick={() => {}}
             size="small"
+            sx={{
+                display: 'inline-flex',
+                mr: '3px',
+                mt: '4px',
+            }}
         >
-            <Xmark style={{ color: theme.palette.text.primary }} />
+            <Xmark
+                style={{
+                    color: disabled
+                        ? disabledButtonText[theme.palette.mode]
+                        : theme.palette.text.primary,
+                }}
+            />
         </IconButton>
     );
 };
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
index 54f4b0ddf7..19898f061a 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
@@ -15,7 +15,6 @@ import {
 
 import { NavArrowDown, NavArrowRight } from 'iconoir-react';
 
-import DeleteButton from 'src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton';
 import ChipList from 'src/components/shared/ChipList';
 import { useGetAlertTypes } from 'src/context/AlertType';
 import { sortByAlertType } from 'src/utils/misc-utils';
@@ -81,30 +80,20 @@ const Summary = ({ expanded, subscription }: SubscriberAccordionProps) => {
             }}
         >
             <Stack style={{ width: '100%' }}>
-                <Stack
-                    direction="row"
-                    style={{
-                        alignItems: 'center',
-                        justifyContent: 'space-between',
-                    }}
-                >
-                    <Stack direction="row">
-                        {expanded ? (
-                            <NavArrowDown
-                                style={{ color: theme.palette.text.primary }}
-                            />
-                        ) : (
-                            <NavArrowRight
-                                style={{ color: theme.palette.text.primary }}
-                            />
-                        )}
-
-                        <Typography style={{ fontWeight: 500, paddingLeft: 4 }}>
-                            {email}
-                        </Typography>
-                    </Stack>
+                <Stack direction="row">
+                    {expanded ? (
+                        <NavArrowDown
+                            style={{ color: theme.palette.text.primary }}
+                        />
+                    ) : (
+                        <NavArrowRight
+                            style={{ color: theme.palette.text.primary }}
+                        />
+                    )}
 
-                    <DeleteButton />
+                    <Typography style={{ fontWeight: 500, paddingLeft: 4 }}>
+                        {email}
+                    </Typography>
                 </Stack>
 
                 {expanded ? null : (
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
index ddf2d4d008..6538e83df4 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
@@ -2,8 +2,9 @@ import type { SubscriberAccordionProps } from 'src/components/admin/Settings/Pre
 
 import { useState } from 'react';
 
-import { Accordion, useTheme } from '@mui/material';
+import { Accordion, Stack, useTheme } from '@mui/material';
 
+import DeleteButton from 'src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton';
 import Details from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details';
 import Summary from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary';
 import { defaultOutline, defaultOutlineColor_hovered } from 'src/context/Theme';
@@ -32,7 +33,17 @@ const SubscriberInfo = ({
                 },
             }}
         >
-            <Summary expanded={expanded} subscription={subscription} />
+            <Stack
+                direction="row"
+                style={{
+                    alignItems: 'flex-start',
+                    justifyContent: 'space-between',
+                }}
+            >
+                <Summary expanded={expanded} subscription={subscription} />
+
+                <DeleteButton />
+            </Stack>
 
             <Details subscription={subscription} />
         </Accordion>
diff --git a/src/components/admin/Settings/PrefixAlerts/types.ts b/src/components/admin/Settings/PrefixAlerts/types.ts
index 5ab560d806..8592323847 100644
--- a/src/components/admin/Settings/PrefixAlerts/types.ts
+++ b/src/components/admin/Settings/PrefixAlerts/types.ts
@@ -48,6 +48,10 @@ export interface EmailListFieldProps {
     staticEmail?: string;
 }
 
+export interface MutableAlertSubscription extends ReducedAlertSubscription {
+    deleted?: boolean;
+}
+
 interface GlobalSetting {
     [property: string]: boolean | number | string;
 }
@@ -67,7 +71,7 @@ export interface SubscriberAccordionProps {
 
 export interface SubscriptionMetadata {
     settings: GlobalSettingDictionary;
-    subscriptions: ReducedAlertSubscription[];
+    subscriptions: MutableAlertSubscription[];
 }
 
 export interface SubscriptionMetadataDictionary {

From 3123e9cbf2b165c1c58dbb3b47bc417582e03749 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Thu, 14 May 2026 11:51:44 -0400
Subject: [PATCH 09/70] Placeholder: enable single subscription deletion

---
 .../PrefixAlerts/Dialog/DeleteButton.tsx      | 20 +++--
 .../Dialog/SubscriberInfo/index.tsx           |  2 +-
 .../PrefixAlerts/Dialog/SubscriberSection.tsx | 18 ++--
 .../admin/Settings/PrefixAlerts/types.ts      |  7 +-
 .../useAlertSubscriptionsStore.ts             | 88 ++++++++++++++++---
 src/components/tables/PrefixAlerts/Rows.tsx   |  2 +-
 src/utils/notification-utils.ts               |  7 +-
 7 files changed, 111 insertions(+), 33 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
index 8eadd18b3a..d2ec376e02 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
@@ -1,3 +1,5 @@
+import type { DeleteButtonProps } from 'src/components/admin/Settings/PrefixAlerts/types';
+
 import { IconButton, useTheme } from '@mui/material';
 
 import { Xmark } from 'iconoir-react';
@@ -5,27 +7,31 @@ import { Xmark } from 'iconoir-react';
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
 import { disabledButtonText } from 'src/context/Theme';
 
-const DeleteButton = () => {
+const DeleteButton = ({
+    subscription: { catalogPrefix, email, id },
+}: DeleteButtonProps) => {
     const theme = useTheme();
 
     const prefixErrorsExist = useAlertSubscriptionsStore(
         (state) => state.prefixErrorsExist
     );
 
-    const subscription = useAlertSubscriptionsStore(
-        (state) => state.subscription
+    const markSubscriptionForDeletion = useAlertSubscriptionsStore(
+        (state) => state.markSubscriptionForDeletion
     );
 
     const disabled = Boolean(
-        prefixErrorsExist ||
-            subscription.catalogPrefix.length === 0 ||
-            subscription.email.length === 0
+        prefixErrorsExist || catalogPrefix.length === 0 || email.length === 0
     );
 
     return (
         <IconButton
             disabled={disabled}
-            onClick={() => {}}
+            onClick={(event) => {
+                event.stopPropagation();
+
+                markSubscriptionForDeletion(catalogPrefix, id);
+            }}
             size="small"
             sx={{
                 display: 'inline-flex',
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
index 6538e83df4..504e365ad8 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
@@ -42,7 +42,7 @@ const SubscriberInfo = ({
             >
                 <Summary expanded={expanded} subscription={subscription} />
 
-                <DeleteButton />
+                <DeleteButton subscription={subscription} />
             </Stack>
 
             <Details subscription={subscription} />
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection.tsx
index 557dc3bc62..bcba61a973 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection.tsx
@@ -16,16 +16,16 @@ const SubscriberSection = () => {
     const catalogPrefix = useAlertSubscriptionsStore(
         (state) => state.catalogPrefix
     );
-    const subscriptionMetadata = useAlertSubscriptionsStore(
-        (state) => state.subscriptionMetadata
+    const mutableSubscriptionMetadata = useAlertSubscriptionsStore(
+        (state) => state.mutableSubscriptionMetadata
     );
 
     const targetSubscriptionMetadata: SubscriptionMetadata = useMemo(
         () =>
-            hasOwnProperty(subscriptionMetadata, catalogPrefix)
-                ? subscriptionMetadata[catalogPrefix]
+            hasOwnProperty(mutableSubscriptionMetadata, catalogPrefix)
+                ? mutableSubscriptionMetadata[catalogPrefix]
                 : { settings: {}, subscriptions: [] },
-        [catalogPrefix, subscriptionMetadata]
+        [catalogPrefix, mutableSubscriptionMetadata]
     );
 
     return (
@@ -37,14 +37,14 @@ const SubscriberSection = () => {
                 )}
             </Typography>
 
-            {targetSubscriptionMetadata.subscriptions.map(
-                (subscription, index) => (
+            {targetSubscriptionMetadata.subscriptions
+                .filter(({ deleted }) => !deleted)
+                .map((subscription, index) => (
                     <SubscriberInfo
                         subscription={subscription}
                         key={`${subscription.catalogPrefix}-${subscription.email}-${index}`}
                     />
-                )
-            )}
+                ))}
         </Stack>
     );
 };
diff --git a/src/components/admin/Settings/PrefixAlerts/types.ts b/src/components/admin/Settings/PrefixAlerts/types.ts
index 8592323847..af8d5b9205 100644
--- a/src/components/admin/Settings/PrefixAlerts/types.ts
+++ b/src/components/admin/Settings/PrefixAlerts/types.ts
@@ -31,6 +31,10 @@ export interface AlertTypeSelectorProps {
     options: AlertTypeInfo[];
 }
 
+export interface DeleteButtonProps {
+    subscription: MutableAlertSubscription;
+}
+
 export interface DialogActionProps {
     closeDialog: () => void;
 }
@@ -49,6 +53,7 @@ export interface EmailListFieldProps {
 }
 
 export interface MutableAlertSubscription extends ReducedAlertSubscription {
+    id: string;
     deleted?: boolean;
 }
 
@@ -65,7 +70,7 @@ export interface PrefixFieldProps {
 }
 
 export interface SubscriberAccordionProps {
-    subscription: ReducedAlertSubscription;
+    subscription: MutableAlertSubscription;
     expanded?: boolean;
 }
 
diff --git a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
index 95cefcfc3e..362461d54e 100644
--- a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
@@ -8,6 +8,7 @@ import { create } from 'zustand';
 import { devtools } from 'zustand/middleware';
 
 import produce from 'immer';
+import { cloneDeep } from 'lodash';
 
 import { hasOwnProperty } from 'src/utils/misc-utils';
 import { bundleSubscriptionsByPrefix } from 'src/utils/notification-utils';
@@ -18,6 +19,12 @@ interface AlertSubscriptionState {
     catalogPrefix: string;
     emailErrorsExist: boolean;
     initializationError: CombinedError | PostgrestError | null | undefined;
+    initializeMutableSubscriptionMetadata: () => void;
+    markSubscriptionForDeletion: (
+        catalogPrefix: string,
+        subscriptionId: string
+    ) => void;
+    mutableSubscriptionMetadata: SubscriptionMetadataDictionary;
     prefixErrorsExist: boolean;
     saveErrors: (CombinedError | PostgrestError | null | undefined)[];
     subscription: Pick<
@@ -49,6 +56,7 @@ const getInitialState = (): Pick<
     | 'catalogPrefix'
     | 'emailErrorsExist'
     | 'initializationError'
+    | 'mutableSubscriptionMetadata'
     | 'prefixErrorsExist'
     | 'saveErrors'
     | 'subscription'
@@ -58,6 +66,7 @@ const getInitialState = (): Pick<
     catalogPrefix: '',
     emailErrorsExist: false,
     initializationError: null,
+    mutableSubscriptionMetadata: {},
     prefixErrorsExist: false,
     saveErrors: [],
     subscription: { alertTypes: [], catalogPrefix: '', email: '' },
@@ -71,6 +80,51 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
         return {
             ...getInitialState(),
 
+            initializeMutableSubscriptionMetadata: () =>
+                set(
+                    produce((state: AlertSubscriptionState) => {
+                        state.mutableSubscriptionMetadata = cloneDeep(
+                            state.subscriptionMetadata
+                        );
+                    }),
+                    false,
+                    'mutable subscription metadata initialized'
+                ),
+
+            markSubscriptionForDeletion: (catalogPrefix, subscriptionId) =>
+                set(
+                    produce((state: AlertSubscriptionState) => {
+                        if (
+                            !catalogPrefix ||
+                            !subscriptionId ||
+                            !hasOwnProperty(
+                                state.mutableSubscriptionMetadata,
+                                catalogPrefix
+                            )
+                        ) {
+                            return;
+                        }
+
+                        const subscriptionIndex =
+                            state.mutableSubscriptionMetadata[
+                                catalogPrefix
+                            ].subscriptions.findIndex(
+                                (subscription) =>
+                                    subscription.id === subscriptionId
+                            );
+
+                        if (subscriptionIndex === -1) {
+                            return;
+                        }
+
+                        state.mutableSubscriptionMetadata[
+                            catalogPrefix
+                        ].subscriptions[subscriptionIndex].deleted = true;
+                    }),
+                    false,
+                    'mark subscription for deletion'
+                ),
+
             resetState: () =>
                 set(
                     produce((state: AlertSubscriptionState) => {
@@ -97,43 +151,53 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                         if (
                             catalogPrefix.length === 0 ||
                             !hasOwnProperty(
-                                state.subscriptionMetadata,
+                                state.mutableSubscriptionMetadata,
                                 catalogPrefix
                             )
                         ) {
-                            state.subscriptionMetadata[catalogPrefix] = {
+                            state.mutableSubscriptionMetadata[catalogPrefix] = {
                                 settings: {},
                                 subscriptions: [
-                                    { alertTypes, catalogPrefix, email },
+                                    {
+                                        alertTypes,
+                                        catalogPrefix,
+                                        email,
+                                        id: crypto.randomUUID(),
+                                    },
                                 ],
                             };
 
                             return;
                         }
 
-                        const existingSubscriptions =
-                            state.subscriptionMetadata[catalogPrefix]
+                        const targetSubscriptions =
+                            state.mutableSubscriptionMetadata[catalogPrefix]
                                 .subscriptions;
 
-                        const targetIndex = existingSubscriptions.findIndex(
+                        const targetIndex = targetSubscriptions.findIndex(
                             (subscription) => subscription.email === email
                         );
 
                         if (targetIndex === -1) {
-                            state.subscriptionMetadata[catalogPrefix] = {
+                            state.mutableSubscriptionMetadata[catalogPrefix] = {
                                 settings: {},
                                 subscriptions: [
-                                    ...existingSubscriptions,
-                                    { alertTypes, catalogPrefix, email },
+                                    ...targetSubscriptions,
+                                    {
+                                        alertTypes,
+                                        catalogPrefix,
+                                        email,
+                                        id: crypto.randomUUID(),
+                                    },
                                 ],
                             };
 
                             return;
                         }
 
-                        state.subscriptionMetadata[catalogPrefix].subscriptions[
-                            targetIndex
-                        ].alertTypes = alertTypes;
+                        state.mutableSubscriptionMetadata[
+                            catalogPrefix
+                        ].subscriptions[targetIndex].alertTypes = alertTypes;
                     }),
                     false,
                     'alert types set'
diff --git a/src/components/tables/PrefixAlerts/Rows.tsx b/src/components/tables/PrefixAlerts/Rows.tsx
index f7d809faab..ec0c6e0aef 100644
--- a/src/components/tables/PrefixAlerts/Rows.tsx
+++ b/src/components/tables/PrefixAlerts/Rows.tsx
@@ -62,7 +62,7 @@ function Rows({ alertTypeDefs, data }: RowsProps) {
             {data.map((datum, index) => (
                 <Row
                     alertTypeDefs={alertTypeDefs}
-                    key={`${datum.subscriptions[0].catalogPrefix}-${index}`}
+                    key={`${datum.subscriptions[0].id}-${index}`}
                     row={datum}
                 />
             ))}
diff --git a/src/utils/notification-utils.ts b/src/utils/notification-utils.ts
index ddbb7475a7..35ca552d62 100644
--- a/src/utils/notification-utils.ts
+++ b/src/utils/notification-utils.ts
@@ -20,11 +20,14 @@ export const bundleSubscriptionsByPrefix = (
         const { catalogPrefix } = query;
 
         if (Object.hasOwn(subscriptionMetadata, catalogPrefix)) {
-            subscriptionMetadata[catalogPrefix].subscriptions.push(query);
+            subscriptionMetadata[catalogPrefix].subscriptions.push({
+                ...query,
+                id: crypto.randomUUID(),
+            });
         } else {
             subscriptionMetadata[catalogPrefix] = {
                 settings: {},
-                subscriptions: [query],
+                subscriptions: [{ ...query, id: crypto.randomUUID() }],
             };
         }
     });

From ecf6e69bab8bd4c4924392b04a012a77bd899913 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Thu, 14 May 2026 13:06:40 -0400
Subject: [PATCH 10/70] Initialize mutable subscription metadata state on
 dialog open

---
 .../admin/Settings/PrefixAlerts/Dialog/index.tsx      | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
index 8352884155..7fe227c9fe 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
@@ -1,5 +1,7 @@
 import type { AlertSubscriptionDialogProps } from 'src/components/admin/Settings/PrefixAlerts/types';
 
+import { useEffect } from 'react';
+
 import {
     Box,
     Button,
@@ -33,6 +35,9 @@ const AlertSubscriptionDialog = ({
 }: AlertSubscriptionDialogProps) => {
     const intl = useIntl();
 
+    const initializeMutableSubscriptionMetadata = useAlertSubscriptionsStore(
+        (state) => state.initializeMutableSubscriptionMetadata
+    );
     const resetSubscriptionState = useAlertSubscriptionsStore(
         (state) => state.resetState
     );
@@ -42,6 +47,12 @@ const AlertSubscriptionDialog = ({
         resetSubscriptionState();
     };
 
+    useEffect(() => {
+        if (open) {
+            initializeMutableSubscriptionMetadata();
+        }
+    }, [initializeMutableSubscriptionMetadata, open]);
+
     useUnmount(() => {
         resetSubscriptionState();
     });

From 5549ba7c94c03f1c80fd4afafa3ec514db5e1893 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Thu, 14 May 2026 14:18:08 -0400
Subject: [PATCH 11/70] Enable subscription email editing

---
 .../PrefixAlerts/Dialog/DeleteButton.tsx      |  4 +-
 .../PrefixAlerts/Dialog/EmailListField.tsx    | 12 ++-
 .../Dialog/SubscriberInfo/Details.tsx         |  4 +-
 .../Dialog/SubscriberInfo/index.tsx           | 16 ++--
 .../Settings/PrefixAlerts/Dialog/index.tsx    |  1 -
 .../Settings/PrefixAlerts/EmailSelector.tsx   | 55 +++++++----
 .../admin/Settings/PrefixAlerts/types.ts      | 22 ++---
 .../useAlertSubscriptionsStore.ts             | 92 ++++++++++++++-----
 src/utils/notification-utils.ts               |  5 +-
 9 files changed, 138 insertions(+), 73 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
index d2ec376e02..bb4845e6c7 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
@@ -1,4 +1,4 @@
-import type { DeleteButtonProps } from 'src/components/admin/Settings/PrefixAlerts/types';
+import type { SubscriptionDependentProps } from 'src/components/admin/Settings/PrefixAlerts/types';
 
 import { IconButton, useTheme } from '@mui/material';
 
@@ -9,7 +9,7 @@ import { disabledButtonText } from 'src/context/Theme';
 
 const DeleteButton = ({
     subscription: { catalogPrefix, email, id },
-}: DeleteButtonProps) => {
+}: SubscriptionDependentProps) => {
     const theme = useTheme();
 
     const prefixErrorsExist = useAlertSubscriptionsStore(
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/EmailListField.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/EmailListField.tsx
index 6c42c84b92..be678920fd 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/EmailListField.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/EmailListField.tsx
@@ -6,14 +6,11 @@ import { useIntl } from 'react-intl';
 
 import EmailSelector from 'src/components/admin/Settings/PrefixAlerts/EmailSelector';
 
-const EmailListField = ({ staticEmail }: EmailListFieldProps) => {
+const EmailListField = ({ subscription, staticEmail }: EmailListFieldProps) => {
     const intl = useIntl();
 
     return staticEmail ? (
         <TextField
-            InputProps={{
-                sx: { borderRadius: 3 },
-            }}
             disabled
             fullWidth
             label={intl.formatMessage({
@@ -21,11 +18,16 @@ const EmailListField = ({ staticEmail }: EmailListFieldProps) => {
             })}
             required
             size="small"
+            slotProps={{
+                input: {
+                    sx: { borderRadius: 3 },
+                },
+            }}
             value={staticEmail}
             variant="outlined"
         />
     ) : (
-        <EmailSelector />
+        <EmailSelector subscription={subscription} />
     );
 };
 
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx
index 850677cefb..a0e5812bcf 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx
@@ -6,12 +6,10 @@ import AlertTypeField from 'src/components/admin/Settings/PrefixAlerts/Dialog/Al
 import EmailListField from 'src/components/admin/Settings/PrefixAlerts/Dialog/EmailListField';
 
 const Details = ({ subscription }: SubscriberAccordionProps) => {
-    const { email } = subscription;
-
     return (
         <AccordionDetails style={{ paddingLeft: 32, paddingRight: 32 }}>
             <Stack spacing={3}>
-                <EmailListField staticEmail={email} />
+                <EmailListField subscription={subscription} />
 
                 <AlertTypeField subscription={subscription} />
             </Stack>
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
index 504e365ad8..03d99992be 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
@@ -1,12 +1,11 @@
 import type { SubscriberAccordionProps } from 'src/components/admin/Settings/PrefixAlerts/types';
 
-import { useState } from 'react';
-
 import { Accordion, Stack, useTheme } from '@mui/material';
 
 import DeleteButton from 'src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton';
 import Details from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details';
 import Summary from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary';
+import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
 import { defaultOutline, defaultOutlineColor_hovered } from 'src/context/Theme';
 
 const SubscriberInfo = ({
@@ -14,12 +13,14 @@ const SubscriberInfo = ({
 }: Omit<SubscriberAccordionProps, 'expanded'>) => {
     const theme = useTheme();
 
-    const [expanded, setExpanded] = useState(false);
+    const toggleSubscriptionViewingStatus = useAlertSubscriptionsStore(
+        (state) => state.toggleSubscriptionViewingStatus
+    );
 
     return (
         <Accordion
-            expanded={expanded}
-            onChange={() => setExpanded(!expanded)}
+            expanded={subscription.viewing}
+            onChange={() => toggleSubscriptionViewingStatus(subscription.id)}
             sx={{
                 'backgroundColor':
                     theme.palette.mode === 'dark' ? 'transparent' : 'white',
@@ -40,7 +41,10 @@ const SubscriberInfo = ({
                     justifyContent: 'space-between',
                 }}
             >
-                <Summary expanded={expanded} subscription={subscription} />
+                <Summary
+                    expanded={subscription.viewing}
+                    subscription={subscription}
+                />
 
                 <DeleteButton subscription={subscription} />
             </Stack>
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
index 7fe227c9fe..0158dc9b42 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
@@ -30,7 +30,6 @@ const AlertSubscriptionDialog = ({
     headerId,
     open,
     setOpen,
-    staticEmail,
     staticPrefix,
 }: AlertSubscriptionDialogProps) => {
     const intl = useIntl();
diff --git a/src/components/admin/Settings/PrefixAlerts/EmailSelector.tsx b/src/components/admin/Settings/PrefixAlerts/EmailSelector.tsx
index d0e173949a..b390be1139 100644
--- a/src/components/admin/Settings/PrefixAlerts/EmailSelector.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/EmailSelector.tsx
@@ -1,4 +1,5 @@
 import type { AutocompleteRenderInputParams } from '@mui/material';
+import type { SubscriptionDependentProps } from 'src/components/admin/Settings/PrefixAlerts/types';
 import type { Grant_UserExt } from 'src/types';
 
 import { useEffect, useMemo, useState } from 'react';
@@ -31,17 +32,21 @@ const sanitizeEmail = (value: string) => {
     return value.trim();
 };
 
-function EmailSelector() {
+// TODO: Investigate an issue that prevents the list of admin email from
+//   being displayed as options. Confirm this is not an existing issue in
+//   production.
+function EmailSelector({
+    subscription: { email: subscribedEmail, id: subscriptionId },
+}: SubscriptionDependentProps) {
     const intl = useIntl();
 
     const serverError = useAlertSubscriptionsStore(
         (state) => state.initializationError
     );
-    const [prefix, subscribedEmail, setSubscribedEmail, setEmailErrorsExist] =
+    const [prefix, setSubscribedEmail, setEmailErrorsExist] =
         useAlertSubscriptionsStore(
             useShallow((state) => [
-                state.subscription.catalogPrefix,
-                state.subscription.email,
+                state.catalogPrefix,
                 state.setSubscribedEmail,
                 state.setEmailErrorsExist,
             ])
@@ -107,7 +112,7 @@ function EmailSelector() {
                 }}
                 onChange={(_event, value, reason) => {
                     if (!value) {
-                        setSubscribedEmail('');
+                        setSubscribedEmail('', subscriptionId);
 
                         return;
                     }
@@ -125,12 +130,12 @@ function EmailSelector() {
                     setSubscribedEmail(
                         typeof value === 'string'
                             ? sanitizeEmail(value)
-                            : value.user_email
+                            : value.user_email,
+                        subscriptionId
                     );
                 }}
                 onInputChange={(_event, value) => {
                     setInputValue(value);
-                    setSubscribedEmail(sanitizeEmail(value));
                 }}
                 options={userInfo as Option[]}
                 renderInput={({
@@ -139,16 +144,23 @@ function EmailSelector() {
                 }: AutocompleteRenderInputParams) => (
                     <TextField
                         {...params}
-                        InputProps={{
-                            ...InputProps,
-                            sx: { borderRadius: 3 },
-                        }}
                         error={inputErrorExists}
                         label={intl.formatMessage({
                             id: 'data.email',
                         })}
+                        onBlur={(_event) => {
+                            setSubscribedEmail(
+                                sanitizeEmail(inputValue),
+                                subscriptionId
+                            );
+                        }}
                         required
                         size="small"
+                        slotProps={{
+                            input: {
+                                sx: { borderRadius: 3 },
+                            },
+                        }}
                         variant="outlined"
                     />
                 )}
@@ -175,16 +187,19 @@ function EmailSelector() {
                                     <ListItemText
                                         primary={option.user_full_name}
                                         secondary={option.user_email}
-                                        primaryTypographyProps={{
-                                            sx: {
-                                                fontWeight: 500,
-                                                fontSize: 16,
+                                        slotProps={{
+                                            primary: {
+                                                sx: {
+                                                    fontWeight: 500,
+                                                    fontSize: 16,
+                                                },
                                             },
-                                        }}
-                                        secondaryTypographyProps={{
-                                            sx: {
-                                                color: (theme) =>
-                                                    theme.palette.text.primary,
+                                            secondary: {
+                                                sx: {
+                                                    color: (theme) =>
+                                                        theme.palette.text
+                                                            .primary,
+                                                },
                                             },
                                         }}
                                         sx={{ ml: 2 }}
diff --git a/src/components/admin/Settings/PrefixAlerts/types.ts b/src/components/admin/Settings/PrefixAlerts/types.ts
index af8d5b9205..5dde41c42f 100644
--- a/src/components/admin/Settings/PrefixAlerts/types.ts
+++ b/src/components/admin/Settings/PrefixAlerts/types.ts
@@ -4,10 +4,7 @@ import type { ReducedAlertSubscription } from 'src/api/types';
 import type { AlertTypeInfo } from 'src/gql-types/graphql';
 import type { BaseAlertSubscriptionMutationInput } from 'src/types/gql';
 
-export interface AlertSubscriptionDialogProps
-    extends AlertTypeFieldProps,
-        EmailListFieldProps,
-        PrefixFieldProps {
+export interface AlertSubscriptionDialogProps extends PrefixFieldProps {
     descriptionId: string;
     headerId: string;
     open: boolean;
@@ -22,19 +19,15 @@ export interface AlertSubscriptionResponse
     invalid?: boolean;
 }
 
+// TODO: Remove and replace type with instance of SubscriptionDependentProps.
 export interface AlertTypeFieldProps {
-    subscription?: ReducedAlertSubscription;
+    subscription: MutableAlertSubscription;
 }
 
-export interface AlertTypeSelectorProps {
-    subscription?: ReducedAlertSubscription;
+export interface AlertTypeSelectorProps extends AlertTypeFieldProps {
     options: AlertTypeInfo[];
 }
 
-export interface DeleteButtonProps {
-    subscription: MutableAlertSubscription;
-}
-
 export interface DialogActionProps {
     closeDialog: () => void;
 }
@@ -48,12 +41,13 @@ export interface EmailDictionary {
     [prefix: string]: string[];
 }
 
-export interface EmailListFieldProps {
+export interface EmailListFieldProps extends SubscriptionDependentProps {
     staticEmail?: string;
 }
 
 export interface MutableAlertSubscription extends ReducedAlertSubscription {
     id: string;
+    viewing: boolean;
     deleted?: boolean;
 }
 
@@ -74,6 +68,10 @@ export interface SubscriberAccordionProps {
     expanded?: boolean;
 }
 
+export interface SubscriptionDependentProps {
+    subscription: MutableAlertSubscription;
+}
+
 export interface SubscriptionMetadata {
     settings: GlobalSettingDictionary;
     subscriptions: MutableAlertSubscription[];
diff --git a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
index 362461d54e..f722e6ab27 100644
--- a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
@@ -45,11 +45,32 @@ interface AlertSubscriptionState {
         value: AlertSubscriptionState['initializationError']
     ) => void;
     setSaveErrors: (value: AlertSubscriptionState['saveErrors']) => void;
-    setSubscribedEmail: (value: string) => void;
+    setSubscribedEmail: (value: string, subscriptionId: string) => void;
     setSubscribedPrefix: (value: string, errors: string | null) => void;
     setSubscriptionMetadata: (value: ReducedAlertSubscription[]) => void;
+    toggleSubscriptionViewingStatus: (subscriptionId: string) => void;
 }
 
+const getMutableSubscriptionIndex = (
+    state: AlertSubscriptionState | Partial<AlertSubscriptionState>,
+    subscriptionId: string
+): number => {
+    if (
+        !state.catalogPrefix ||
+        !subscriptionId ||
+        !state?.mutableSubscriptionMetadata ||
+        !hasOwnProperty(state.mutableSubscriptionMetadata, state.catalogPrefix)
+    ) {
+        return -1;
+    }
+
+    return state.mutableSubscriptionMetadata[
+        state.catalogPrefix
+    ].subscriptions.findIndex(
+        (subscription) => subscription.id === subscriptionId
+    );
+};
+
 const getInitialState = (): Pick<
     AlertSubscriptionState,
     | 'alertTypes'
@@ -91,34 +112,20 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                     'mutable subscription metadata initialized'
                 ),
 
-            markSubscriptionForDeletion: (catalogPrefix, subscriptionId) =>
+            markSubscriptionForDeletion: (_catalogPrefix, subscriptionId) =>
                 set(
                     produce((state: AlertSubscriptionState) => {
-                        if (
-                            !catalogPrefix ||
-                            !subscriptionId ||
-                            !hasOwnProperty(
-                                state.mutableSubscriptionMetadata,
-                                catalogPrefix
-                            )
-                        ) {
-                            return;
-                        }
-
-                        const subscriptionIndex =
-                            state.mutableSubscriptionMetadata[
-                                catalogPrefix
-                            ].subscriptions.findIndex(
-                                (subscription) =>
-                                    subscription.id === subscriptionId
-                            );
+                        const subscriptionIndex = getMutableSubscriptionIndex(
+                            state,
+                            subscriptionId
+                        );
 
                         if (subscriptionIndex === -1) {
                             return;
                         }
 
                         state.mutableSubscriptionMetadata[
-                            catalogPrefix
+                            state.catalogPrefix
                         ].subscriptions[subscriptionIndex].deleted = true;
                     }),
                     false,
@@ -163,6 +170,7 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                                         catalogPrefix,
                                         email,
                                         id: crypto.randomUUID(),
+                                        viewing: true,
                                     },
                                 ],
                             };
@@ -188,6 +196,7 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                                         catalogPrefix,
                                         email,
                                         id: crypto.randomUUID(),
+                                        viewing: true,
                                     },
                                 ],
                             };
@@ -230,10 +239,21 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                     'save errors set'
                 ),
 
-            setSubscribedEmail: (value) =>
+            setSubscribedEmail: (value, subscriptionId) =>
                 set(
                     produce((state: AlertSubscriptionState) => {
-                        state.subscription.email = value;
+                        const subscriptionIndex = getMutableSubscriptionIndex(
+                            state,
+                            subscriptionId
+                        );
+
+                        if (subscriptionIndex === -1) {
+                            return;
+                        }
+
+                        state.mutableSubscriptionMetadata[
+                            state.catalogPrefix
+                        ].subscriptions[subscriptionIndex].email = value;
                     }),
                     false,
                     'subscribed email set'
@@ -259,6 +279,32 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                     false,
                     'subscription metadata set'
                 ),
+
+            toggleSubscriptionViewingStatus: (subscriptionId) =>
+                set(
+                    produce((state: AlertSubscriptionState) => {
+                        const subscriptionIndex = getMutableSubscriptionIndex(
+                            state,
+                            subscriptionId
+                        );
+
+                        if (subscriptionIndex === -1) {
+                            return;
+                        }
+
+                        const previousValue =
+                            state.mutableSubscriptionMetadata[
+                                state.catalogPrefix
+                            ].subscriptions[subscriptionIndex].viewing;
+
+                        state.mutableSubscriptionMetadata[
+                            state.catalogPrefix
+                        ].subscriptions[subscriptionIndex].viewing =
+                            !previousValue;
+                    }),
+                    false,
+                    'subscription metadata set'
+                ),
         };
     }, devtoolsOptions(name))
 );
diff --git a/src/utils/notification-utils.ts b/src/utils/notification-utils.ts
index 35ca552d62..0f408c5f95 100644
--- a/src/utils/notification-utils.ts
+++ b/src/utils/notification-utils.ts
@@ -23,11 +23,14 @@ export const bundleSubscriptionsByPrefix = (
             subscriptionMetadata[catalogPrefix].subscriptions.push({
                 ...query,
                 id: crypto.randomUUID(),
+                viewing: false,
             });
         } else {
             subscriptionMetadata[catalogPrefix] = {
                 settings: {},
-                subscriptions: [{ ...query, id: crypto.randomUUID() }],
+                subscriptions: [
+                    { ...query, id: crypto.randomUUID(), viewing: false },
+                ],
             };
         }
     });

From cb6ec1f6a1b40163632b4e71d9adbb1365e83c3b Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Thu, 14 May 2026 14:25:10 -0400
Subject: [PATCH 12/70] Display placeholder in accordion summary for email when
 empty

---
 .../PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx        | 8 +++++++-
 src/lang/en-US/Alerts.ts                                  | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
index 19898f061a..af0ff98c9e 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
@@ -14,6 +14,7 @@ import {
 } from '@mui/material';
 
 import { NavArrowDown, NavArrowRight } from 'iconoir-react';
+import { useIntl } from 'react-intl';
 
 import ChipList from 'src/components/shared/ChipList';
 import { useGetAlertTypes } from 'src/context/AlertType';
@@ -21,6 +22,7 @@ import { sortByAlertType } from 'src/utils/misc-utils';
 
 const Summary = ({ expanded, subscription }: SubscriberAccordionProps) => {
     const theme = useTheme();
+    const intl = useIntl();
 
     const [alertTypeResponse] = useGetAlertTypes();
 
@@ -92,7 +94,11 @@ const Summary = ({ expanded, subscription }: SubscriberAccordionProps) => {
                     )}
 
                     <Typography style={{ fontWeight: 500, paddingLeft: 4 }}>
-                        {email}
+                        {email.length > 0
+                            ? email
+                            : intl.formatMessage({
+                                  id: 'alerts.config.dialog.label.placeholderSubscriberId',
+                              })}
                     </Typography>
                 </Stack>
 
diff --git a/src/lang/en-US/Alerts.ts b/src/lang/en-US/Alerts.ts
index 8e265578fe..db41a8a92d 100644
--- a/src/lang/en-US/Alerts.ts
+++ b/src/lang/en-US/Alerts.ts
@@ -9,6 +9,7 @@ export const Alerts: Record<string, string> = {
     'alerts.config.dialog.error.term.delete': `deleting`,
     'alerts.config.dialog.error.term.modify': `creating or updating`,
     'alerts.config.dialog.label.subscribers': `Recipients ({count})`,
+    'alerts.config.dialog.label.placeholderSubscriberId': `(new recipient)`,
     'alerts.config.dialog.generate.description': `Choose where you'd like notifications to be sent. Email addresses can be for mailing lists, {docLink}, or individual users.`,
     'alerts.config.dialog.generate.description.docLink': `Slack channels`,
     'alerts.config.dialog.generate.description.docPath': `https://slack.com/intl/en-au/help/articles/206819278-Send-emails-to-Slack`,

From 8b4f449ad6a0e99ba1a53700d776d2c42f60719d Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Thu, 14 May 2026 14:30:49 -0400
Subject: [PATCH 13/70] Move single subscription delete button into
 SubscriberInfo directory

---
 .../PrefixAlerts/Dialog/{ => SubscriberInfo}/DeleteButton.tsx   | 0
 .../admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename src/components/admin/Settings/PrefixAlerts/Dialog/{ => SubscriberInfo}/DeleteButton.tsx (100%)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/DeleteButton.tsx
similarity index 100%
rename from src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
rename to src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/DeleteButton.tsx
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
index 03d99992be..82e729cf1a 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
@@ -2,7 +2,7 @@ import type { SubscriberAccordionProps } from 'src/components/admin/Settings/Pre
 
 import { Accordion, Stack, useTheme } from '@mui/material';
 
-import DeleteButton from 'src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton';
+import DeleteButton from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/DeleteButton';
 import Details from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details';
 import Summary from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary';
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';

From 73af7429f080d6c1098236df7c07283acd81df38 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Thu, 14 May 2026 14:49:57 -0400
Subject: [PATCH 14/70] Add CTA to subscribers section

---
 .../Dialog/SubscriberInfo/index.tsx           |  3 +++
 .../Dialog/SubscriberSection/AddButton.tsx    | 17 ++++++++++++
 .../index.tsx}                                | 26 ++++++++++++++-----
 .../Settings/PrefixAlerts/Dialog/index.tsx    |  2 +-
 src/lang/en-US/Alerts.ts                      |  1 +
 5 files changed, 42 insertions(+), 7 deletions(-)
 create mode 100644 src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/AddButton.tsx
 rename src/components/admin/Settings/PrefixAlerts/Dialog/{SubscriberSection.tsx => SubscriberSection/index.tsx} (68%)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
index 82e729cf1a..db3b51cb74 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
@@ -32,6 +32,9 @@ const SubscriberInfo = ({
                 [`&:first-of-type`]: {
                     borderRadius: '6px',
                 },
+                [`&:last-of-type`]: {
+                    borderRadius: '6px',
+                },
             }}
         >
             <Stack
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/AddButton.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/AddButton.tsx
new file mode 100644
index 0000000000..5aaf6903c9
--- /dev/null
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/AddButton.tsx
@@ -0,0 +1,17 @@
+import { Button } from '@mui/material';
+
+import { useIntl } from 'react-intl';
+
+const AddButton = () => {
+    const intl = useIntl();
+
+    return (
+        <Button variant="text">
+            {intl.formatMessage({
+                id: 'alerts.config.dialog.cta.addSubscriber',
+            })}
+        </Button>
+    );
+};
+
+export default AddButton;
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx
similarity index 68%
rename from src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection.tsx
rename to src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx
index bcba61a973..4585d6f9e3 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx
@@ -7,6 +7,7 @@ import { Stack, Typography } from '@mui/material';
 import { useIntl } from 'react-intl';
 
 import SubscriberInfo from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo';
+import AddButton from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/AddButton';
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
 import { hasOwnProperty } from 'src/utils/misc-utils';
 
@@ -30,12 +31,25 @@ const SubscriberSection = () => {
 
     return (
         <Stack spacing="10px" style={{ width: '100%' }}>
-            <Typography style={{ fontWeight: 500, marginBottom: 8 }}>
-                {intl.formatMessage(
-                    { id: 'alerts.config.dialog.label.subscribers' },
-                    { count: targetSubscriptionMetadata.subscriptions.length }
-                )}
-            </Typography>
+            <Stack
+                direction="row"
+                style={{
+                    alignItems: 'center',
+                    justifyContent: 'space-between',
+                }}
+            >
+                <Typography style={{ fontWeight: 500 }}>
+                    {intl.formatMessage(
+                        { id: 'alerts.config.dialog.label.subscribers' },
+                        {
+                            count: targetSubscriptionMetadata.subscriptions
+                                .length,
+                        }
+                    )}
+                </Typography>
+
+                <AddButton />
+            </Stack>
 
             {targetSubscriptionMetadata.subscriptions
                 .filter(({ deleted }) => !deleted)
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
index 0158dc9b42..5373ae4869 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
@@ -17,7 +17,7 @@ import { useUnmount } from 'react-use';
 import PrefixField from 'src/components/admin/Settings/PrefixAlerts/Dialog/PrefixField';
 import SaveButton from 'src/components/admin/Settings/PrefixAlerts/Dialog/SaveButton';
 import ServerErrors from 'src/components/admin/Settings/PrefixAlerts/Dialog/ServerErrors';
-import SubscriberSection from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection';
+import SubscriberSection from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index';
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
 import MessageWithLink from 'src/components/content/MessageWithLink';
 import DialogTitleWithClose from 'src/components/shared/Dialog/TitleWithClose';
diff --git a/src/lang/en-US/Alerts.ts b/src/lang/en-US/Alerts.ts
index db41a8a92d..efb986af9f 100644
--- a/src/lang/en-US/Alerts.ts
+++ b/src/lang/en-US/Alerts.ts
@@ -4,6 +4,7 @@ export const Alerts: Record<string, string> = {
     'alerts.config.header': `Organization Notifications`,
     'alerts.config.cta.addAlertMethod': `Configure Notifications`,
 
+    'alerts.config.dialog.cta.addSubscriber': `Add Recipient`,
     'alerts.config.dialog.emailSelector.inputError': `Email is incorrectly formatted.`,
     'alerts.config.dialog.error.generic': `An issue was encountered {operation} an alert subscription.`,
     'alerts.config.dialog.error.term.delete': `deleting`,

From 103269dc20a4f2f242f2bc056248e5372800e961 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Thu, 14 May 2026 15:20:14 -0400
Subject: [PATCH 15/70] Enable the creation of a templated subscription in
 dialog

---
 .../PrefixAlerts/Dialog/AlertTypeField.tsx    | 25 ++----
 .../Dialog/SubscriberSection/AddButton.tsx    | 13 ++-
 .../Dialog/SubscriberSection/index.tsx        | 27 ++++++-
 .../useAlertSubscriptionsStore.ts             | 79 ++++++++++++++++++-
 4 files changed, 119 insertions(+), 25 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeField.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeField.tsx
index c48532722e..4aa8ab17bc 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeField.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeField.tsx
@@ -1,35 +1,24 @@
 import type { AlertTypeFieldProps } from 'src/components/admin/Settings/PrefixAlerts/types';
-import type { AlertTypeInfo } from 'src/gql-types/graphql';
-
-import { useEffect } from 'react';
 
 import { Skeleton } from '@mui/material';
 
 import AlertTypeSelector from 'src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeSelector';
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
-import { useGetAlertTypes } from 'src/context/AlertType';
-
-const DEFAULT_OPTIONS: AlertTypeInfo[] = [];
 
 const AlertTypeField = ({ subscription }: AlertTypeFieldProps) => {
-    const [{ fetching, data, error }] = useGetAlertTypes();
-
-    const setServerError = useAlertSubscriptionsStore(
-        (state) => state.setSaveErrors
+    const alertTypeOptions = useAlertSubscriptionsStore(
+        (state) => state.alertTypeOptions
+    );
+    const alertTypeOptionsFetching = useAlertSubscriptionsStore(
+        (state) => state.alertTypeOptionsFetching
     );
 
-    useEffect(() => {
-        if (error) {
-            setServerError([error]);
-        }
-    }, [error, setServerError]);
-
-    return fetching || !data ? (
+    return alertTypeOptionsFetching ? (
         <Skeleton height={38} width={490} />
     ) : (
         <AlertTypeSelector
             subscription={subscription}
-            options={data.alertTypes ?? DEFAULT_OPTIONS}
+            options={alertTypeOptions}
         />
     );
 };
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/AddButton.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/AddButton.tsx
index 5aaf6903c9..fb35f0c520 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/AddButton.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/AddButton.tsx
@@ -2,11 +2,22 @@ import { Button } from '@mui/material';
 
 import { useIntl } from 'react-intl';
 
+import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
+
 const AddButton = () => {
     const intl = useIntl();
 
+    const addTemplatedSubscription = useAlertSubscriptionsStore(
+        (state) => state.addTemplatedSubscription
+    );
+
     return (
-        <Button variant="text">
+        <Button
+            onClick={() => {
+                addTemplatedSubscription();
+            }}
+            variant="text"
+        >
             {intl.formatMessage({
                 id: 'alerts.config.dialog.cta.addSubscriber',
             })}
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx
index 4585d6f9e3..f5ca56282f 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx
@@ -1,6 +1,6 @@
 import type { SubscriptionMetadata } from 'src/components/admin/Settings/PrefixAlerts/types';
 
-import { useMemo } from 'react';
+import { useEffect, useMemo } from 'react';
 
 import { Stack, Typography } from '@mui/material';
 
@@ -9,17 +9,27 @@ import { useIntl } from 'react-intl';
 import SubscriberInfo from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo';
 import AddButton from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/AddButton';
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
+import { useGetAlertTypes } from 'src/context/AlertType';
 import { hasOwnProperty } from 'src/utils/misc-utils';
 
 const SubscriberSection = () => {
     const intl = useIntl();
 
+    const [{ fetching, data, error }] = useGetAlertTypes();
+
     const catalogPrefix = useAlertSubscriptionsStore(
         (state) => state.catalogPrefix
     );
     const mutableSubscriptionMetadata = useAlertSubscriptionsStore(
         (state) => state.mutableSubscriptionMetadata
     );
+    const setServerError = useAlertSubscriptionsStore(
+        (state) => state.setSaveErrors
+    );
+
+    const initializeAlertTypeOptions = useAlertSubscriptionsStore(
+        (state) => state.initializeAlertTypeOptions
+    );
 
     const targetSubscriptionMetadata: SubscriptionMetadata = useMemo(
         () =>
@@ -29,6 +39,16 @@ const SubscriberSection = () => {
         [catalogPrefix, mutableSubscriptionMetadata]
     );
 
+    useEffect(() => {
+        if (error) {
+            setServerError([error]);
+        }
+    }, [error, setServerError]);
+
+    useEffect(() => {
+        initializeAlertTypeOptions(data?.alertTypes ?? [], fetching);
+    }, [data, fetching, initializeAlertTypeOptions]);
+
     return (
         <Stack spacing="10px" style={{ width: '100%' }}>
             <Stack
@@ -42,8 +62,9 @@ const SubscriberSection = () => {
                     {intl.formatMessage(
                         { id: 'alerts.config.dialog.label.subscribers' },
                         {
-                            count: targetSubscriptionMetadata.subscriptions
-                                .length,
+                            count: targetSubscriptionMetadata.subscriptions.filter(
+                                ({ deleted }) => !deleted
+                            ).length,
                         }
                     )}
                 </Typography>
diff --git a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
index f722e6ab27..b128c42472 100644
--- a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
@@ -15,10 +15,16 @@ import { bundleSubscriptionsByPrefix } from 'src/utils/notification-utils';
 import { devtoolsOptions } from 'src/utils/store-utils';
 
 interface AlertSubscriptionState {
-    alertTypes: AlertTypeInfo[];
+    addTemplatedSubscription: () => void;
+    alertTypeOptions: AlertTypeInfo[];
+    alertTypeOptionsFetching: boolean;
     catalogPrefix: string;
     emailErrorsExist: boolean;
     initializationError: CombinedError | PostgrestError | null | undefined;
+    initializeAlertTypeOptions: (
+        values: AlertTypeInfo[],
+        fetching: boolean
+    ) => void;
     initializeMutableSubscriptionMetadata: () => void;
     markSubscriptionForDeletion: (
         catalogPrefix: string,
@@ -73,7 +79,8 @@ const getMutableSubscriptionIndex = (
 
 const getInitialState = (): Pick<
     AlertSubscriptionState,
-    | 'alertTypes'
+    | 'alertTypeOptions'
+    | 'alertTypeOptionsFetching'
     | 'catalogPrefix'
     | 'emailErrorsExist'
     | 'initializationError'
@@ -83,7 +90,8 @@ const getInitialState = (): Pick<
     | 'subscription'
     | 'subscriptionMetadata'
 > => ({
-    alertTypes: [],
+    alertTypeOptions: [],
+    alertTypeOptionsFetching: false,
     catalogPrefix: '',
     emailErrorsExist: false,
     initializationError: null,
@@ -101,6 +109,71 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
         return {
             ...getInitialState(),
 
+            addTemplatedSubscription: () =>
+                set(
+                    produce((state: AlertSubscriptionState) => {
+                        if (
+                            !state.catalogPrefix ||
+                            state.alertTypeOptions.length === 0
+                        ) {
+                            return;
+                        }
+
+                        const templatedSubscription = {
+                            alertTypes: state.alertTypeOptions
+                                .filter(
+                                    (option) =>
+                                        option.isDefault || option.isSystem
+                                )
+                                .map(({ alertType }) => alertType),
+                            catalogPrefix: state.catalogPrefix,
+                            email: '',
+                            id: crypto.randomUUID(),
+                            viewing: true,
+                        };
+
+                        if (
+                            !hasOwnProperty(
+                                state.mutableSubscriptionMetadata,
+                                state.catalogPrefix
+                            )
+                        ) {
+                            state.mutableSubscriptionMetadata[
+                                state.catalogPrefix
+                            ] = {
+                                settings: {},
+                                subscriptions: [templatedSubscription],
+                            };
+
+                            return;
+                        }
+
+                        const targetSubscriptions =
+                            state.mutableSubscriptionMetadata[
+                                state.catalogPrefix
+                            ].subscriptions;
+
+                        state.mutableSubscriptionMetadata[
+                            state.catalogPrefix
+                        ].subscriptions = [
+                            ...targetSubscriptions,
+                            templatedSubscription,
+                        ];
+                    }),
+                    false,
+                    'templated subscription added'
+                ),
+
+            initializeAlertTypeOptions: (values, fetching) =>
+                set(
+                    produce((state: AlertSubscriptionState) => {
+                        state.alertTypeOptions = values;
+                        state.alertTypeOptionsFetching = fetching;
+                    }),
+                    false,
+                    'alert type options initialized'
+                ),
+
             initializeMutableSubscriptionMetadata: () =>
                 set(
                     produce((state: AlertSubscriptionState) => {

From 2dd78def76ae1c277175ac0f9dc62994e0ca1546 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Thu, 14 May 2026 15:33:36 -0400
Subject: [PATCH 16/70] Remove net new subscriptions from client state

---
 .../Dialog/SubscriberInfo/DeleteButton.tsx    | 16 +------
 .../useAlertSubscriptionsStore.ts             | 44 +++++++++++++++----
 2 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/DeleteButton.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/DeleteButton.tsx
index bb4845e6c7..a067c55b44 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/DeleteButton.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/DeleteButton.tsx
@@ -5,28 +5,18 @@ import { IconButton, useTheme } from '@mui/material';
 import { Xmark } from 'iconoir-react';
 
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
-import { disabledButtonText } from 'src/context/Theme';
 
 const DeleteButton = ({
-    subscription: { catalogPrefix, email, id },
+    subscription: { catalogPrefix, id },
 }: SubscriptionDependentProps) => {
     const theme = useTheme();
 
-    const prefixErrorsExist = useAlertSubscriptionsStore(
-        (state) => state.prefixErrorsExist
-    );
-
     const markSubscriptionForDeletion = useAlertSubscriptionsStore(
         (state) => state.markSubscriptionForDeletion
     );
 
-    const disabled = Boolean(
-        prefixErrorsExist || catalogPrefix.length === 0 || email.length === 0
-    );
-
     return (
         <IconButton
-            disabled={disabled}
             onClick={(event) => {
                 event.stopPropagation();
 
@@ -41,9 +31,7 @@ const DeleteButton = ({
         >
             <Xmark
                 style={{
-                    color: disabled
-                        ? disabledButtonText[theme.palette.mode]
-                        : theme.palette.text.primary,
+                    color: theme.palette.text.primary,
                 }}
             />
         </IconButton>
diff --git a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
index b128c42472..9a1665a55c 100644
--- a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
@@ -57,20 +57,26 @@ interface AlertSubscriptionState {
     toggleSubscriptionViewingStatus: (subscriptionId: string) => void;
 }
 
-const getMutableSubscriptionIndex = (
+const getSubscriptionIndex = (
     state: AlertSubscriptionState | Partial<AlertSubscriptionState>,
-    subscriptionId: string
+    subscriptionId: string,
+    immutable?: boolean
 ): number => {
+    const subscriptionMetadataTarget = immutable
+        ? 'subscriptionMetadata'
+        : 'mutableSubscriptionMetadata';
+
     if (
         !state.catalogPrefix ||
         !subscriptionId ||
-        !state?.mutableSubscriptionMetadata ||
+        !hasOwnProperty(state, subscriptionMetadataTarget) ||
+        !state[subscriptionMetadataTarget] ||
         !hasOwnProperty(state.mutableSubscriptionMetadata, state.catalogPrefix)
     ) {
         return -1;
     }
 
-    return state.mutableSubscriptionMetadata[
+    return state[subscriptionMetadataTarget][
         state.catalogPrefix
     ].subscriptions.findIndex(
         (subscription) => subscription.id === subscriptionId
@@ -188,18 +194,38 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
             markSubscriptionForDeletion: (_catalogPrefix, subscriptionId) =>
                 set(
                     produce((state: AlertSubscriptionState) => {
-                        const subscriptionIndex = getMutableSubscriptionIndex(
+                        const mutableSubscriptionIndex = getSubscriptionIndex(
                             state,
                             subscriptionId
                         );
 
-                        if (subscriptionIndex === -1) {
+                        if (mutableSubscriptionIndex === -1) {
+                            return;
+                        }
+
+                        const immutableSubscriptionIndex = getSubscriptionIndex(
+                            state,
+                            subscriptionId,
+                            true
+                        );
+
+                        if (immutableSubscriptionIndex === -1) {
+                            state.mutableSubscriptionMetadata[
+                                state.catalogPrefix
+                            ].subscriptions = state.mutableSubscriptionMetadata[
+                                state.catalogPrefix
+                            ].subscriptions.filter(
+                                (subscription) =>
+                                    subscription.id !== subscriptionId
+                            );
+
                             return;
                         }
 
                         state.mutableSubscriptionMetadata[
                             state.catalogPrefix
-                        ].subscriptions[subscriptionIndex].deleted = true;
+                        ].subscriptions[mutableSubscriptionIndex].deleted =
+                            true;
                     }),
                     false,
                     'mark subscription for deletion'
@@ -315,7 +341,7 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
             setSubscribedEmail: (value, subscriptionId) =>
                 set(
                     produce((state: AlertSubscriptionState) => {
-                        const subscriptionIndex = getMutableSubscriptionIndex(
+                        const subscriptionIndex = getSubscriptionIndex(
                             state,
                             subscriptionId
                         );
@@ -356,7 +382,7 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
             toggleSubscriptionViewingStatus: (subscriptionId) =>
                 set(
                     produce((state: AlertSubscriptionState) => {
-                        const subscriptionIndex = getMutableSubscriptionIndex(
+                        const subscriptionIndex = getSubscriptionIndex(
                             state,
                             subscriptionId
                         );

From 77ef4c282cbdb17696ef9ca25a06c509a2a26676 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 19 May 2026 12:27:49 -0400
Subject: [PATCH 17/70] Disable email field and add button when email conflicts
 or absence detected

---
 .../Dialog/SubscriberSection/AddButton.tsx    |  8 ++++
 .../Settings/PrefixAlerts/EmailSelector.tsx   | 10 +++-
 .../useEvaluateSubscriptionIneligibility.ts   | 46 +++++++++++++++++++
 3 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 src/components/admin/Settings/PrefixAlerts/useEvaluateSubscriptionIneligibility.ts

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/AddButton.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/AddButton.tsx
index fb35f0c520..7b10f22a39 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/AddButton.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/AddButton.tsx
@@ -3,6 +3,7 @@ import { Button } from '@mui/material';
 import { useIntl } from 'react-intl';
 
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
+import { useEvaluateSubscriptionIneligibility } from 'src/components/admin/Settings/PrefixAlerts/useEvaluateSubscriptionIneligibility';
 
 const AddButton = () => {
     const intl = useIntl();
@@ -10,9 +11,16 @@ const AddButton = () => {
     const addTemplatedSubscription = useAlertSubscriptionsStore(
         (state) => state.addTemplatedSubscription
     );
+    const { emptyEmailDetected, duplicateSubscriptionEmails } =
+        useEvaluateSubscriptionIneligibility();
+
+    console.log(duplicateSubscriptionEmails);
 
     return (
         <Button
+            disabled={
+                emptyEmailDetected || duplicateSubscriptionEmails.length > 0
+            }
             onClick={() => {
                 addTemplatedSubscription();
             }}
diff --git a/src/components/admin/Settings/PrefixAlerts/EmailSelector.tsx b/src/components/admin/Settings/PrefixAlerts/EmailSelector.tsx
index b390be1139..6840bb44b3 100644
--- a/src/components/admin/Settings/PrefixAlerts/EmailSelector.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/EmailSelector.tsx
@@ -19,6 +19,7 @@ import { useShallow } from 'zustand/react/shallow';
 import { useIntl } from 'react-intl';
 
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
+import { useEvaluateSubscriptionIneligibility } from 'src/components/admin/Settings/PrefixAlerts/useEvaluateSubscriptionIneligibility';
 import UserAvatar from 'src/components/shared/UserAvatar';
 import usePrefixAdministrators from 'src/hooks/usePrefixAdministrators';
 import useUserInformationByPrefix from 'src/hooks/useUserInformationByPrefix';
@@ -51,6 +52,8 @@ function EmailSelector({
                 state.setEmailErrorsExist,
             ])
         );
+    const { emptyEmailDetected, duplicateSubscriptionEmails } =
+        useEvaluateSubscriptionIneligibility();
 
     const [inputValue, setInputValue] = useState(subscribedEmail);
 
@@ -76,7 +79,12 @@ function EmailSelector({
     return (
         <FormControl fullWidth>
             <Autocomplete
-                disabled={Boolean(serverError)}
+                disabled={
+                    Boolean(serverError) ||
+                    (emptyEmailDetected && subscribedEmail.length > 0) ||
+                    (duplicateSubscriptionEmails.length > 0 &&
+                        !duplicateSubscriptionEmails.includes(subscribedEmail))
+                }
                 filterOptions={(options) =>
                     options.filter((option) => {
                         if (typeof option === 'string') {
diff --git a/src/components/admin/Settings/PrefixAlerts/useEvaluateSubscriptionIneligibility.ts b/src/components/admin/Settings/PrefixAlerts/useEvaluateSubscriptionIneligibility.ts
new file mode 100644
index 0000000000..584212ed02
--- /dev/null
+++ b/src/components/admin/Settings/PrefixAlerts/useEvaluateSubscriptionIneligibility.ts
@@ -0,0 +1,46 @@
+import { useMemo } from 'react';
+
+import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
+import { hasOwnProperty } from 'src/utils/misc-utils';
+
+export function useEvaluateSubscriptionIneligibility() {
+    const catalogPrefix = useAlertSubscriptionsStore(
+        (state) => state.catalogPrefix
+    );
+    const mutableSubscriptionMetadata = useAlertSubscriptionsStore(
+        (state) => state.mutableSubscriptionMetadata
+    );
+
+    return useMemo(() => {
+        if (!hasOwnProperty(mutableSubscriptionMetadata, catalogPrefix)) {
+            return {
+                duplicateSubscriptionEmails: [],
+                emptyEmailDetected: false,
+            };
+        }
+
+        const { subscriptions } = mutableSubscriptionMetadata[catalogPrefix];
+
+        const emptyEmailDetected = subscriptions.some(
+            (subscription) => subscription.email.length === 0
+        );
+
+        const duplicateSubscriptionEmails = subscriptions
+            .filter(({ email }) => {
+                const firstIndex = subscriptions.findIndex(
+                    (subscription) => subscription.email === email
+                );
+                const lastIndex = subscriptions.findLastIndex(
+                    (subscription) => subscription.email === email
+                );
+
+                return firstIndex !== lastIndex;
+            })
+            .map(({ email }) => email);
+
+        return {
+            duplicateSubscriptionEmails,
+            emptyEmailDetected,
+        };
+    }, [catalogPrefix, mutableSubscriptionMetadata]);
+}

From 202bc7ee6151dd844147122da3c2fb957acaa92f Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 19 May 2026 13:58:35 -0400
Subject: [PATCH 18/70] Display error icon when email conflicts or absence
 detected

---
 .../Dialog/SubscriberInfo/Summary.tsx         | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
index af0ff98c9e..c74f91616f 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
@@ -13,9 +13,10 @@ import {
     useTheme,
 } from '@mui/material';
 
-import { NavArrowDown, NavArrowRight } from 'iconoir-react';
+import { NavArrowDown, NavArrowRight, WarningCircle } from 'iconoir-react';
 import { useIntl } from 'react-intl';
 
+import { useEvaluateSubscriptionIneligibility } from 'src/components/admin/Settings/PrefixAlerts/useEvaluateSubscriptionIneligibility';
 import ChipList from 'src/components/shared/ChipList';
 import { useGetAlertTypes } from 'src/context/AlertType';
 import { sortByAlertType } from 'src/utils/misc-utils';
@@ -24,6 +25,8 @@ const Summary = ({ expanded, subscription }: SubscriberAccordionProps) => {
     const theme = useTheme();
     const intl = useIntl();
 
+    const { duplicateSubscriptionEmails, emptyEmailDetected } =
+        useEvaluateSubscriptionIneligibility();
     const [alertTypeResponse] = useGetAlertTypes();
 
     const alertTypeDefs: AlertTypeInfo[] = useMemo(
@@ -61,6 +64,11 @@ const Summary = ({ expanded, subscription }: SubscriberAccordionProps) => {
         [alertTypeDefs, alertTypes]
     );
 
+    const ineligibleSubscription =
+        (emptyEmailDetected && subscription.email.length === 0) ||
+        (duplicateSubscriptionEmails.length > 0 &&
+            duplicateSubscriptionEmails.includes(subscription.email));
+
     return (
         <AccordionSummary
             sx={{
@@ -82,7 +90,7 @@ const Summary = ({ expanded, subscription }: SubscriberAccordionProps) => {
             }}
         >
             <Stack style={{ width: '100%' }}>
-                <Stack direction="row">
+                <Stack direction="row" style={{ alignItems: 'center' }}>
                     {expanded ? (
                         <NavArrowDown
                             style={{ color: theme.palette.text.primary }}
@@ -100,6 +108,17 @@ const Summary = ({ expanded, subscription }: SubscriberAccordionProps) => {
                                   id: 'alerts.config.dialog.label.placeholderSubscriberId',
                               })}
                     </Typography>
+
+                    {ineligibleSubscription &&
+                    subscription.email.length !== 0 ? (
+                        <WarningCircle
+                            style={{
+                                color: theme.palette.error.main,
+                                fontSize: 12,
+                                marginLeft: 6,
+                            }}
+                        />
+                    ) : null}
                 </Stack>
 
                 {expanded ? null : (

From a4824a979f629615eae0848ef26353813ba8e2a5 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 19 May 2026 14:07:29 -0400
Subject: [PATCH 19/70] Tweak accordion border radius logic

---
 .../admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
index db3b51cb74..899c44f055 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
@@ -25,6 +25,7 @@ const SubscriberInfo = ({
                 'backgroundColor':
                     theme.palette.mode === 'dark' ? 'transparent' : 'white',
                 'border': defaultOutline[theme.palette.mode],
+                'borderRadius': '6px',
                 '&:hover': {
                     borderColor:
                         defaultOutlineColor_hovered[theme.palette.mode],

From 86d55f89a3c08edad0b4019bdfd88c5e617b6cfe Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 19 May 2026 14:07:48 -0400
Subject: [PATCH 20/70] Remove logging statement

---
 .../PrefixAlerts/Dialog/SubscriberSection/AddButton.tsx         | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/AddButton.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/AddButton.tsx
index 7b10f22a39..d6c89b29f7 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/AddButton.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/AddButton.tsx
@@ -14,8 +14,6 @@ const AddButton = () => {
     const { emptyEmailDetected, duplicateSubscriptionEmails } =
         useEvaluateSubscriptionIneligibility();
 
-    console.log(duplicateSubscriptionEmails);
-
     return (
         <Button
             disabled={

From 6c3fd1d21520b949d1ccdbf377b2a72983d0aaae Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 19 May 2026 14:27:05 -0400
Subject: [PATCH 21/70] Display templated subscription first in list

---
 .../admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
index 9a1665a55c..d151a952fb 100644
--- a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
@@ -162,8 +162,8 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                         state.mutableSubscriptionMetadata[
                             state.catalogPrefix
                         ].subscriptions = [
-                            ...targetSubscriptions,
                             templatedSubscription,
+                            ...targetSubscriptions,
                         ];
                     }),
                     false,

From c822e241fa9ff5ca93a40cc4f0372c6069a51c55 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Thu, 28 May 2026 11:54:23 -0400
Subject: [PATCH 22/70] Enable single subscription operations

---
 .../PrefixAlerts/Dialog/SaveButton.tsx        |  19 ++-
 .../useAlertSubscriptionsStore.ts             |   6 +
 .../useModifyAlertSubscription.ts             | 125 ++++++++++++------
 .../useUpsertAlertSubscription.ts             |  71 ++++++----
 4 files changed, 152 insertions(+), 69 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SaveButton.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SaveButton.tsx
index 3dd5affab3..5647a464e3 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SaveButton.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SaveButton.tsx
@@ -8,6 +8,7 @@ import { useIntl } from 'react-intl';
 
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
 import { useModifyAlertSubscription } from 'src/components/admin/Settings/PrefixAlerts/useModifyAlertSubscription';
+import { hasOwnProperty } from 'src/utils/misc-utils';
 
 const SaveButton = ({ closeDialog }: DialogActionProps) => {
     const intl = useIntl();
@@ -17,8 +18,16 @@ const SaveButton = ({ closeDialog }: DialogActionProps) => {
         (state) => state.emailErrorsExist || state.prefixErrorsExist
     );
 
-    const subscription = useAlertSubscriptionsStore(
-        (state) => state.subscription
+    const catalogPrefix = useAlertSubscriptionsStore(
+        (state) => state.catalogPrefix
+    );
+    const emptyEmailExists = useAlertSubscriptionsStore((state) =>
+        state.catalogPrefix.length > 0 &&
+        hasOwnProperty(state.mutableSubscriptionMetadata, state.catalogPrefix)
+            ? state.mutableSubscriptionMetadata[
+                  state.catalogPrefix
+              ].subscriptions.some(({ email }) => email.length === 0)
+            : false
     );
 
     const disabled = useMemo(
@@ -26,10 +35,10 @@ const SaveButton = ({ closeDialog }: DialogActionProps) => {
             Boolean(
                 errorsExist ||
                     loading ||
-                    subscription.catalogPrefix.length === 0 ||
-                    subscription.email.length === 0
+                    catalogPrefix.length === 0 ||
+                    emptyEmailExists
             ),
-        [errorsExist, loading, subscription.catalogPrefix, subscription.email]
+        [catalogPrefix, emptyEmailExists, errorsExist, loading]
     );
 
     return (
diff --git a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
index d151a952fb..d98cb067ef 100644
--- a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
@@ -209,6 +209,8 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                             true
                         );
 
+                        // If the alert subscription does not exist in the database,
+                        // it can be removed entirely from the array of mutable subscriptions.
                         if (immutableSubscriptionIndex === -1) {
                             state.mutableSubscriptionMetadata[
                                 state.catalogPrefix
@@ -222,6 +224,10 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                             return;
                         }
 
+                        // If the alert subscription does exist in the database,
+                        // the subscription metadata should be preserved in the
+                        // array of mutable subscriptions with it marked for deletion
+                        // via the corresponding GraphQL endpoint.
                         state.mutableSubscriptionMetadata[
                             state.catalogPrefix
                         ].subscriptions[mutableSubscriptionIndex].deleted =
diff --git a/src/components/admin/Settings/PrefixAlerts/useModifyAlertSubscription.ts b/src/components/admin/Settings/PrefixAlerts/useModifyAlertSubscription.ts
index 8f6800c72a..a706171a98 100644
--- a/src/components/admin/Settings/PrefixAlerts/useModifyAlertSubscription.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useModifyAlertSubscription.ts
@@ -1,4 +1,5 @@
-import type { BaseAlertSubscriptionMutationInput } from 'src/types/gql';
+import type { PostgrestError } from '@supabase/postgrest-js';
+import type { AlertSubscriptionResponse } from 'src/components/admin/Settings/PrefixAlerts/types';
 
 import { useState } from 'react';
 
@@ -8,6 +9,7 @@ import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAler
 import { useDeleteAlertSubscription } from 'src/components/admin/Settings/PrefixAlerts/useDeleteAlertSubscription';
 import { useUpsertAlertSubscription } from 'src/components/admin/Settings/PrefixAlerts/useUpsertAlertSubscription';
 import { BASE_ERROR } from 'src/services/supabase';
+import { hasOwnProperty, isPromiseFulfilledResult } from 'src/utils/misc-utils';
 
 export function useModifyAlertSubscription(
     closeDialog: () => void,
@@ -22,8 +24,12 @@ export function useModifyAlertSubscription(
         (state) => state.setSaveErrors
     );
 
-    const subscription = useAlertSubscriptionsStore(
-        (state) => state.subscription
+    const catalogPrefix = useAlertSubscriptionsStore(
+        (state) => state.catalogPrefix
+    );
+
+    const mutableSubscriptionMetadata = useAlertSubscriptionsStore(
+        (state) => state.mutableSubscriptionMetadata
     );
 
     const [loading, setLoading] = useState(false);
@@ -32,44 +38,87 @@ export function useModifyAlertSubscription(
         setLoading(true);
         setServerError([]);
 
-        const subscriptionInput: BaseAlertSubscriptionMutationInput = {
-            email: subscription.email,
-            prefix: subscription.catalogPrefix,
-        };
-
-        const response = deletionTrigger
-            ? await deleteSubscription(subscriptionInput)
-            : await upsertSubscription({
-                  ...subscriptionInput,
-                  alertTypes: subscription.alertTypes,
-              });
-
-        // The create could be undefined and this was easier to mark than tweak logic
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        const error =
-            response?.invalid && !response?.error
-                ? {
-                      ...BASE_ERROR,
-                      message: intl.formatMessage(
-                          {
-                              id: 'alerts.config.dialog.error.generic',
-                          },
-                          {
-                              operation: intl.formatMessage({
-                                  id: deletionTrigger
-                                      ? 'alerts.config.dialog.error.term.delete'
-                                      : 'alerts.config.dialog.error.term.modify',
-                              }),
-                          }
-                      ),
-                  }
-                : response?.error;
-
-        if (!error) {
+        if (catalogPrefix.length === 0) {
+            // TODO: Add LogRocket event for this error scenario.
+            return Promise.reject('Catalog prefix undefined.');
+        }
+
+        if (
+            !hasOwnProperty(mutableSubscriptionMetadata, catalogPrefix) ||
+            mutableSubscriptionMetadata[catalogPrefix].subscriptions.length ===
+                0
+        ) {
+            // TODO: Add LogRocket event for this success scenario.
+            return Promise.resolve();
+        }
+
+        const subscriptionQueries: Promise<AlertSubscriptionResponse>[] =
+            mutableSubscriptionMetadata[catalogPrefix].subscriptions.map(
+                (subscription) => {
+                    const {
+                        alertTypes,
+                        catalogPrefix: prefix,
+                        email,
+                    } = subscription;
+
+                    return deletionTrigger || subscription.deleted
+                        ? deleteSubscription({ email, prefix })
+                        : upsertSubscription({
+                              alertTypes,
+                              email,
+                              prefix,
+                          });
+                }
+            );
+
+        const serverErrors: PostgrestError[] = [];
+
+        Promise.allSettled(subscriptionQueries).then(
+            (responses) => {
+                responses.forEach((response) => {
+                    if (isPromiseFulfilledResult(response)) {
+                        if (!response.value) {
+                            // TODO: Add LogRocket event for this error scenario.
+                            return;
+                        }
+
+                        // TODO: Detect single subscription deletions when evaluating the operation performed.
+                        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+                        const serverError =
+                            response.value?.invalid && response.value?.error
+                                ? {
+                                      ...BASE_ERROR,
+                                      message: intl.formatMessage(
+                                          {
+                                              id: 'alerts.config.dialog.error.generic',
+                                          },
+                                          {
+                                              operation: intl.formatMessage({
+                                                  id: deletionTrigger
+                                                      ? 'alerts.config.dialog.error.term.delete'
+                                                      : 'alerts.config.dialog.error.term.modify',
+                                              }),
+                                          }
+                                      ),
+                                  }
+                                : response.value?.error;
+
+                        serverErrors.push(serverError);
+                    } else {
+                        // TODO: Add LogRocket event for this error scenario.
+                    }
+                });
+            },
+            () => {
+                // TODO: Add LogRocket event for this error scenario.
+            }
+        );
+
+        if (serverErrors.length !== 0) {
             closeDialog();
         }
 
-        setServerError([error]);
+        setServerError(serverErrors);
         setLoading(false);
     };
 
diff --git a/src/components/admin/Settings/PrefixAlerts/useUpsertAlertSubscription.ts b/src/components/admin/Settings/PrefixAlerts/useUpsertAlertSubscription.ts
index fc06f31f13..9eddf9a4ca 100644
--- a/src/components/admin/Settings/PrefixAlerts/useUpsertAlertSubscription.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useUpsertAlertSubscription.ts
@@ -1,15 +1,15 @@
 import type { AlertSubscriptionResponse } from 'src/components/admin/Settings/PrefixAlerts/types';
 import type { AlertSubscriptionMutationInput } from 'src/types/gql';
 
-import { useCallback, useMemo } from 'react';
+import { useCallback } from 'react';
 
+import { difference } from 'lodash';
 import { useMutation } from 'urql';
 
 import {
     AlertSubscriptionCreateMutation,
     AlertSubscriptionUpdateMutation,
 } from 'src/api/alerts';
-import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
 import { useGetAlertSubscriptions } from 'src/context/AlertSubscriptions';
 import { logRocketEvent } from 'src/services/shared';
 import { hasLength } from 'src/utils/misc-utils';
@@ -17,29 +17,12 @@ import { hasLength } from 'src/utils/misc-utils';
 export function useUpsertAlertSubscription() {
     const [{ data }] = useGetAlertSubscriptions();
 
-    const subscription = useAlertSubscriptionsStore(
-        (state) => state.subscription
+    const [createSubscriptionResult, mutateCreateSubscription] = useMutation(
+        AlertSubscriptionCreateMutation
+    );
+    const [updateSubscriptionResult, mutateUpdateSubscription] = useMutation(
+        AlertSubscriptionUpdateMutation
     );
-
-    const query = useMemo(() => {
-        if (!subscription.catalogPrefix || !subscription.email) {
-            return AlertSubscriptionCreateMutation;
-        }
-
-        return data?.alertSubscriptions.find(
-            ({ catalogPrefix, email }) =>
-                subscription.catalogPrefix === catalogPrefix &&
-                subscription.email === email
-        )
-            ? AlertSubscriptionUpdateMutation
-            : AlertSubscriptionCreateMutation;
-    }, [
-        data?.alertSubscriptions,
-        subscription.catalogPrefix,
-        subscription.email,
-    ]);
-
-    const [upsertSubscriptionResult, mutateSubscription] = useMutation(query);
 
     const upsertSubscription = useCallback(
         async ({
@@ -47,6 +30,34 @@ export function useUpsertAlertSubscription() {
             email,
             prefix,
         }: AlertSubscriptionMutationInput): Promise<AlertSubscriptionResponse> => {
+            const existingSubscription = data?.alertSubscriptions.find(
+                (subscription) =>
+                    subscription.catalogPrefix === prefix &&
+                    subscription.email === email
+            );
+
+            // If an existing subscription is identical to the mutable subscription,
+            // no operation should be performed.
+            if (
+                existingSubscription &&
+                difference(alertTypes, existingSubscription.alertTypes)
+                    .length === 0
+            ) {
+                return Promise.resolve({
+                    email,
+                    id: crypto.randomUUID(),
+                    prefix,
+                });
+            }
+
+            // If an existing alert subscription matches the catalog prefix and email
+            // of the mutable subscription - differing by the target alert types -- an
+            // update operation should be performed. If no existing alert subscription
+            // can be found, a create operation should be performed.
+            const mutateSubscription = existingSubscription
+                ? mutateUpdateSubscription
+                : mutateCreateSubscription;
+
             return mutateSubscription({
                 alertTypes: hasLength(alertTypes) ? alertTypes : undefined,
                 email,
@@ -108,8 +119,16 @@ export function useUpsertAlertSubscription() {
                 }
             );
         },
-        [mutateSubscription]
+        [
+            data?.alertSubscriptions,
+            mutateCreateSubscription,
+            mutateUpdateSubscription,
+        ]
     );
 
-    return { upsertSubscription, upsertSubscriptionResult };
+    return {
+        createSubscriptionResult,
+        updateSubscriptionResult,
+        upsertSubscription,
+    };
 }

From 2543086cdc828545e4bd9cdc1909a2ea8b8cec12 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Thu, 28 May 2026 13:04:54 -0400
Subject: [PATCH 23/70] Enable creating subscriptions for nested prefixes

---
 .../Settings/PrefixAlerts/Dialog/PrefixField.tsx      | 11 +++++++----
 .../PrefixAlerts/useAlertSubscriptionsStore.ts        |  4 +++-
 src/components/inputs/PrefixedName/index.tsx          |  5 ++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/PrefixField.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/PrefixField.tsx
index eb4f0e3b56..741f375184 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/PrefixField.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/PrefixField.tsx
@@ -23,9 +23,6 @@ export default function PrefixField({ staticPrefix }: PrefixFieldProps) {
 
     return staticPrefix ? (
         <TextField
-            InputProps={{
-                sx: { borderRadius: 3 },
-            }}
             disabled
             fullWidth
             label={intl.formatMessage({
@@ -33,16 +30,22 @@ export default function PrefixField({ staticPrefix }: PrefixFieldProps) {
             })}
             required
             size="small"
+            slotProps={{
+                input: {
+                    sx: { borderRadius: 3 },
+                },
+            }}
             value={staticPrefix}
             variant="outlined"
         />
     ) : (
         <PrefixedName
+            allowBlankName
+            allowEndSlash
             label={intl.formatMessage({
                 id: 'common.tenant',
             })}
             onChange={setSubscribedPrefix}
-            prefixOnly
             required
             size="small"
             validateOnLoad
diff --git a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
index d98cb067ef..0148cc98f3 100644
--- a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
@@ -368,7 +368,9 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                 set(
                     produce((state: AlertSubscriptionState) => {
                         state.subscription.catalogPrefix = value;
-                        state.catalogPrefix = value;
+                        state.catalogPrefix = value.endsWith('/')
+                            ? value
+                            : `${value}/`;
                         state.prefixErrorsExist = Boolean(errors);
                     }),
                     false,
diff --git a/src/components/inputs/PrefixedName/index.tsx b/src/components/inputs/PrefixedName/index.tsx
index b9193ba518..32a5dc8be2 100644
--- a/src/components/inputs/PrefixedName/index.tsx
+++ b/src/components/inputs/PrefixedName/index.tsx
@@ -229,7 +229,10 @@ function PrefixedName({
                     //  name input is of less importance. Mainly for GenerateInvitation
                     [`& .${inputAdornmentClasses.root}, & .${inputAdornmentClasses.root} .${autocompleteClasses.root}`]:
                         {
-                            width: allowBlankName ? '100%' : undefined,
+                            width:
+                                allowBlankName && !singleOption
+                                    ? '100%'
+                                    : undefined,
                         },
                     // Gross - but prevents the name input from showing a border while inside another border
                     [`& div > div > fieldset.${outlinedInputClasses.notchedOutline}`]:

From 6d6565cf4ca3e28f191c84ae430a64a0cde1841a Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Thu, 28 May 2026 13:05:23 -0400
Subject: [PATCH 24/70] Correct dialog closure logic

---
 .../admin/Settings/PrefixAlerts/useModifyAlertSubscription.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/useModifyAlertSubscription.ts b/src/components/admin/Settings/PrefixAlerts/useModifyAlertSubscription.ts
index a706171a98..1b107b664f 100644
--- a/src/components/admin/Settings/PrefixAlerts/useModifyAlertSubscription.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useModifyAlertSubscription.ts
@@ -114,7 +114,7 @@ export function useModifyAlertSubscription(
             }
         );
 
-        if (serverErrors.length !== 0) {
+        if (serverErrors.length > 0) {
             closeDialog();
         }
 

From b96863035e126bc84c32fd5b84b7ea96087f7ca2 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Thu, 28 May 2026 13:08:00 -0400
Subject: [PATCH 25/70] Adjust dialog closure logic

---
 .../admin/Settings/PrefixAlerts/useModifyAlertSubscription.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/useModifyAlertSubscription.ts b/src/components/admin/Settings/PrefixAlerts/useModifyAlertSubscription.ts
index 1b107b664f..1dd133779a 100644
--- a/src/components/admin/Settings/PrefixAlerts/useModifyAlertSubscription.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useModifyAlertSubscription.ts
@@ -114,7 +114,7 @@ export function useModifyAlertSubscription(
             }
         );
 
-        if (serverErrors.length > 0) {
+        if (serverErrors.length === 0) {
             closeDialog();
         }
 

From 127dc6d1e0ae7231676a780a2e113eea47128b13 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Thu, 28 May 2026 13:29:56 -0400
Subject: [PATCH 26/70] Enable the deletion of all subscriptions for a given
 prefix

---
 .../PrefixAlerts/Dialog/DeleteButton.tsx      | 63 +++++++++++++++++++
 .../Settings/PrefixAlerts/Dialog/index.tsx    |  9 ++-
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
new file mode 100644
index 0000000000..0e25888c85
--- /dev/null
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
@@ -0,0 +1,63 @@
+import type { DialogActionProps } from 'src/components/admin/Settings/PrefixAlerts/types';
+
+import { useMemo } from 'react';
+
+import { Button } from '@mui/material';
+
+import { useIntl } from 'react-intl';
+
+import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
+import { useModifyAlertSubscription } from 'src/components/admin/Settings/PrefixAlerts/useModifyAlertSubscription';
+import { hasOwnProperty } from 'src/utils/misc-utils';
+
+const DeleteButton = ({ closeDialog }: DialogActionProps) => {
+    const intl = useIntl();
+    const { loading, onClick } = useModifyAlertSubscription(closeDialog, true);
+
+    const errorsExist = useAlertSubscriptionsStore(
+        (state) => state.emailErrorsExist || state.prefixErrorsExist
+    );
+
+    const catalogPrefix = useAlertSubscriptionsStore(
+        (state) => state.catalogPrefix
+    );
+    const mutableSubscriptionMetadata = useAlertSubscriptionsStore(
+        (state) => state.mutableSubscriptionMetadata
+    );
+
+    const disabled = useMemo(() => {
+        const subscriptions = hasOwnProperty(
+            mutableSubscriptionMetadata,
+            catalogPrefix
+        )
+            ? mutableSubscriptionMetadata[catalogPrefix].subscriptions
+            : [];
+
+        const emptyEmailExists = subscriptions.some(
+            ({ email }) => email.length === 0
+        );
+
+        return Boolean(
+            errorsExist ||
+                loading ||
+                catalogPrefix.length === 0 ||
+                subscriptions.length === 0 ||
+                emptyEmailExists
+        );
+    }, [catalogPrefix, errorsExist, loading, mutableSubscriptionMetadata]);
+
+    return (
+        <Button
+            color="error"
+            disabled={disabled}
+            loading={loading}
+            onClick={onClick}
+            size="small"
+            variant="outlined"
+        >
+            {intl.formatMessage({ id: 'cta.delete' })}
+        </Button>
+    );
+};
+
+export default DeleteButton;
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
index 5373ae4869..987cbc964c 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
@@ -14,6 +14,7 @@ import {
 import { useIntl } from 'react-intl';
 import { useUnmount } from 'react-use';
 
+import DeleteButton from 'src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton';
 import PrefixField from 'src/components/admin/Settings/PrefixAlerts/Dialog/PrefixField';
 import SaveButton from 'src/components/admin/Settings/PrefixAlerts/Dialog/SaveButton';
 import ServerErrors from 'src/components/admin/Settings/PrefixAlerts/Dialog/ServerErrors';
@@ -76,7 +77,13 @@ const AlertSubscriptionDialog = ({
                 </Stack>
             </DialogContent>
 
-            <DialogActions>
+            <DialogActions
+                style={{
+                    justifyContent: 'space-between',
+                }}
+            >
+                <DeleteButton closeDialog={() => closeDialog()} />
+
                 <Stack direction="row" spacing={1}>
                     <Button
                         variant="outlined"

From 9e851935dd2996d9b0f99b27e5a66943087fd2da Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Thu, 28 May 2026 13:54:39 -0400
Subject: [PATCH 27/70] Store email when tab and enter keys are pressed

---
 .../admin/Settings/PrefixAlerts/EmailSelector.tsx         | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/components/admin/Settings/PrefixAlerts/EmailSelector.tsx b/src/components/admin/Settings/PrefixAlerts/EmailSelector.tsx
index 6840bb44b3..44bac1b1fe 100644
--- a/src/components/admin/Settings/PrefixAlerts/EmailSelector.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/EmailSelector.tsx
@@ -142,6 +142,14 @@ function EmailSelector({
                         subscriptionId
                     );
                 }}
+                onKeyDown={(event) => {
+                    if (event.key === 'Enter' || event.key === 'Tab') {
+                        setSubscribedEmail(
+                            sanitizeEmail(inputValue),
+                            subscriptionId
+                        );
+                    }
+                }}
                 onInputChange={(_event, value) => {
                     setInputValue(value);
                 }}

From 1b15aefb0aa221a6d9a4f0bae53f7f9542269fbb Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Thu, 28 May 2026 13:55:19 -0400
Subject: [PATCH 28/70] Do not display error icon in summary when email empty

---
 .../PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx     | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
index c74f91616f..caac9039dd 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
@@ -25,7 +25,7 @@ const Summary = ({ expanded, subscription }: SubscriberAccordionProps) => {
     const theme = useTheme();
     const intl = useIntl();
 
-    const { duplicateSubscriptionEmails, emptyEmailDetected } =
+    const { duplicateSubscriptionEmails } =
         useEvaluateSubscriptionIneligibility();
     const [alertTypeResponse] = useGetAlertTypes();
 
@@ -65,9 +65,8 @@ const Summary = ({ expanded, subscription }: SubscriberAccordionProps) => {
     );
 
     const ineligibleSubscription =
-        (emptyEmailDetected && subscription.email.length === 0) ||
-        (duplicateSubscriptionEmails.length > 0 &&
-            duplicateSubscriptionEmails.includes(subscription.email));
+        duplicateSubscriptionEmails.length > 0 &&
+        duplicateSubscriptionEmails.includes(subscription.email);
 
     return (
         <AccordionSummary
@@ -109,8 +108,7 @@ const Summary = ({ expanded, subscription }: SubscriberAccordionProps) => {
                               })}
                     </Typography>
 
-                    {ineligibleSubscription &&
-                    subscription.email.length !== 0 ? (
+                    {ineligibleSubscription ? (
                         <WarningCircle
                             style={{
                                 color: theme.palette.error.main,

From 46fd2873fb3993e00e6f8b033c74514641d80735 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Thu, 28 May 2026 14:11:09 -0400
Subject: [PATCH 29/70] Update delete button label

---
 .../admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx         | 2 +-
 src/lang/en-US/Alerts.ts                                        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
index 0e25888c85..f5e43a4998 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
@@ -55,7 +55,7 @@ const DeleteButton = ({ closeDialog }: DialogActionProps) => {
             size="small"
             variant="outlined"
         >
-            {intl.formatMessage({ id: 'cta.delete' })}
+            {intl.formatMessage({ id: 'alerts.config.dialog.cta.deleteAll' })}
         </Button>
     );
 };
diff --git a/src/lang/en-US/Alerts.ts b/src/lang/en-US/Alerts.ts
index efb986af9f..dbdb360b78 100644
--- a/src/lang/en-US/Alerts.ts
+++ b/src/lang/en-US/Alerts.ts
@@ -5,6 +5,7 @@ export const Alerts: Record<string, string> = {
     'alerts.config.cta.addAlertMethod': `Configure Notifications`,
 
     'alerts.config.dialog.cta.addSubscriber': `Add Recipient`,
+    'alerts.config.dialog.cta.deleteAll': `Delete Prefix Alerts`,
     'alerts.config.dialog.emailSelector.inputError': `Email is incorrectly formatted.`,
     'alerts.config.dialog.error.generic': `An issue was encountered {operation} an alert subscription.`,
     'alerts.config.dialog.error.term.delete': `deleting`,

From 9279d56705e6522007d1733f1a13a41e14cf07da Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Fri, 29 May 2026 12:01:17 -0400
Subject: [PATCH 30/70] Filter out deleted subscriptions in metadata memo in
 SubscriberSection

---
 .../Dialog/SubscriberSection/index.tsx        | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx
index f5ca56282f..a0d63940e4 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx
@@ -31,13 +31,17 @@ const SubscriberSection = () => {
         (state) => state.initializeAlertTypeOptions
     );
 
-    const targetSubscriptionMetadata: SubscriptionMetadata = useMemo(
-        () =>
-            hasOwnProperty(mutableSubscriptionMetadata, catalogPrefix)
-                ? mutableSubscriptionMetadata[catalogPrefix]
-                : { settings: {}, subscriptions: [] },
-        [catalogPrefix, mutableSubscriptionMetadata]
-    );
+    const targetSubscriptionMetadata: SubscriptionMetadata = useMemo(() => {
+        if (hasOwnProperty(mutableSubscriptionMetadata, catalogPrefix)) {
+            return {
+                ...mutableSubscriptionMetadata[catalogPrefix],
+                subscriptions: mutableSubscriptionMetadata[
+                    catalogPrefix
+                ].subscriptions.filter(({ deleted }) => !deleted),
+            };
+        }
+        return { settings: {}, subscriptions: [] };
+    }, [catalogPrefix, mutableSubscriptionMetadata]);
 
     useEffect(() => {
         if (error) {
@@ -62,9 +66,8 @@ const SubscriberSection = () => {
                     {intl.formatMessage(
                         { id: 'alerts.config.dialog.label.subscribers' },
                         {
-                            count: targetSubscriptionMetadata.subscriptions.filter(
-                                ({ deleted }) => !deleted
-                            ).length,
+                            count: targetSubscriptionMetadata.subscriptions
+                                .length,
                         }
                     )}
                 </Typography>
@@ -72,14 +75,14 @@ const SubscriberSection = () => {
                 <AddButton />
             </Stack>
 
-            {targetSubscriptionMetadata.subscriptions
-                .filter(({ deleted }) => !deleted)
-                .map((subscription, index) => (
+            {targetSubscriptionMetadata.subscriptions.map(
+                (subscription, index) => (
                     <SubscriberInfo
                         subscription={subscription}
                         key={`${subscription.catalogPrefix}-${subscription.email}-${index}`}
                     />
-                ))}
+                )
+            )}
         </Stack>
     );
 };

From 506c9014c0f283fc97dcb009141a46b06a095bbc Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Fri, 29 May 2026 13:18:11 -0400
Subject: [PATCH 31/70] Thicken accordion border for templated subscriptions

---
 .../PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx    | 11 ++++++-----
 .../PrefixAlerts/Dialog/SubscriberInfo/index.tsx      |  9 +++++++++
 src/components/admin/Settings/PrefixAlerts/types.ts   |  5 +++++
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
index caac9039dd..fdcaa2e9ef 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
@@ -1,4 +1,4 @@
-import type { SubscriberAccordionProps } from 'src/components/admin/Settings/PrefixAlerts/types';
+import type { SubscriberAccordionSummaryProps } from 'src/components/admin/Settings/PrefixAlerts/types';
 import type { ChipDisplay } from 'src/components/shared/ChipList/types';
 import type { AlertTypeInfo } from 'src/gql-types/graphql';
 
@@ -16,17 +16,18 @@ import {
 import { NavArrowDown, NavArrowRight, WarningCircle } from 'iconoir-react';
 import { useIntl } from 'react-intl';
 
-import { useEvaluateSubscriptionIneligibility } from 'src/components/admin/Settings/PrefixAlerts/useEvaluateSubscriptionIneligibility';
 import ChipList from 'src/components/shared/ChipList';
 import { useGetAlertTypes } from 'src/context/AlertType';
 import { sortByAlertType } from 'src/utils/misc-utils';
 
-const Summary = ({ expanded, subscription }: SubscriberAccordionProps) => {
+const Summary = ({
+    duplicateSubscriptionEmails,
+    expanded,
+    subscription,
+}: SubscriberAccordionSummaryProps) => {
     const theme = useTheme();
     const intl = useIntl();
 
-    const { duplicateSubscriptionEmails } =
-        useEvaluateSubscriptionIneligibility();
     const [alertTypeResponse] = useGetAlertTypes();
 
     const alertTypeDefs: AlertTypeInfo[] = useMemo(
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
index 899c44f055..3a8ae44092 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
@@ -6,6 +6,7 @@ import DeleteButton from 'src/components/admin/Settings/PrefixAlerts/Dialog/Subs
 import Details from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details';
 import Summary from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary';
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
+import { useEvaluateSubscriptionIneligibility } from 'src/components/admin/Settings/PrefixAlerts/useEvaluateSubscriptionIneligibility';
 import { defaultOutline, defaultOutlineColor_hovered } from 'src/context/Theme';
 
 const SubscriberInfo = ({
@@ -17,6 +18,9 @@ const SubscriberInfo = ({
         (state) => state.toggleSubscriptionViewingStatus
     );
 
+    const { duplicateSubscriptionEmails, emptyEmailDetected } =
+        useEvaluateSubscriptionIneligibility();
+
     return (
         <Accordion
             expanded={subscription.viewing}
@@ -25,6 +29,10 @@ const SubscriberInfo = ({
                 'backgroundColor':
                     theme.palette.mode === 'dark' ? 'transparent' : 'white',
                 'border': defaultOutline[theme.palette.mode],
+                'borderWidth':
+                    emptyEmailDetected && subscription.email.length === 0
+                        ? 3
+                        : undefined,
                 'borderRadius': '6px',
                 '&:hover': {
                     borderColor:
@@ -46,6 +54,7 @@ const SubscriberInfo = ({
                 }}
             >
                 <Summary
+                    duplicateSubscriptionEmails={duplicateSubscriptionEmails}
                     expanded={subscription.viewing}
                     subscription={subscription}
                 />
diff --git a/src/components/admin/Settings/PrefixAlerts/types.ts b/src/components/admin/Settings/PrefixAlerts/types.ts
index 5dde41c42f..88ee630636 100644
--- a/src/components/admin/Settings/PrefixAlerts/types.ts
+++ b/src/components/admin/Settings/PrefixAlerts/types.ts
@@ -68,6 +68,11 @@ export interface SubscriberAccordionProps {
     expanded?: boolean;
 }
 
+export interface SubscriberAccordionSummaryProps
+    extends SubscriberAccordionProps {
+    duplicateSubscriptionEmails: string[];
+}
+
 export interface SubscriptionDependentProps {
     subscription: MutableAlertSubscription;
 }

From 11f2bb75bb176e0652261512a8d29cd37f3b502a Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Fri, 29 May 2026 13:42:27 -0400
Subject: [PATCH 32/70] Correct typo in getSubscriptionIndex

---
 .../Settings/PrefixAlerts/useAlertSubscriptionsStore.ts     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
index 0148cc98f3..decb36d12d 100644
--- a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
@@ -8,7 +8,7 @@ import { create } from 'zustand';
 import { devtools } from 'zustand/middleware';
 
 import produce from 'immer';
-import { cloneDeep } from 'lodash';
+import { cloneDeep, isEmpty } from 'lodash';
 
 import { hasOwnProperty } from 'src/utils/misc-utils';
 import { bundleSubscriptionsByPrefix } from 'src/utils/notification-utils';
@@ -70,8 +70,8 @@ const getSubscriptionIndex = (
         !state.catalogPrefix ||
         !subscriptionId ||
         !hasOwnProperty(state, subscriptionMetadataTarget) ||
-        !state[subscriptionMetadataTarget] ||
-        !hasOwnProperty(state.mutableSubscriptionMetadata, state.catalogPrefix)
+        isEmpty(state[subscriptionMetadataTarget]) ||
+        !hasOwnProperty(state[subscriptionMetadataTarget], state.catalogPrefix)
     ) {
         return -1;
     }

From 9d45424711d4ef9244c36bb3b2295fbba778bb78 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Fri, 29 May 2026 14:15:12 -0400
Subject: [PATCH 33/70] Add simple empty subscriber message to dialog

---
 .../Dialog/SubscriberInfo/SummaryEmpty.tsx    | 40 +++++++++++++++++++
 .../Dialog/SubscriberSection/index.tsx        | 17 +++++---
 src/lang/en-US/Alerts.ts                      |  1 +
 3 files changed, 52 insertions(+), 6 deletions(-)
 create mode 100644 src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/SummaryEmpty.tsx

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/SummaryEmpty.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/SummaryEmpty.tsx
new file mode 100644
index 0000000000..bcc2cd3c4b
--- /dev/null
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/SummaryEmpty.tsx
@@ -0,0 +1,40 @@
+import { Stack, Typography, useTheme } from '@mui/material';
+
+import { useIntl } from 'react-intl';
+
+import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
+import { defaultOutline } from 'src/context/Theme';
+
+const SummaryEmpty = () => {
+    const intl = useIntl();
+    const theme = useTheme();
+
+    const catalogPrefix = useAlertSubscriptionsStore(
+        (state) => state.catalogPrefix
+    );
+
+    return (
+        <Stack
+            style={{
+                alignItems: 'center',
+                backgroundColor: theme.palette.background.default,
+                border: defaultOutline[theme.palette.mode],
+                borderRadius: '6px',
+                height: 68,
+                justifyContent: 'center',
+                padding: 16,
+            }}
+        >
+            <Typography>
+                {intl.formatMessage(
+                    {
+                        id: 'alerts.config.dialog.message.noExistingSubscriptions',
+                    },
+                    { prefix: <b>{catalogPrefix}</b> }
+                )}
+            </Typography>
+        </Stack>
+    );
+};
+
+export default SummaryEmpty;
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx
index a0d63940e4..de795c44c0 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx
@@ -7,6 +7,7 @@ import { Stack, Typography } from '@mui/material';
 import { useIntl } from 'react-intl';
 
 import SubscriberInfo from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo';
+import SummaryEmpty from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/SummaryEmpty';
 import AddButton from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/AddButton';
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
 import { useGetAlertTypes } from 'src/context/AlertType';
@@ -75,13 +76,17 @@ const SubscriberSection = () => {
                 <AddButton />
             </Stack>
 
-            {targetSubscriptionMetadata.subscriptions.map(
-                (subscription, index) => (
-                    <SubscriberInfo
-                        subscription={subscription}
-                        key={`${subscription.catalogPrefix}-${subscription.email}-${index}`}
-                    />
+            {targetSubscriptionMetadata.subscriptions.length > 0 ? (
+                targetSubscriptionMetadata.subscriptions.map(
+                    (subscription, index) => (
+                        <SubscriberInfo
+                            subscription={subscription}
+                            key={`${subscription.catalogPrefix}-${subscription.email}-${index}`}
+                        />
+                    )
                 )
+            ) : (
+                <SummaryEmpty />
             )}
         </Stack>
     );
diff --git a/src/lang/en-US/Alerts.ts b/src/lang/en-US/Alerts.ts
index dbdb360b78..4d4a62ab25 100644
--- a/src/lang/en-US/Alerts.ts
+++ b/src/lang/en-US/Alerts.ts
@@ -12,6 +12,7 @@ export const Alerts: Record<string, string> = {
     'alerts.config.dialog.error.term.modify': `creating or updating`,
     'alerts.config.dialog.label.subscribers': `Recipients ({count})`,
     'alerts.config.dialog.label.placeholderSubscriberId': `(new recipient)`,
+    'alerts.config.dialog.message.noExistingSubscriptions': `No emails are configured to be notified for prefix, {prefix}. To receive notifications for this prefix, click "Add Recipient" to get started.`,
     'alerts.config.dialog.generate.description': `Choose where you'd like notifications to be sent. Email addresses can be for mailing lists, {docLink}, or individual users.`,
     'alerts.config.dialog.generate.description.docLink': `Slack channels`,
     'alerts.config.dialog.generate.description.docPath': `https://slack.com/intl/en-au/help/articles/206819278-Send-emails-to-Slack`,

From fb97861f058c7ef67456a1f5cc63d0738cbf73a7 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 2 Jun 2026 12:48:13 -0400
Subject: [PATCH 34/70] Initialize global prefix settings in store

---
 src/api/alerts.ts                             | 39 ++++++++++-
 src/api/gql/useAllPages.ts                    |  2 +-
 src/api/types.ts                              | 10 +++
 .../Settings/PrefixAlerts/Dialog/index.tsx    |  3 +
 .../useAlertSubscriptionsStore.ts             | 35 +++++++++-
 .../PrefixAlerts/useInitializeAlertConfigs.ts | 70 +++++++++++++++++++
 src/context/URQL.tsx                          |  3 +
 src/types/gql.ts                              | 12 +++-
 8 files changed, 170 insertions(+), 4 deletions(-)
 create mode 100644 src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts

diff --git a/src/api/alerts.ts b/src/api/alerts.ts
index 437c9daffd..13c0fb0650 100644
--- a/src/api/alerts.ts
+++ b/src/api/alerts.ts
@@ -1,9 +1,13 @@
-import type { ReducedAlertSubscriptionQueryResponse } from 'src/api/types';
+import type {
+    AlertConfigQueryResponse,
+    ReducedAlertSubscriptionQueryResponse,
+} from 'src/api/types';
 import type {
     DataProcessingAlert,
     AlertSubscription as LegacyAlertSubscription,
 } from 'src/types';
 import type {
+    AlertConfigQueryInput,
     AlertSubscriptionMutationInput,
     AlertSubscriptionsBy,
     AlertTypeQueryResponse,
@@ -22,6 +26,38 @@ import {
     updateSupabase,
 } from 'src/services/supabase';
 
+const AlertConfigQuery = gql<AlertConfigQueryResponse, AlertConfigQueryInput>`
+    query AlertConfigs(
+        $filter: AlertConfigsFilter
+        $after: String
+        $first: Int
+    ) {
+        alertConfigs(filter: $filter, after: $after, first: $first) {
+            edges {
+                node {
+                    catalogPrefixOrName
+                    config
+                    createdAt
+                    detail
+                    effective {
+                        config
+                        provenance {
+                            source
+                        }
+                    }
+                    id
+                    lastModifiedBy
+                    updatedAt
+                }
+            }
+            pageInfo {
+                endCursor
+                hasNextPage
+            }
+        }
+    }
+`;
+
 const AlertSubscriptionCreateMutation = gql<
     { catalogPrefix: string; email: string },
     AlertSubscriptionMutationInput
@@ -176,6 +212,7 @@ const getTaskNotification = async (catalogName: string) => {
 };
 
 export {
+    AlertConfigQuery,
     AlertSubscriptionCreateMutation,
     AlertSubscriptionDeleteMutation,
     AlertSubscriptionQuery,
diff --git a/src/api/gql/useAllPages.ts b/src/api/gql/useAllPages.ts
index e6e5addfe8..a8eaafe30e 100644
--- a/src/api/gql/useAllPages.ts
+++ b/src/api/gql/useAllPages.ts
@@ -4,7 +4,7 @@ import { useEffect, useRef, useState } from 'react';
 
 import { useQuery } from 'urql';
 
-interface Connection<TNode> {
+export interface Connection<TNode> {
     edges: { node: TNode }[];
     pageInfo: {
         hasNextPage: boolean;
diff --git a/src/api/types.ts b/src/api/types.ts
index dd6d46f50b..6c5282ba63 100644
--- a/src/api/types.ts
+++ b/src/api/types.ts
@@ -1,6 +1,16 @@
+import type { Connection } from 'src/api/gql/useAllPages';
+import type { AlertConfigEntry } from 'src/gql-types/graphql';
 import type { Entity } from 'src/types';
 import type { AlertSubscription } from 'src/types/gql';
 
+// The `AlertConfigEntryConnection` interface provided by GraphQL
+// cannot be used here, unfortunately, if the hook `useAllPages`
+// must be invoked. The client defines a generic type for GraphQL
+// connections that omits properties found in these connections.
+export interface AlertConfigQueryResponse {
+    alertConfigs: Connection<AlertConfigEntry>;
+}
+
 export interface DraftSpecData {
     spec: any;
     catalog_name?: string;
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
index 987cbc964c..d37f36c4fa 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
@@ -20,6 +20,7 @@ import SaveButton from 'src/components/admin/Settings/PrefixAlerts/Dialog/SaveBu
 import ServerErrors from 'src/components/admin/Settings/PrefixAlerts/Dialog/ServerErrors';
 import SubscriberSection from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index';
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
+import { useInitializeAlertConfigs } from 'src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs';
 import MessageWithLink from 'src/components/content/MessageWithLink';
 import DialogTitleWithClose from 'src/components/shared/Dialog/TitleWithClose';
 
@@ -35,6 +36,8 @@ const AlertSubscriptionDialog = ({
 }: AlertSubscriptionDialogProps) => {
     const intl = useIntl();
 
+    useInitializeAlertConfigs();
+
     const initializeMutableSubscriptionMetadata = useAlertSubscriptionsStore(
         (state) => state.initializeMutableSubscriptionMetadata
     );
diff --git a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
index decb36d12d..905cb77fdb 100644
--- a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
@@ -2,6 +2,7 @@ import type { PostgrestError } from '@supabase/postgrest-js';
 import type { ReducedAlertSubscription } from 'src/api/types';
 import type { SubscriptionMetadataDictionary } from 'src/components/admin/Settings/PrefixAlerts/types';
 import type { AlertTypeInfo } from 'src/gql-types/graphql';
+import type { Schema } from 'src/types';
 import type { CombinedError } from 'urql';
 
 import { create } from 'zustand';
@@ -25,6 +26,7 @@ interface AlertSubscriptionState {
         values: AlertTypeInfo[],
         fetching: boolean
     ) => void;
+    initializeGlobalPrefixSettings: (value: Schema) => void;
     initializeMutableSubscriptionMetadata: () => void;
     markSubscriptionForDeletion: (
         catalogPrefix: string,
@@ -180,6 +182,37 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                     'alert type options initialized'
                 ),
 
+            initializeGlobalPrefixSettings: (value) =>
+                set(
+                    produce((state: AlertSubscriptionState) => {
+                        if (!state.catalogPrefix || isEmpty(value)) {
+                            return;
+                        }
+
+                        if (
+                            !hasOwnProperty(
+                                state.mutableSubscriptionMetadata,
+                                state.catalogPrefix
+                            )
+                        ) {
+                            state.mutableSubscriptionMetadata[
+                                state.catalogPrefix
+                            ] = {
+                                settings: value,
+                                subscriptions: [],
+                            };
+
+                            return;
+                        }
+
+                        state.mutableSubscriptionMetadata[
+                            state.catalogPrefix
+                        ].settings = value;
+                    }),
+                    false,
+                    'global prefix settings initialized'
+                ),
+
             initializeMutableSubscriptionMetadata: () =>
                 set(
                     produce((state: AlertSubscriptionState) => {
@@ -410,7 +443,7 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                             !previousValue;
                     }),
                     false,
-                    'subscription metadata set'
+                    'subscription viewing status toggled'
                 ),
         };
     }, devtoolsOptions(name))
diff --git a/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts b/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts
new file mode 100644
index 0000000000..9fb27b0058
--- /dev/null
+++ b/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts
@@ -0,0 +1,70 @@
+import { useEffect, useMemo, useRef, useState } from 'react';
+
+import { debounce, isEmpty } from 'lodash';
+import { useQuery } from 'urql';
+
+import { AlertConfigQuery } from 'src/api/alerts';
+import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
+import { hasOwnProperty } from 'src/utils/misc-utils';
+
+export function useInitializeAlertConfigs() {
+    const catalogPrefix = useAlertSubscriptionsStore(
+        (state) => state.catalogPrefix
+    );
+    const initializeGlobalPrefixSettings = useAlertSubscriptionsStore(
+        (state) => state.initializeGlobalPrefixSettings
+    );
+    const mutableSubscriptionMetadata = useAlertSubscriptionsStore(
+        (state) => state.mutableSubscriptionMetadata
+    );
+
+    const [debouncedPrefix, setDebouncedPrefix] = useState(catalogPrefix);
+
+    const updateDebouncedPrefix = useRef(
+        debounce((prefix) => {
+            setDebouncedPrefix(prefix);
+        }, 750)
+    );
+
+    const settingsDefined = useMemo(
+        () =>
+            debouncedPrefix.length > 0 &&
+            hasOwnProperty(mutableSubscriptionMetadata, debouncedPrefix) &&
+            !isEmpty(mutableSubscriptionMetadata[debouncedPrefix].settings),
+        [debouncedPrefix, mutableSubscriptionMetadata]
+    );
+
+    // TODO: Add error handling.
+    const [{ data, fetching }] = useQuery({
+        pause: !debouncedPrefix || settingsDefined,
+        query: AlertConfigQuery,
+        variables: {
+            filter: { catalogPrefixOrName: { startsWith: debouncedPrefix } },
+        },
+    });
+
+    useEffect(() => {
+        updateDebouncedPrefix.current(catalogPrefix);
+    }, [catalogPrefix, updateDebouncedPrefix]);
+
+    useEffect(() => {
+        if (
+            debouncedPrefix === catalogPrefix &&
+            !settingsDefined &&
+            !fetching &&
+            data?.alertConfigs &&
+            data.alertConfigs.edges.length > 0
+        ) {
+            initializeGlobalPrefixSettings(
+                data.alertConfigs.edges[0].node.effective.config
+            );
+        }
+    }, [
+        catalogPrefix,
+        data,
+        debouncedPrefix,
+        fetching,
+        initializeGlobalPrefixSettings,
+        settingsDefined,
+    ]);
+}
diff --git a/src/context/URQL.tsx b/src/context/URQL.tsx
index e2a67e7cdb..ef31588479 100644
--- a/src/context/URQL.tsx
+++ b/src/context/URQL.tsx
@@ -55,8 +55,11 @@ function UrqlConfigProvider({ children }: BaseComponentProps) {
                     keys: {
                         // TODO (gql caching)  - see GRAPHQL.md
                         Alert: (_data) => null,
+                        AlertConfig: (_data) => null,
                         AlertSubscription: (_data) => null,
                         AlertTypeInfo: (_data) => null,
+                        EffectiveAlertConfig: (_data) => null,
+                        FieldProvenance: (_data) => null,
                         InviteLink: (data) => null,
                         LiveSpecRef: (_data) => null,
                         PrefixRef: (_data) => null,
diff --git a/src/types/gql.ts b/src/types/gql.ts
index 0626a32e28..0b060e246f 100644
--- a/src/types/gql.ts
+++ b/src/types/gql.ts
@@ -1,4 +1,8 @@
-import type { AlertType, AlertTypeInfo } from 'src/gql-types/graphql';
+import type {
+    AlertConfigsFilter,
+    AlertType,
+    AlertTypeInfo,
+} from 'src/gql-types/graphql';
 import type { ShardEntityTypes } from 'src/stores/ShardDetail/types';
 
 export interface AlertDetailsRecipients {
@@ -96,6 +100,12 @@ export interface ActiveAlertCountQueryResponse {
 export type AlertHistoryForTaskQueryResponse = DefaultAlertingQueryResponse;
 export type AlertingOverviewQueryResponse = AlertHistoryForTaskQueryResponse;
 
+export interface AlertConfigQueryInput {
+    after?: string;
+    filter?: AlertConfigsFilter;
+    first?: number;
+}
+
 export interface AlertHistoryQueryResponse {
     liveSpecs: {
         edges: {

From ee2a35d6f8b162e13e00cba19f379dcd328bbfd5 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 2 Jun 2026 12:58:36 -0400
Subject: [PATCH 35/70] Move alert type field and selector components to child
 directory

---
 .../PrefixAlerts/Dialog/{ => SubscriberInfo}/AlertTypeField.tsx | 2 +-
 .../Dialog/{ => SubscriberInfo}/AlertTypeSelector.tsx           | 0
 .../Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx     | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/components/admin/Settings/PrefixAlerts/Dialog/{ => SubscriberInfo}/AlertTypeField.tsx (94%)
 rename src/components/admin/Settings/PrefixAlerts/Dialog/{ => SubscriberInfo}/AlertTypeSelector.tsx (100%)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeField.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/AlertTypeField.tsx
similarity index 94%
rename from src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeField.tsx
rename to src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/AlertTypeField.tsx
index 4aa8ab17bc..b590cba1f9 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeField.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/AlertTypeField.tsx
@@ -2,7 +2,7 @@ import type { AlertTypeFieldProps } from 'src/components/admin/Settings/PrefixAl
 
 import { Skeleton } from '@mui/material';
 
-import AlertTypeSelector from 'src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeSelector';
+import AlertTypeSelector from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/AlertTypeSelector';
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
 
 const AlertTypeField = ({ subscription }: AlertTypeFieldProps) => {
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeSelector.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/AlertTypeSelector.tsx
similarity index 100%
rename from src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeSelector.tsx
rename to src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/AlertTypeSelector.tsx
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx
index a0e5812bcf..08ba5a83e0 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx
@@ -2,8 +2,8 @@ import type { SubscriberAccordionProps } from 'src/components/admin/Settings/Pre
 
 import { AccordionDetails, Stack } from '@mui/material';
 
-import AlertTypeField from 'src/components/admin/Settings/PrefixAlerts/Dialog/AlertTypeField';
 import EmailListField from 'src/components/admin/Settings/PrefixAlerts/Dialog/EmailListField';
+import AlertTypeField from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/AlertTypeField';
 
 const Details = ({ subscription }: SubscriberAccordionProps) => {
     return (

From 6fd2b7964f9c903a97e491988b4615783562bd8c Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 2 Jun 2026 13:02:08 -0400
Subject: [PATCH 36/70] Move email field and selector components to child
 directory

---
 .../Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx     | 2 +-
 .../PrefixAlerts/Dialog/{ => SubscriberInfo}/EmailListField.tsx | 2 +-
 .../PrefixAlerts/{ => Dialog/SubscriberInfo}/EmailSelector.tsx  | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/components/admin/Settings/PrefixAlerts/Dialog/{ => SubscriberInfo}/EmailListField.tsx (95%)
 rename src/components/admin/Settings/PrefixAlerts/{ => Dialog/SubscriberInfo}/EmailSelector.tsx (100%)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx
index 08ba5a83e0..46b59c4480 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx
@@ -2,8 +2,8 @@ import type { SubscriberAccordionProps } from 'src/components/admin/Settings/Pre
 
 import { AccordionDetails, Stack } from '@mui/material';
 
-import EmailListField from 'src/components/admin/Settings/PrefixAlerts/Dialog/EmailListField';
 import AlertTypeField from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/AlertTypeField';
+import EmailListField from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/EmailListField';
 
 const Details = ({ subscription }: SubscriberAccordionProps) => {
     return (
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/EmailListField.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/EmailListField.tsx
similarity index 95%
rename from src/components/admin/Settings/PrefixAlerts/Dialog/EmailListField.tsx
rename to src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/EmailListField.tsx
index be678920fd..daef696e21 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/EmailListField.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/EmailListField.tsx
@@ -4,7 +4,7 @@ import { TextField } from '@mui/material';
 
 import { useIntl } from 'react-intl';
 
-import EmailSelector from 'src/components/admin/Settings/PrefixAlerts/EmailSelector';
+import EmailSelector from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/EmailSelector';
 
 const EmailListField = ({ subscription, staticEmail }: EmailListFieldProps) => {
     const intl = useIntl();
diff --git a/src/components/admin/Settings/PrefixAlerts/EmailSelector.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/EmailSelector.tsx
similarity index 100%
rename from src/components/admin/Settings/PrefixAlerts/EmailSelector.tsx
rename to src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/EmailSelector.tsx

From ecf453ba8c113e9db94089568f8163435fb456ba Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 2 Jun 2026 13:03:39 -0400
Subject: [PATCH 37/70] Move SubscriberInfo directory into SubscriberSection
 directory

---
 .../SubscriberInfo/AlertTypeField.tsx                       | 2 +-
 .../SubscriberInfo/AlertTypeSelector.tsx                    | 0
 .../{ => SubscriberSection}/SubscriberInfo/DeleteButton.tsx | 0
 .../{ => SubscriberSection}/SubscriberInfo/Details.tsx      | 4 ++--
 .../SubscriberInfo/EmailListField.tsx                       | 2 +-
 .../SubscriberInfo/EmailSelector.tsx                        | 0
 .../{ => SubscriberSection}/SubscriberInfo/Summary.tsx      | 0
 .../{ => SubscriberSection}/SubscriberInfo/SummaryEmpty.tsx | 0
 .../Dialog/{ => SubscriberSection}/SubscriberInfo/index.tsx | 6 +++---
 .../PrefixAlerts/Dialog/SubscriberSection/index.tsx         | 4 ++--
 10 files changed, 9 insertions(+), 9 deletions(-)
 rename src/components/admin/Settings/PrefixAlerts/Dialog/{ => SubscriberSection}/SubscriberInfo/AlertTypeField.tsx (92%)
 rename src/components/admin/Settings/PrefixAlerts/Dialog/{ => SubscriberSection}/SubscriberInfo/AlertTypeSelector.tsx (100%)
 rename src/components/admin/Settings/PrefixAlerts/Dialog/{ => SubscriberSection}/SubscriberInfo/DeleteButton.tsx (100%)
 rename src/components/admin/Settings/PrefixAlerts/Dialog/{ => SubscriberSection}/SubscriberInfo/Details.tsx (84%)
 rename src/components/admin/Settings/PrefixAlerts/Dialog/{ => SubscriberSection}/SubscriberInfo/EmailListField.tsx (93%)
 rename src/components/admin/Settings/PrefixAlerts/Dialog/{ => SubscriberSection}/SubscriberInfo/EmailSelector.tsx (100%)
 rename src/components/admin/Settings/PrefixAlerts/Dialog/{ => SubscriberSection}/SubscriberInfo/Summary.tsx (100%)
 rename src/components/admin/Settings/PrefixAlerts/Dialog/{ => SubscriberSection}/SubscriberInfo/SummaryEmpty.tsx (100%)
 rename src/components/admin/Settings/PrefixAlerts/Dialog/{ => SubscriberSection}/SubscriberInfo/index.tsx (94%)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/AlertTypeField.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeField.tsx
similarity index 92%
rename from src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/AlertTypeField.tsx
rename to src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeField.tsx
index b590cba1f9..8d2afe88d5 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/AlertTypeField.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeField.tsx
@@ -2,7 +2,7 @@ import type { AlertTypeFieldProps } from 'src/components/admin/Settings/PrefixAl
 
 import { Skeleton } from '@mui/material';
 
-import AlertTypeSelector from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/AlertTypeSelector';
+import AlertTypeSelector from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector';
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
 
 const AlertTypeField = ({ subscription }: AlertTypeFieldProps) => {
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/AlertTypeSelector.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx
similarity index 100%
rename from src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/AlertTypeSelector.tsx
rename to src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/DeleteButton.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/DeleteButton.tsx
similarity index 100%
rename from src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/DeleteButton.tsx
rename to src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/DeleteButton.tsx
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/Details.tsx
similarity index 84%
rename from src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx
rename to src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/Details.tsx
index 46b59c4480..7a43783f92 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/Details.tsx
@@ -2,8 +2,8 @@ import type { SubscriberAccordionProps } from 'src/components/admin/Settings/Pre
 
 import { AccordionDetails, Stack } from '@mui/material';
 
-import AlertTypeField from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/AlertTypeField';
-import EmailListField from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/EmailListField';
+import AlertTypeField from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeField';
+import EmailListField from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/EmailListField';
 
 const Details = ({ subscription }: SubscriberAccordionProps) => {
     return (
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/EmailListField.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/EmailListField.tsx
similarity index 93%
rename from src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/EmailListField.tsx
rename to src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/EmailListField.tsx
index daef696e21..5fbab63912 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/EmailListField.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/EmailListField.tsx
@@ -4,7 +4,7 @@ import { TextField } from '@mui/material';
 
 import { useIntl } from 'react-intl';
 
-import EmailSelector from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/EmailSelector';
+import EmailSelector from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/EmailSelector';
 
 const EmailListField = ({ subscription, staticEmail }: EmailListFieldProps) => {
     const intl = useIntl();
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/EmailSelector.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/EmailSelector.tsx
similarity index 100%
rename from src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/EmailSelector.tsx
rename to src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/EmailSelector.tsx
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/Summary.tsx
similarity index 100%
rename from src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary.tsx
rename to src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/Summary.tsx
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/SummaryEmpty.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/SummaryEmpty.tsx
similarity index 100%
rename from src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/SummaryEmpty.tsx
rename to src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/SummaryEmpty.tsx
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/index.tsx
similarity index 94%
rename from src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
rename to src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/index.tsx
index 3a8ae44092..c077aa0db5 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/index.tsx
@@ -2,9 +2,9 @@ import type { SubscriberAccordionProps } from 'src/components/admin/Settings/Pre
 
 import { Accordion, Stack, useTheme } from '@mui/material';
 
-import DeleteButton from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/DeleteButton';
-import Details from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Details';
-import Summary from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/Summary';
+import DeleteButton from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/DeleteButton';
+import Details from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/Details';
+import Summary from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/Summary';
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
 import { useEvaluateSubscriptionIneligibility } from 'src/components/admin/Settings/PrefixAlerts/useEvaluateSubscriptionIneligibility';
 import { defaultOutline, defaultOutlineColor_hovered } from 'src/context/Theme';
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx
index de795c44c0..1e2c5d27dd 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx
@@ -6,9 +6,9 @@ import { Stack, Typography } from '@mui/material';
 
 import { useIntl } from 'react-intl';
 
-import SubscriberInfo from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo';
-import SummaryEmpty from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberInfo/SummaryEmpty';
 import AddButton from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/AddButton';
+import SubscriberInfo from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo';
+import SummaryEmpty from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/SummaryEmpty';
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
 import { useGetAlertTypes } from 'src/context/AlertType';
 import { hasOwnProperty } from 'src/utils/misc-utils';

From 234807be52375d23f603397d92ee5f1b20f8edbe Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 2 Jun 2026 14:15:58 -0400
Subject: [PATCH 38/70] Add global settings section to dialog

---
 .../GlobalSettings/DataMovementSetting.tsx    | 69 +++++++++++++++++++
 .../Dialog/GlobalSettings/index.tsx           | 63 +++++++++++++++++
 .../Settings/PrefixAlerts/Dialog/index.tsx    |  3 +
 .../admin/Settings/PrefixAlerts/types.ts      | 22 +++---
 src/lang/en-US/Alerts.ts                      |  5 +-
 src/utils/notification-utils.ts               | 29 ++++++++
 6 files changed, 181 insertions(+), 10 deletions(-)
 create mode 100644 src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/DataMovementSetting.tsx
 create mode 100644 src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/index.tsx

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/DataMovementSetting.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/DataMovementSetting.tsx
new file mode 100644
index 0000000000..3194769b81
--- /dev/null
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/DataMovementSetting.tsx
@@ -0,0 +1,69 @@
+import type { AutocompleteRenderInputParams } from '@mui/material';
+import type { GlobalSettingProps } from 'src/components/admin/Settings/PrefixAlerts/types';
+
+import { Autocomplete, Stack, TextField, Typography } from '@mui/material';
+
+import { useIntl } from 'react-intl';
+
+import useSettingIntervalOptions from 'src/components/shared/Entity/Details/Overview/NotificationSettings/useSettingIntervalOptions';
+import { translateUnconventionalTimeFormat } from 'src/utils/notification-utils';
+
+const DataMovementSetting = ({
+    prefix,
+    setting,
+}: GlobalSettingProps<{ stalledFor: string }>) => {
+    const intl = useIntl();
+
+    const { options } = useSettingIntervalOptions();
+
+    return (
+        <Stack spacing={2}>
+            <Stack spacing="2px">
+                <Typography style={{ fontWeight: 500 }}>
+                    {intl.formatMessage({
+                        id: 'alerts.alertType.humanReadable.data_movement_stalled',
+                    })}
+                </Typography>
+
+                <Typography>
+                    {intl.formatMessage({
+                        id: 'details.settings.notifications.dataProcessing.noDataProcessedInInterval.message',
+                    })}
+                </Typography>
+            </Stack>
+
+            <Autocomplete
+                disabled={!prefix}
+                disableClearable
+                fullWidth
+                getOptionLabel={(interval) => options[interval]}
+                onChange={() => {}}
+                options={Object.keys(options)}
+                renderInput={({
+                    InputProps,
+                    ...params
+                }: AutocompleteRenderInputParams) => (
+                    <TextField
+                        {...params}
+                        label={intl.formatMessage({
+                            id: 'details.settings.notifications.dataProcessing.noDataProcessedInInterval.label',
+                        })}
+                        size="small"
+                        variant="outlined"
+                        slotProps={{
+                            input: {
+                                ...InputProps,
+                                sx: { borderRadius: 3 },
+                            },
+                        }}
+                    />
+                )}
+                value={translateUnconventionalTimeFormat(
+                    setting?.condition.stalledFor
+                )}
+            />
+        </Stack>
+    );
+};
+
+export default DataMovementSetting;
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/index.tsx
new file mode 100644
index 0000000000..e497d096ca
--- /dev/null
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/index.tsx
@@ -0,0 +1,63 @@
+import { useMemo } from 'react';
+
+import { Stack, Typography } from '@mui/material';
+
+import { useIntl } from 'react-intl';
+
+import DataMovementSetting from 'src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/DataMovementSetting';
+import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
+import { defaultOutline } from 'src/context/Theme';
+import { hasOwnProperty } from 'src/utils/misc-utils';
+
+const GlobalSettings = () => {
+    const intl = useIntl();
+
+    const catalogPrefix = useAlertSubscriptionsStore(
+        (state) => state.catalogPrefix
+    );
+    const mutableSubscriptionMetadata = useAlertSubscriptionsStore(
+        (state) => state.mutableSubscriptionMetadata
+    );
+
+    const targetGlobalSettings = useMemo(
+        () =>
+            hasOwnProperty(mutableSubscriptionMetadata, catalogPrefix)
+                ? mutableSubscriptionMetadata[catalogPrefix].settings
+                : {},
+        [catalogPrefix, mutableSubscriptionMetadata]
+    );
+
+    return (
+        <Stack
+            spacing={2}
+            sx={{
+                backgroundColor: (theme) =>
+                    theme.palette.mode === 'dark' ? 'transparent' : 'white',
+                border: (theme) => defaultOutline[theme.palette.mode],
+                borderRadius: '6px',
+                padding: 2,
+            }}
+        >
+            <Stack spacing="2px">
+                <Typography style={{ fontWeight: 500 }}>
+                    {intl.formatMessage({
+                        id: 'alerts.config.dialog.label.globalSettings',
+                    })}
+                </Typography>
+
+                <Typography>
+                    {intl.formatMessage({
+                        id: 'alerts.config.dialog.message.globalSettings',
+                    })}
+                </Typography>
+            </Stack>
+
+            <DataMovementSetting
+                prefix={catalogPrefix}
+                setting={targetGlobalSettings?.['dataMovementStalled']}
+            />
+        </Stack>
+    );
+};
+
+export default GlobalSettings;
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
index d37f36c4fa..391d51f501 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
@@ -15,6 +15,7 @@ import { useIntl } from 'react-intl';
 import { useUnmount } from 'react-use';
 
 import DeleteButton from 'src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton';
+import GlobalSettings from 'src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings';
 import PrefixField from 'src/components/admin/Settings/PrefixAlerts/Dialog/PrefixField';
 import SaveButton from 'src/components/admin/Settings/PrefixAlerts/Dialog/SaveButton';
 import ServerErrors from 'src/components/admin/Settings/PrefixAlerts/Dialog/ServerErrors';
@@ -76,6 +77,8 @@ const AlertSubscriptionDialog = ({
                 <Stack spacing={4}>
                     <PrefixField staticPrefix={staticPrefix} />
 
+                    <GlobalSettings />
+
                     <SubscriberSection />
                 </Stack>
             </DialogContent>
diff --git a/src/components/admin/Settings/PrefixAlerts/types.ts b/src/components/admin/Settings/PrefixAlerts/types.ts
index 88ee630636..2af340a960 100644
--- a/src/components/admin/Settings/PrefixAlerts/types.ts
+++ b/src/components/admin/Settings/PrefixAlerts/types.ts
@@ -2,6 +2,7 @@ import type { TableCellProps } from '@mui/material';
 import type { Dispatch, SetStateAction } from 'react';
 import type { ReducedAlertSubscription } from 'src/api/types';
 import type { AlertTypeInfo } from 'src/gql-types/graphql';
+import type { Schema } from 'src/types';
 import type { BaseAlertSubscriptionMutationInput } from 'src/types/gql';
 
 export interface AlertSubscriptionDialogProps extends PrefixFieldProps {
@@ -28,6 +29,12 @@ export interface AlertTypeSelectorProps extends AlertTypeFieldProps {
     options: AlertTypeInfo[];
 }
 
+export interface BaseGlobalSetting<T> {
+    condition: T;
+    autoDisable?: boolean;
+    enabled?: boolean;
+}
+
 export interface DialogActionProps {
     closeDialog: () => void;
 }
@@ -45,20 +52,17 @@ export interface EmailListFieldProps extends SubscriptionDependentProps {
     staticEmail?: string;
 }
 
+export interface GlobalSettingProps<T> {
+    prefix: string;
+    setting: BaseGlobalSetting<T> | undefined;
+}
+
 export interface MutableAlertSubscription extends ReducedAlertSubscription {
     id: string;
     viewing: boolean;
     deleted?: boolean;
 }
 
-interface GlobalSetting {
-    [property: string]: boolean | number | string;
-}
-
-interface GlobalSettingDictionary {
-    [alertType: string]: GlobalSetting;
-}
-
 export interface PrefixFieldProps {
     staticPrefix?: string;
 }
@@ -78,7 +82,7 @@ export interface SubscriptionDependentProps {
 }
 
 export interface SubscriptionMetadata {
-    settings: GlobalSettingDictionary;
+    settings: Schema;
     subscriptions: MutableAlertSubscription[];
 }
 
diff --git a/src/lang/en-US/Alerts.ts b/src/lang/en-US/Alerts.ts
index 4d4a62ab25..66d229e2d3 100644
--- a/src/lang/en-US/Alerts.ts
+++ b/src/lang/en-US/Alerts.ts
@@ -10,9 +10,11 @@ export const Alerts: Record<string, string> = {
     'alerts.config.dialog.error.generic': `An issue was encountered {operation} an alert subscription.`,
     'alerts.config.dialog.error.term.delete': `deleting`,
     'alerts.config.dialog.error.term.modify': `creating or updating`,
+    'alerts.config.dialog.label.globalSettings': `Global Settings`,
     'alerts.config.dialog.label.subscribers': `Recipients ({count})`,
     'alerts.config.dialog.label.placeholderSubscriberId': `(new recipient)`,
     'alerts.config.dialog.message.noExistingSubscriptions': `No emails are configured to be notified for prefix, {prefix}. To receive notifications for this prefix, click "Add Recipient" to get started.`,
+    'alerts.config.dialog.message.globalSettings': `Default settings applied to all tasks under this prefix. Individual tasks can override these values in their own notification settings.`,
     'alerts.config.dialog.generate.description': `Choose where you'd like notifications to be sent. Email addresses can be for mailing lists, {docLink}, or individual users.`,
     'alerts.config.dialog.generate.description.docLink': `Slack channels`,
     'alerts.config.dialog.generate.description.docPath': `https://slack.com/intl/en-au/help/articles/206819278-Send-emails-to-Slack`,
@@ -69,7 +71,8 @@ export const Alerts: Record<string, string> = {
     'alert.active.noAlerts.title': `All Clear!`,
     'alert.active.noAlerts.message': `No active alerts.`,
 
-    // Consumed in ui/src/settings/alerts.ts and ui/src/hooks/useAlertTypeContent.ts
+    // Consumed in ui/src/settings/alerts.ts, ui/src/hooks/useAlertTypeContent.ts,
+    // and ui/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/DataMovementSetting.tsx
     'alerts.alertType.humanReadable.auto_discover_failed': `Auto Discover Failed`,
     'alerts.alertType.humanReadable.background_publication_failed': `Background Publication Failed`,
     'alerts.alertType.humanReadable.shard_failed': `Task Failure`,
diff --git a/src/utils/notification-utils.ts b/src/utils/notification-utils.ts
index 0f408c5f95..0531554a03 100644
--- a/src/utils/notification-utils.ts
+++ b/src/utils/notification-utils.ts
@@ -37,3 +37,32 @@ export const bundleSubscriptionsByPrefix = (
 
     return subscriptionMetadata;
 };
+
+export const translateUnconventionalTimeFormat = (
+    value: string | undefined
+) => {
+    switch (value) {
+        case '1h':
+            return '01:00:00';
+        case '2h':
+            return '02:00:00';
+        case '4h':
+            return '04:00:00';
+        case '8h':
+            return '08:00:00';
+        case '12h':
+            return '12:00:00';
+        case '24h':
+            return '24:00:00';
+        case '1d':
+            return '24:00:00';
+        case '2d':
+            return '2 days';
+        case '3d':
+            return '3 days';
+        case '7d':
+            return '7 days';
+        default:
+            return 'none';
+    }
+};

From 3dd464aef304198bf46f1888f84fab7c044867ad Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 2 Jun 2026 14:34:55 -0400
Subject: [PATCH 39/70] Set data movement stalled global setting in dialog

---
 .../GlobalSettings/DataMovementSetting.tsx    | 26 +++++++++++++++--
 .../useAlertSubscriptionsStore.ts             |  4 +--
 .../PrefixAlerts/useInitializeAlertConfigs.ts |  8 ++---
 src/utils/notification-utils.ts               | 29 +++++++++++++++++--
 4 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/DataMovementSetting.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/DataMovementSetting.tsx
index 3194769b81..dd56eba8a6 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/DataMovementSetting.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/DataMovementSetting.tsx
@@ -1,12 +1,18 @@
 import type { AutocompleteRenderInputParams } from '@mui/material';
 import type { GlobalSettingProps } from 'src/components/admin/Settings/PrefixAlerts/types';
 
+import React from 'react';
+
 import { Autocomplete, Stack, TextField, Typography } from '@mui/material';
 
 import { useIntl } from 'react-intl';
 
+import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
 import useSettingIntervalOptions from 'src/components/shared/Entity/Details/Overview/NotificationSettings/useSettingIntervalOptions';
-import { translateUnconventionalTimeFormat } from 'src/utils/notification-utils';
+import {
+    fromUnconventionalTimeFormat,
+    toUnconventionalTimeFormat,
+} from 'src/utils/notification-utils';
 
 const DataMovementSetting = ({
     prefix,
@@ -16,6 +22,10 @@ const DataMovementSetting = ({
 
     const { options } = useSettingIntervalOptions();
 
+    const initializeGlobalPrefixSettings = useAlertSubscriptionsStore(
+        (state) => state.setGlobalPrefixSettings
+    );
+
     return (
         <Stack spacing={2}>
             <Stack spacing="2px">
@@ -37,7 +47,17 @@ const DataMovementSetting = ({
                 disableClearable
                 fullWidth
                 getOptionLabel={(interval) => options[interval]}
-                onChange={() => {}}
+                onChange={(_event: React.SyntheticEvent, value: string) => {
+                    const formattedValue = toUnconventionalTimeFormat(value);
+
+                    if (formattedValue !== 'none') {
+                        initializeGlobalPrefixSettings({
+                            dataMovementStalled: {
+                                condition: { stalledFor: formattedValue },
+                            },
+                        });
+                    }
+                }}
                 options={Object.keys(options)}
                 renderInput={({
                     InputProps,
@@ -58,7 +78,7 @@ const DataMovementSetting = ({
                         }}
                     />
                 )}
-                value={translateUnconventionalTimeFormat(
+                value={fromUnconventionalTimeFormat(
                     setting?.condition.stalledFor
                 )}
             />
diff --git a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
index 905cb77fdb..e736b65262 100644
--- a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
@@ -26,7 +26,6 @@ interface AlertSubscriptionState {
         values: AlertTypeInfo[],
         fetching: boolean
     ) => void;
-    initializeGlobalPrefixSettings: (value: Schema) => void;
     initializeMutableSubscriptionMetadata: () => void;
     markSubscriptionForDeletion: (
         catalogPrefix: string,
@@ -49,6 +48,7 @@ interface AlertSubscriptionState {
     setEmailErrorsExist: (
         value: AlertSubscriptionState['emailErrorsExist']
     ) => void;
+    setGlobalPrefixSettings: (value: Schema) => void;
     setInitializationError: (
         value: AlertSubscriptionState['initializationError']
     ) => void;
@@ -182,7 +182,7 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                     'alert type options initialized'
                 ),
 
-            initializeGlobalPrefixSettings: (value) =>
+            setGlobalPrefixSettings: (value) =>
                 set(
                     produce((state: AlertSubscriptionState) => {
                         if (!state.catalogPrefix || isEmpty(value)) {
diff --git a/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts b/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts
index 9fb27b0058..f60d996625 100644
--- a/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts
@@ -11,8 +11,8 @@ export function useInitializeAlertConfigs() {
     const catalogPrefix = useAlertSubscriptionsStore(
         (state) => state.catalogPrefix
     );
-    const initializeGlobalPrefixSettings = useAlertSubscriptionsStore(
-        (state) => state.initializeGlobalPrefixSettings
+    const setGlobalPrefixSettings = useAlertSubscriptionsStore(
+        (state) => state.setGlobalPrefixSettings
     );
     const mutableSubscriptionMetadata = useAlertSubscriptionsStore(
         (state) => state.mutableSubscriptionMetadata
@@ -55,7 +55,7 @@ export function useInitializeAlertConfigs() {
             data?.alertConfigs &&
             data.alertConfigs.edges.length > 0
         ) {
-            initializeGlobalPrefixSettings(
+            setGlobalPrefixSettings(
                 data.alertConfigs.edges[0].node.effective.config
             );
         }
@@ -64,7 +64,7 @@ export function useInitializeAlertConfigs() {
         data,
         debouncedPrefix,
         fetching,
-        initializeGlobalPrefixSettings,
+        setGlobalPrefixSettings,
         settingsDefined,
     ]);
 }
diff --git a/src/utils/notification-utils.ts b/src/utils/notification-utils.ts
index 0531554a03..86f5c081b3 100644
--- a/src/utils/notification-utils.ts
+++ b/src/utils/notification-utils.ts
@@ -38,9 +38,7 @@ export const bundleSubscriptionsByPrefix = (
     return subscriptionMetadata;
 };
 
-export const translateUnconventionalTimeFormat = (
-    value: string | undefined
-) => {
+export const fromUnconventionalTimeFormat = (value: string | undefined) => {
     switch (value) {
         case '1h':
             return '01:00:00';
@@ -66,3 +64,28 @@ export const translateUnconventionalTimeFormat = (
             return 'none';
     }
 };
+
+export const toUnconventionalTimeFormat = (value: string | undefined) => {
+    switch (value) {
+        case '01:00:00':
+            return '1h';
+        case '02:00:00':
+            return '2h';
+        case '04:00:00':
+            return '4h';
+        case '08:00:00':
+            return '8h';
+        case '12:00:00':
+            return '12h';
+        case '24:00:00':
+            return '24h';
+        case '2 days':
+            return '2d';
+        case '3 days':
+            return '3d';
+        case '7 days':
+            return '7d';
+        default:
+            return 'none';
+    }
+};

From 7c7183a7763959d04c0f8347b09aee073db190b3 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 2 Jun 2026 14:41:38 -0400
Subject: [PATCH 40/70] Prevent existing global settings from being removed

---
 .../Settings/PrefixAlerts/useAlertSubscriptionsStore.ts  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
index e736b65262..776569f8a2 100644
--- a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
@@ -207,10 +207,15 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
 
                         state.mutableSubscriptionMetadata[
                             state.catalogPrefix
-                        ].settings = value;
+                        ].settings = {
+                            ...state.mutableSubscriptionMetadata[
+                                state.catalogPrefix
+                            ].settings,
+                            ...value,
+                        };
                     }),
                     false,
-                    'global prefix settings initialized'
+                    'global prefix settings set'
                 ),
 
             initializeMutableSubscriptionMetadata: () =>

From 9cceb0d301425bee60e922a4b9359d07ad2e0e62 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 2 Jun 2026 15:00:11 -0400
Subject: [PATCH 41/70] Unset data movement stalled global setting in dialog

---
 .../GlobalSettings/DataMovementSetting.tsx    | 24 ++++++++------
 .../Dialog/GlobalSettings/index.tsx           |  8 ++++-
 .../admin/Settings/PrefixAlerts/types.ts      | 16 +++++----
 .../useAlertSubscriptionsStore.ts             | 33 ++++++++++++-------
 src/utils/notification-utils.ts               |  4 +++
 5 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/DataMovementSetting.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/DataMovementSetting.tsx
index dd56eba8a6..970cce4631 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/DataMovementSetting.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/DataMovementSetting.tsx
@@ -16,13 +16,14 @@ import {
 
 const DataMovementSetting = ({
     prefix,
-    setting,
+    config,
+    targetSetting,
 }: GlobalSettingProps<{ stalledFor: string }>) => {
     const intl = useIntl();
 
     const { options } = useSettingIntervalOptions();
 
-    const initializeGlobalPrefixSettings = useAlertSubscriptionsStore(
+    const setGlobalPrefixSettings = useAlertSubscriptionsStore(
         (state) => state.setGlobalPrefixSettings
     );
 
@@ -50,13 +51,16 @@ const DataMovementSetting = ({
                 onChange={(_event: React.SyntheticEvent, value: string) => {
                     const formattedValue = toUnconventionalTimeFormat(value);
 
-                    if (formattedValue !== 'none') {
-                        initializeGlobalPrefixSettings({
-                            dataMovementStalled: {
-                                condition: { stalledFor: formattedValue },
-                            },
-                        });
-                    }
+                    setGlobalPrefixSettings(
+                        formattedValue !== 'none'
+                            ? {
+                                  [targetSetting]: {
+                                      condition: { stalledFor: formattedValue },
+                                  },
+                              }
+                            : {},
+                        targetSetting
+                    );
                 }}
                 options={Object.keys(options)}
                 renderInput={({
@@ -79,7 +83,7 @@ const DataMovementSetting = ({
                     />
                 )}
                 value={fromUnconventionalTimeFormat(
-                    setting?.condition.stalledFor
+                    config?.condition.stalledFor
                 )}
             />
         </Stack>
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/index.tsx
index e497d096ca..11b2ea871d 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/index.tsx
@@ -8,6 +8,7 @@ import DataMovementSetting from 'src/components/admin/Settings/PrefixAlerts/Dial
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
 import { defaultOutline } from 'src/context/Theme';
 import { hasOwnProperty } from 'src/utils/misc-utils';
+import { AlertConfigKeys } from 'src/utils/notification-utils';
 
 const GlobalSettings = () => {
     const intl = useIntl();
@@ -53,8 +54,13 @@ const GlobalSettings = () => {
             </Stack>
 
             <DataMovementSetting
+                config={
+                    targetGlobalSettings?.[
+                        AlertConfigKeys.DATA_MOVEMENT_STALLED
+                    ]
+                }
                 prefix={catalogPrefix}
-                setting={targetGlobalSettings?.['dataMovementStalled']}
+                targetSetting={AlertConfigKeys.DATA_MOVEMENT_STALLED}
             />
         </Stack>
     );
diff --git a/src/components/admin/Settings/PrefixAlerts/types.ts b/src/components/admin/Settings/PrefixAlerts/types.ts
index 2af340a960..d4c1283ad6 100644
--- a/src/components/admin/Settings/PrefixAlerts/types.ts
+++ b/src/components/admin/Settings/PrefixAlerts/types.ts
@@ -4,6 +4,7 @@ import type { ReducedAlertSubscription } from 'src/api/types';
 import type { AlertTypeInfo } from 'src/gql-types/graphql';
 import type { Schema } from 'src/types';
 import type { BaseAlertSubscriptionMutationInput } from 'src/types/gql';
+import type { AlertConfigKeys } from 'src/utils/notification-utils';
 
 export interface AlertSubscriptionDialogProps extends PrefixFieldProps {
     descriptionId: string;
@@ -29,12 +30,6 @@ export interface AlertTypeSelectorProps extends AlertTypeFieldProps {
     options: AlertTypeInfo[];
 }
 
-export interface BaseGlobalSetting<T> {
-    condition: T;
-    autoDisable?: boolean;
-    enabled?: boolean;
-}
-
 export interface DialogActionProps {
     closeDialog: () => void;
 }
@@ -52,9 +47,16 @@ export interface EmailListFieldProps extends SubscriptionDependentProps {
     staticEmail?: string;
 }
 
+interface GlobalSettingConfig<T> {
+    condition: T;
+    autoDisable?: boolean;
+    enabled?: boolean;
+}
+
 export interface GlobalSettingProps<T> {
+    config: GlobalSettingConfig<T> | undefined;
     prefix: string;
-    setting: BaseGlobalSetting<T> | undefined;
+    targetSetting: AlertConfigKeys;
 }
 
 export interface MutableAlertSubscription extends ReducedAlertSubscription {
diff --git a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
index 776569f8a2..f18312385d 100644
--- a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
@@ -9,7 +9,7 @@ import { create } from 'zustand';
 import { devtools } from 'zustand/middleware';
 
 import produce from 'immer';
-import { cloneDeep, isEmpty } from 'lodash';
+import { cloneDeep, isEmpty, omit } from 'lodash';
 
 import { hasOwnProperty } from 'src/utils/misc-utils';
 import { bundleSubscriptionsByPrefix } from 'src/utils/notification-utils';
@@ -48,7 +48,7 @@ interface AlertSubscriptionState {
     setEmailErrorsExist: (
         value: AlertSubscriptionState['emailErrorsExist']
     ) => void;
-    setGlobalPrefixSettings: (value: Schema) => void;
+    setGlobalPrefixSettings: (value: Schema, targetSetting?: string) => void;
     setInitializationError: (
         value: AlertSubscriptionState['initializationError']
     ) => void;
@@ -182,18 +182,21 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                     'alert type options initialized'
                 ),
 
-            setGlobalPrefixSettings: (value) =>
+            setGlobalPrefixSettings: (value, targetSetting) =>
                 set(
                     produce((state: AlertSubscriptionState) => {
-                        if (!state.catalogPrefix || isEmpty(value)) {
+                        if (!state.catalogPrefix) {
                             return;
                         }
 
+                        const valueEmpty = isEmpty(value);
+
                         if (
                             !hasOwnProperty(
                                 state.mutableSubscriptionMetadata,
                                 state.catalogPrefix
-                            )
+                            ) &&
+                            !valueEmpty
                         ) {
                             state.mutableSubscriptionMetadata[
                                 state.catalogPrefix
@@ -207,12 +210,20 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
 
                         state.mutableSubscriptionMetadata[
                             state.catalogPrefix
-                        ].settings = {
-                            ...state.mutableSubscriptionMetadata[
-                                state.catalogPrefix
-                            ].settings,
-                            ...value,
-                        };
+                        ].settings =
+                            valueEmpty && targetSetting
+                                ? omit(
+                                      state.mutableSubscriptionMetadata[
+                                          state.catalogPrefix
+                                      ].settings,
+                                      targetSetting
+                                  )
+                                : {
+                                      ...state.mutableSubscriptionMetadata[
+                                          state.catalogPrefix
+                                      ].settings,
+                                      ...value,
+                                  };
                     }),
                     false,
                     'global prefix settings set'
diff --git a/src/utils/notification-utils.ts b/src/utils/notification-utils.ts
index 86f5c081b3..bb10f043e5 100644
--- a/src/utils/notification-utils.ts
+++ b/src/utils/notification-utils.ts
@@ -2,6 +2,10 @@ import type { OptionsObject } from 'notistack';
 import type { ReducedAlertSubscription } from 'src/api/types';
 import type { SubscriptionMetadataDictionary } from 'src/components/admin/Settings/PrefixAlerts/types';
 
+export enum AlertConfigKeys {
+    DATA_MOVEMENT_STALLED = 'dataMovementStalled',
+}
+
 export const snackbarSettings: OptionsObject = {
     anchorOrigin: {
         vertical: 'top',

From 3ec148245ae3873307f5072151575766aba4edf4 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 2 Jun 2026 15:01:55 -0400
Subject: [PATCH 42/70] Remove commented code fragment from Rows

---
 src/components/tables/PrefixAlerts/Rows.tsx | 27 ---------------------
 1 file changed, 27 deletions(-)

diff --git a/src/components/tables/PrefixAlerts/Rows.tsx b/src/components/tables/PrefixAlerts/Rows.tsx
index ec0c6e0aef..487626b40c 100644
--- a/src/components/tables/PrefixAlerts/Rows.tsx
+++ b/src/components/tables/PrefixAlerts/Rows.tsx
@@ -11,33 +11,6 @@ import AlertEditButton from 'src/components/tables/cells/prefixAlerts/EditButton
 function Row({ row }: RowProps) {
     const { subscriptions } = row;
 
-    // const evaluatedAlertTypes: ChipDisplay[] = useMemo(
-    //     () =>
-    //         row.alertTypes
-    //             .map((alertType) =>
-    //                 alertTypeDefs.find((def) => def.alertType === alertType)
-    //             )
-    //             .filter((def) => typeof def !== 'undefined')
-    //             .sort((first, second) =>
-    //                 sortByAlertType(
-    //                     {
-    //                         isSystemAlert: first.isSystem,
-    //                         value: first.displayName,
-    //                     },
-    //                     {
-    //                         isSystemAlert: second.isSystem,
-    //                         value: second.displayName,
-    //                     },
-    //                     'asc'
-    //                 )
-    //             )
-    //             .map(({ displayName, isSystem }) => ({
-    //                 display: displayName,
-    //                 diminishedText: isSystem,
-    //             })),
-    //     [alertTypeDefs, row.alertTypes]
-    // );
-
     return (
         <TableRow>
             <TableCell>{subscriptions[0].catalogPrefix}</TableCell>

From d10643853384a28640d55c43a1925a6a8750c3f7 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 2 Jun 2026 15:10:14 -0400
Subject: [PATCH 43/70] Update dialog section header styling

---
 .../Settings/PrefixAlerts/Dialog/GlobalSettings/index.tsx     | 4 ++--
 .../Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/index.tsx
index 11b2ea871d..119f6c8310 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/index.tsx
@@ -39,8 +39,8 @@ const GlobalSettings = () => {
                 padding: 2,
             }}
         >
-            <Stack spacing="2px">
-                <Typography style={{ fontWeight: 500 }}>
+            <Stack spacing="4px">
+                <Typography style={{ fontSize: 16, fontWeight: 300 }}>
                     {intl.formatMessage({
                         id: 'alerts.config.dialog.label.globalSettings',
                     })}
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx
index 1e2c5d27dd..6a43032f28 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx
@@ -63,7 +63,7 @@ const SubscriberSection = () => {
                     justifyContent: 'space-between',
                 }}
             >
-                <Typography style={{ fontWeight: 500 }}>
+                <Typography style={{ fontSize: 16, fontWeight: 300 }}>
                     {intl.formatMessage(
                         { id: 'alerts.config.dialog.label.subscribers' },
                         {

From 97054bbccafeec9c41fbdb8894081d2d36818a3f Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 16 Jun 2026 09:56:38 -0400
Subject: [PATCH 44/70] Add todo comment in useInitializeAlertConfig

---
 .../admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts b/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts
index f60d996625..13656013b9 100644
--- a/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts
@@ -7,6 +7,8 @@ import { AlertConfigQuery } from 'src/api/alerts';
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
 import { hasOwnProperty } from 'src/utils/misc-utils';
 
+// TODO: Figure out the best way to display a loading state for each global
+//   setting component.
 export function useInitializeAlertConfigs() {
     const catalogPrefix = useAlertSubscriptionsStore(
         (state) => state.catalogPrefix

From dc95d361eba9e982b8b6c8a7bdf4c7bea4b0f98c Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 16 Jun 2026 10:00:01 -0400
Subject: [PATCH 45/70] Remove diminished chip styling for alert type chips

---
 .../SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx   | 1 -
 .../Dialog/SubscriberSection/SubscriberInfo/Summary.tsx      | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx
index 0828fd37b9..3ea12a8727 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx
@@ -153,7 +153,6 @@ const AlertTypeSelector = ({
                             return (
                                 <OutlinedChip
                                     {...restOfTagProps}
-                                    diminishedText={isSystem}
                                     key={`alert_type-tag-${alertType}-${index}`}
                                     label={displayName}
                                     onDelete={isSystem ? undefined : onDelete}
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/Summary.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/Summary.tsx
index fdcaa2e9ef..893853f0b8 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/Summary.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/Summary.tsx
@@ -58,10 +58,7 @@ const Summary = ({
                         'asc'
                     )
                 )
-                .map(({ displayName, isSystem }) => ({
-                    display: displayName,
-                    diminishedText: isSystem,
-                })),
+                .map(({ displayName }) => ({ display: displayName })),
         [alertTypeDefs, alertTypes]
     );
 

From a2605422efdd9b461dd92d08cf58a1f3124a5421 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 16 Jun 2026 10:18:12 -0400
Subject: [PATCH 46/70] Replace instance of depreciated renderTags prop in
 AlertTypeSelector

---
 .../SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx
index 3ea12a8727..88f28196e0 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx
@@ -129,7 +129,7 @@ const AlertTypeSelector = ({
                         />
                     );
                 }}
-                renderTags={(values, getTagProps) => {
+                renderValue={(values, getTagProps) => {
                     return values
                         .sort((first, second) =>
                             sortByAlertType(

From 56649651c9bc0efba33df1b9535b5cffa0e1f71c Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 16 Jun 2026 10:20:41 -0400
Subject: [PATCH 47/70] Rename memoized values variable in AlertTypeSelector

---
 .../SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx
index 88f28196e0..54bb044d8d 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx
@@ -41,7 +41,7 @@ const AlertTypeSelector = ({
         [options]
     );
 
-    const values: AlertTypeInfo[] = useMemo(() => {
+    const selectedAlertTypes: AlertTypeInfo[] = useMemo(() => {
         const alertTypes = subscription?.alertTypes ?? [];
 
         return options.filter(({ alertType }) =>
@@ -162,7 +162,7 @@ const AlertTypeSelector = ({
                             );
                         });
                 }}
-                value={values}
+                value={selectedAlertTypes}
             />
         </FormControl>
     );

From 6b6d28c40629f8cd4b62bd35eb5cd894ade50ff3 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 16 Jun 2026 10:41:40 -0400
Subject: [PATCH 48/70] Present system alerts in alert type selector menu

---
 .../SubscriberInfo/AlertTypeSelector.tsx      | 32 +++++++++++++++----
 .../Dialog/SelectableAutocompleteOption.tsx   |  2 +-
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx
index 54bb044d8d..ad51b75375 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx
@@ -13,6 +13,7 @@ import {
     useTheme,
 } from '@mui/material';
 
+import { Lock } from 'iconoir-react';
 import { union } from 'lodash';
 import { useIntl } from 'react-intl';
 
@@ -96,20 +97,37 @@ const AlertTypeSelector = ({
                     const { key, ...restRenderOptionProps } = renderOptionProps;
                     const { description, displayName, isSystem } = option;
 
-                    return isSystem ? null : (
+                    return (
                         <SelectableAutocompleteOption
                             key={key}
                             Content={
                                 <Stack>
-                                    <Typography
+                                    <Stack
+                                        direction="row"
                                         style={{
-                                            fontWeight: 500,
-                                            marginBottom: 4,
-                                            textTransform: 'capitalize',
+                                            justifyContent: 'space-between',
                                         }}
                                     >
-                                        {displayName}
-                                    </Typography>
+                                        <Typography
+                                            style={{
+                                                fontWeight: 500,
+                                                marginBottom: 4,
+                                                textTransform: 'capitalize',
+                                            }}
+                                        >
+                                            {displayName}
+                                        </Typography>
+
+                                        {isSystem ? (
+                                            <Lock
+                                                style={{
+                                                    color: diminishedTextColor[
+                                                        theme.palette.mode
+                                                    ],
+                                                }}
+                                            />
+                                        ) : null}
+                                    </Stack>
 
                                     {description ? (
                                         <Typography
diff --git a/src/components/shared/Dialog/SelectableAutocompleteOption.tsx b/src/components/shared/Dialog/SelectableAutocompleteOption.tsx
index c1fef82fee..8377dedecf 100644
--- a/src/components/shared/Dialog/SelectableAutocompleteOption.tsx
+++ b/src/components/shared/Dialog/SelectableAutocompleteOption.tsx
@@ -43,7 +43,7 @@ const SelectableAutocompleteOption = ({
                 <Box style={{ flexShrink: 0, marginRight: 4, width: 18 }} />
             )}
 
-            <Stack>{Content}</Stack>
+            <Stack style={{ flexGrow: 1 }}>{Content}</Stack>
         </Box>
     );
 };

From 1a1cfd7de007432c84e1c141ace72803e915a232 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 16 Jun 2026 10:46:50 -0400
Subject: [PATCH 49/70] Replace instance of depreciated InputProps prop in
 AlertTypeSelector

---
 .../SubscriberInfo/AlertTypeSelector.tsx                  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx
index ad51b75375..5741801c77 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx
@@ -82,9 +82,11 @@ const AlertTypeSelector = ({
                 }: AutocompleteRenderInputParams) => (
                     <TextField
                         {...params}
-                        InputProps={{
-                            ...InputProps,
-                            sx: { borderRadius: 3 },
+                        slotProps={{
+                            input: {
+                                ...InputProps,
+                                sx: { borderRadius: 3 },
+                            },
                         }}
                         label={intl.formatMessage({
                             id: 'entityTable.data.alertTypes',

From 246f93a475668b69b86318a0c7eeb879c115325f Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Thu, 18 Jun 2026 15:12:14 -0400
Subject: [PATCH 50/70] Upsert alert config

---
 src/api/alerts.ts                             | 21 +++++
 .../PrefixAlerts/Dialog/DeleteButton.tsx      |  4 +-
 .../PrefixAlerts/Dialog/SaveButton.tsx        |  4 +-
 .../admin/Settings/PrefixAlerts/types.ts      | 14 ++-
 ...scription.ts => useModifyAlertMetadata.ts} | 45 +++++++++-
 .../PrefixAlerts/useUpsertAlertConfig.ts      | 85 +++++++++++++++++++
 src/context/URQL.tsx                          |  3 +
 src/types/gql.ts                              |  8 ++
 src/utils/notification-utils.ts               | 14 +--
 9 files changed, 180 insertions(+), 18 deletions(-)
 rename src/components/admin/Settings/PrefixAlerts/{useModifyAlertSubscription.ts => useModifyAlertMetadata.ts} (72%)
 create mode 100644 src/components/admin/Settings/PrefixAlerts/useUpsertAlertConfig.ts

diff --git a/src/api/alerts.ts b/src/api/alerts.ts
index 13c0fb0650..a12a1cb6d4 100644
--- a/src/api/alerts.ts
+++ b/src/api/alerts.ts
@@ -7,6 +7,7 @@ import type {
     AlertSubscription as LegacyAlertSubscription,
 } from 'src/types';
 import type {
+    AlertConfigMutationInput,
     AlertConfigQueryInput,
     AlertSubscriptionMutationInput,
     AlertSubscriptionsBy,
@@ -58,6 +59,25 @@ const AlertConfigQuery = gql<AlertConfigQueryResponse, AlertConfigQueryInput>`
     }
 `;
 
+const AlertConfigUpdateMutation = gql<
+    { catalogPrefixOrName: string },
+    AlertConfigMutationInput
+>`
+    mutation UpdateAlertConfigMutation(
+        $catalogPrefixOrName: Prefix!
+        $config: JSON!
+        $detail: String
+    ) {
+        updateAlertConfig(
+            catalogPrefixOrName: $catalogPrefixOrName
+            config: $config
+            detail: $detail
+        ) {
+            catalogPrefixOrName
+        }
+    }
+`;
+
 const AlertSubscriptionCreateMutation = gql<
     { catalogPrefix: string; email: string },
     AlertSubscriptionMutationInput
@@ -213,6 +233,7 @@ const getTaskNotification = async (catalogName: string) => {
 
 export {
     AlertConfigQuery,
+    AlertConfigUpdateMutation,
     AlertSubscriptionCreateMutation,
     AlertSubscriptionDeleteMutation,
     AlertSubscriptionQuery,
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
index f5e43a4998..c2d5ffe9b6 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
@@ -7,12 +7,12 @@ import { Button } from '@mui/material';
 import { useIntl } from 'react-intl';
 
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
-import { useModifyAlertSubscription } from 'src/components/admin/Settings/PrefixAlerts/useModifyAlertSubscription';
+import { useModifyAlertMetadata } from 'src/components/admin/Settings/PrefixAlerts/useModifyAlertMetadata';
 import { hasOwnProperty } from 'src/utils/misc-utils';
 
 const DeleteButton = ({ closeDialog }: DialogActionProps) => {
     const intl = useIntl();
-    const { loading, onClick } = useModifyAlertSubscription(closeDialog, true);
+    const { loading, onClick } = useModifyAlertMetadata(closeDialog, true);
 
     const errorsExist = useAlertSubscriptionsStore(
         (state) => state.emailErrorsExist || state.prefixErrorsExist
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SaveButton.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SaveButton.tsx
index 5647a464e3..1e05e3a164 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SaveButton.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SaveButton.tsx
@@ -7,12 +7,12 @@ import { Button } from '@mui/material';
 import { useIntl } from 'react-intl';
 
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
-import { useModifyAlertSubscription } from 'src/components/admin/Settings/PrefixAlerts/useModifyAlertSubscription';
+import { useModifyAlertMetadata } from 'src/components/admin/Settings/PrefixAlerts/useModifyAlertMetadata';
 import { hasOwnProperty } from 'src/utils/misc-utils';
 
 const SaveButton = ({ closeDialog }: DialogActionProps) => {
     const intl = useIntl();
-    const { loading, onClick } = useModifyAlertSubscription(closeDialog);
+    const { loading, onClick } = useModifyAlertMetadata(closeDialog);
 
     const errorsExist = useAlertSubscriptionsStore(
         (state) => state.emailErrorsExist || state.prefixErrorsExist
diff --git a/src/components/admin/Settings/PrefixAlerts/types.ts b/src/components/admin/Settings/PrefixAlerts/types.ts
index d4c1283ad6..380b77f531 100644
--- a/src/components/admin/Settings/PrefixAlerts/types.ts
+++ b/src/components/admin/Settings/PrefixAlerts/types.ts
@@ -6,6 +6,15 @@ import type { Schema } from 'src/types';
 import type { BaseAlertSubscriptionMutationInput } from 'src/types/gql';
 import type { AlertConfigKeys } from 'src/utils/notification-utils';
 
+export interface AlertConfigResponse extends AlertMetadataErrorResponse {
+    prefix: string;
+}
+
+interface AlertMetadataErrorResponse {
+    error?: any;
+    invalid?: boolean;
+}
+
 export interface AlertSubscriptionDialogProps extends PrefixFieldProps {
     descriptionId: string;
     headerId: string;
@@ -15,10 +24,9 @@ export interface AlertSubscriptionDialogProps extends PrefixFieldProps {
 }
 
 export interface AlertSubscriptionResponse
-    extends BaseAlertSubscriptionMutationInput {
+    extends AlertMetadataErrorResponse,
+        BaseAlertSubscriptionMutationInput {
     id: string;
-    error?: any;
-    invalid?: boolean;
 }
 
 // TODO: Remove and replace type with instance of SubscriptionDependentProps.
diff --git a/src/components/admin/Settings/PrefixAlerts/useModifyAlertSubscription.ts b/src/components/admin/Settings/PrefixAlerts/useModifyAlertMetadata.ts
similarity index 72%
rename from src/components/admin/Settings/PrefixAlerts/useModifyAlertSubscription.ts
rename to src/components/admin/Settings/PrefixAlerts/useModifyAlertMetadata.ts
index 1dd133779a..20286bc51f 100644
--- a/src/components/admin/Settings/PrefixAlerts/useModifyAlertSubscription.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useModifyAlertMetadata.ts
@@ -1,5 +1,6 @@
 import type { PostgrestError } from '@supabase/postgrest-js';
 import type { AlertSubscriptionResponse } from 'src/components/admin/Settings/PrefixAlerts/types';
+import type { CombinedError } from 'urql';
 
 import { useState } from 'react';
 
@@ -7,11 +8,12 @@ import { useIntl } from 'react-intl';
 
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
 import { useDeleteAlertSubscription } from 'src/components/admin/Settings/PrefixAlerts/useDeleteAlertSubscription';
+import { useUpsertAlertConfig } from 'src/components/admin/Settings/PrefixAlerts/useUpsertAlertConfig';
 import { useUpsertAlertSubscription } from 'src/components/admin/Settings/PrefixAlerts/useUpsertAlertSubscription';
 import { BASE_ERROR } from 'src/services/supabase';
 import { hasOwnProperty, isPromiseFulfilledResult } from 'src/utils/misc-utils';
 
-export function useModifyAlertSubscription(
+export function useModifyAlertMetadata(
     closeDialog: () => void,
     deletionTrigger?: boolean
 ) {
@@ -20,6 +22,8 @@ export function useModifyAlertSubscription(
     const { upsertSubscription } = useUpsertAlertSubscription();
     const { deleteSubscription } = useDeleteAlertSubscription();
 
+    const { upsertConfig } = useUpsertAlertConfig();
+
     const setServerError = useAlertSubscriptionsStore(
         (state) => state.setSaveErrors
     );
@@ -71,7 +75,7 @@ export function useModifyAlertSubscription(
                 }
             );
 
-        const serverErrors: PostgrestError[] = [];
+        const serverErrors: (PostgrestError | CombinedError)[] = [];
 
         Promise.allSettled(subscriptionQueries).then(
             (responses) => {
@@ -85,7 +89,7 @@ export function useModifyAlertSubscription(
                         // TODO: Detect single subscription deletions when evaluating the operation performed.
                         // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
                         const serverError =
-                            response.value?.invalid && response.value?.error
+                            response.value?.invalid && !response.value?.error
                                 ? {
                                       ...BASE_ERROR,
                                       message: intl.formatMessage(
@@ -103,7 +107,9 @@ export function useModifyAlertSubscription(
                                   }
                                 : response.value?.error;
 
-                        serverErrors.push(serverError);
+                        if (serverError) {
+                            serverErrors.push(serverError);
+                        }
                     } else {
                         // TODO: Add LogRocket event for this error scenario.
                     }
@@ -114,6 +120,37 @@ export function useModifyAlertSubscription(
             }
         );
 
+        const configResponse = await upsertConfig({
+            catalogPrefixOrName: catalogPrefix,
+            config: mutableSubscriptionMetadata[catalogPrefix].settings,
+        });
+
+        if (configResponse?.error || configResponse?.invalid) {
+            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+            const serverError =
+                configResponse?.invalid && !configResponse?.error
+                    ? {
+                          ...BASE_ERROR,
+                          message: intl.formatMessage(
+                              {
+                                  id: 'alerts.config.dialog.error.generic',
+                              },
+                              {
+                                  operation: intl.formatMessage({
+                                      id: deletionTrigger
+                                          ? 'alerts.config.dialog.error.term.delete'
+                                          : 'alerts.config.dialog.error.term.modify',
+                                  }),
+                              }
+                          ),
+                      }
+                    : configResponse?.error;
+
+            if (serverError) {
+                serverErrors.push(serverError);
+            }
+        }
+
         if (serverErrors.length === 0) {
             closeDialog();
         }
diff --git a/src/components/admin/Settings/PrefixAlerts/useUpsertAlertConfig.ts b/src/components/admin/Settings/PrefixAlerts/useUpsertAlertConfig.ts
new file mode 100644
index 0000000000..160e36b8fd
--- /dev/null
+++ b/src/components/admin/Settings/PrefixAlerts/useUpsertAlertConfig.ts
@@ -0,0 +1,85 @@
+import type { AlertConfigResponse } from 'src/components/admin/Settings/PrefixAlerts/types';
+import type { AlertConfigMutationInput } from 'src/types/gql';
+
+import { useCallback } from 'react';
+
+import { useMutation } from 'urql';
+
+import { AlertConfigUpdateMutation } from 'src/api/alerts';
+import { logRocketEvent } from 'src/services/shared';
+
+export function useUpsertAlertConfig() {
+    const [upsertConfigResult, mutateUpsertConfig] = useMutation(
+        AlertConfigUpdateMutation
+    );
+
+    const upsertConfig = useCallback(
+        async ({
+            catalogPrefixOrName,
+            config,
+            detail,
+        }: AlertConfigMutationInput): Promise<AlertConfigResponse> => {
+            return mutateUpsertConfig({
+                catalogPrefixOrName,
+                config,
+                detail,
+            }).then(
+                (response) => {
+                    if (response?.error) {
+                        logRocketEvent('AlertConfig', {
+                            errorResponse: response.error,
+                            operation: 'upsert',
+                            variables: response.operation.variables,
+                        });
+
+                        const { catalogPrefixOrName: responseVariablePrefix } =
+                            response.operation.variables;
+
+                        return Promise.resolve({
+                            error: response.error,
+                            invalid: true,
+                            prefix: responseVariablePrefix,
+                        });
+                    }
+
+                    if (!response || !response?.data) {
+                        logRocketEvent('AlertConfig', {
+                            missingResponseData: !response.data,
+                            operation: 'upsert',
+                            variables: response.operation.variables,
+                        });
+
+                        const { catalogPrefixOrName: responseVariablePrefix } =
+                            response.operation.variables;
+
+                        return Promise.resolve({
+                            invalid: true,
+                            prefix: responseVariablePrefix,
+                        });
+                    }
+
+                    const { catalogPrefixOrName: responsePrefix } =
+                        response.data;
+
+                    return Promise.resolve({
+                        prefix: responsePrefix,
+                    });
+                },
+                () => {
+                    logRocketEvent('AlertConfig', {
+                        operation: 'upsert',
+                        promiseRejected: 'explicit',
+                    });
+
+                    return Promise.reject();
+                }
+            );
+        },
+        [mutateUpsertConfig]
+    );
+
+    return {
+        upsertConfig,
+        upsertConfigResult,
+    };
+}
diff --git a/src/context/URQL.tsx b/src/context/URQL.tsx
index ef31588479..acad39c4d3 100644
--- a/src/context/URQL.tsx
+++ b/src/context/URQL.tsx
@@ -74,6 +74,9 @@ function UrqlConfigProvider({ children }: BaseComponentProps) {
                             deleteInviteLink(_result, _args, cache) {
                                 invalidateQuery(cache, 'inviteLinks');
                             },
+                            updateAlertConfig(_result, _args, cache) {
+                                invalidateQuery(cache, 'alertConfigs');
+                            },
                             createAlertSubscription(_result, _args, cache) {
                                 invalidateQuery(cache, 'alertSubscriptions');
                             },
diff --git a/src/types/gql.ts b/src/types/gql.ts
index 0b060e246f..2b18a33dcd 100644
--- a/src/types/gql.ts
+++ b/src/types/gql.ts
@@ -4,6 +4,7 @@ import type {
     AlertTypeInfo,
 } from 'src/gql-types/graphql';
 import type { ShardEntityTypes } from 'src/stores/ShardDetail/types';
+import type { Schema } from 'src/types/index';
 
 export interface AlertDetailsRecipients {
     email: string;
@@ -134,6 +135,13 @@ export interface AlertSubscription extends BaseFields {
     email: string;
 }
 
+// This interface is used for the upsert alert config mutation.
+export interface AlertConfigMutationInput {
+    catalogPrefixOrName: string;
+    config: Schema;
+    detail?: string;
+}
+
 // This interface is used for create and update alert subscription mutations.
 export interface AlertSubscriptionMutationInput
     extends BaseAlertSubscriptionMutationInput {
diff --git a/src/utils/notification-utils.ts b/src/utils/notification-utils.ts
index bb10f043e5..3ba3c817dc 100644
--- a/src/utils/notification-utils.ts
+++ b/src/utils/notification-utils.ts
@@ -56,13 +56,13 @@ export const fromUnconventionalTimeFormat = (value: string | undefined) => {
             return '12:00:00';
         case '24h':
             return '24:00:00';
-        case '1d':
+        case '1day':
             return '24:00:00';
-        case '2d':
+        case '2days':
             return '2 days';
-        case '3d':
+        case '3days':
             return '3 days';
-        case '7d':
+        case '7days':
             return '7 days';
         default:
             return 'none';
@@ -84,11 +84,11 @@ export const toUnconventionalTimeFormat = (value: string | undefined) => {
         case '24:00:00':
             return '24h';
         case '2 days':
-            return '2d';
+            return '2days';
         case '3 days':
-            return '3d';
+            return '3days';
         case '7 days':
-            return '7d';
+            return '7days';
         default:
             return 'none';
     }

From 0b7905f41ee6113170157555cc938076e2381d4a Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Mon, 22 Jun 2026 11:36:32 -0400
Subject: [PATCH 51/70] Remove multiple prefix support

---
 .../PrefixAlerts/Dialog/DeleteButton.tsx      |   8 +-
 .../Dialog/GlobalSettings/index.tsx           |  13 +-
 .../PrefixAlerts/Dialog/SaveButton.tsx        |  10 +-
 .../Dialog/SubscriberSection/index.tsx        |  24 +-
 .../Settings/PrefixAlerts/Dialog/index.tsx    |  12 -
 .../admin/Settings/PrefixAlerts/types.ts      |   1 -
 .../useAlertSubscriptionsStore.ts             | 273 +++++++-----------
 .../useEvaluateSubscriptionIneligibility.ts   |  15 +-
 .../PrefixAlerts/useInitializeAlertConfigs.ts |   4 +-
 .../PrefixAlerts/useModifyAlertMetadata.ts    |  38 +--
 .../tables/cells/prefixAlerts/EditButton.tsx  |   1 -
 11 files changed, 141 insertions(+), 258 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
index c2d5ffe9b6..9ff6621630 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
@@ -8,7 +8,6 @@ import { useIntl } from 'react-intl';
 
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
 import { useModifyAlertMetadata } from 'src/components/admin/Settings/PrefixAlerts/useModifyAlertMetadata';
-import { hasOwnProperty } from 'src/utils/misc-utils';
 
 const DeleteButton = ({ closeDialog }: DialogActionProps) => {
     const intl = useIntl();
@@ -26,12 +25,7 @@ const DeleteButton = ({ closeDialog }: DialogActionProps) => {
     );
 
     const disabled = useMemo(() => {
-        const subscriptions = hasOwnProperty(
-            mutableSubscriptionMetadata,
-            catalogPrefix
-        )
-            ? mutableSubscriptionMetadata[catalogPrefix].subscriptions
-            : [];
+        const { subscriptions } = mutableSubscriptionMetadata;
 
         const emptyEmailExists = subscriptions.some(
             ({ email }) => email.length === 0
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/index.tsx
index 119f6c8310..de93f40bbb 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/index.tsx
@@ -1,5 +1,3 @@
-import { useMemo } from 'react';
-
 import { Stack, Typography } from '@mui/material';
 
 import { useIntl } from 'react-intl';
@@ -7,7 +5,6 @@ import { useIntl } from 'react-intl';
 import DataMovementSetting from 'src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/DataMovementSetting';
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
 import { defaultOutline } from 'src/context/Theme';
-import { hasOwnProperty } from 'src/utils/misc-utils';
 import { AlertConfigKeys } from 'src/utils/notification-utils';
 
 const GlobalSettings = () => {
@@ -20,14 +17,6 @@ const GlobalSettings = () => {
         (state) => state.mutableSubscriptionMetadata
     );
 
-    const targetGlobalSettings = useMemo(
-        () =>
-            hasOwnProperty(mutableSubscriptionMetadata, catalogPrefix)
-                ? mutableSubscriptionMetadata[catalogPrefix].settings
-                : {},
-        [catalogPrefix, mutableSubscriptionMetadata]
-    );
-
     return (
         <Stack
             spacing={2}
@@ -55,7 +44,7 @@ const GlobalSettings = () => {
 
             <DataMovementSetting
                 config={
-                    targetGlobalSettings?.[
+                    mutableSubscriptionMetadata.settings?.[
                         AlertConfigKeys.DATA_MOVEMENT_STALLED
                     ]
                 }
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SaveButton.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SaveButton.tsx
index 1e05e3a164..d55056f826 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SaveButton.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SaveButton.tsx
@@ -8,7 +8,6 @@ import { useIntl } from 'react-intl';
 
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
 import { useModifyAlertMetadata } from 'src/components/admin/Settings/PrefixAlerts/useModifyAlertMetadata';
-import { hasOwnProperty } from 'src/utils/misc-utils';
 
 const SaveButton = ({ closeDialog }: DialogActionProps) => {
     const intl = useIntl();
@@ -22,12 +21,9 @@ const SaveButton = ({ closeDialog }: DialogActionProps) => {
         (state) => state.catalogPrefix
     );
     const emptyEmailExists = useAlertSubscriptionsStore((state) =>
-        state.catalogPrefix.length > 0 &&
-        hasOwnProperty(state.mutableSubscriptionMetadata, state.catalogPrefix)
-            ? state.mutableSubscriptionMetadata[
-                  state.catalogPrefix
-              ].subscriptions.some(({ email }) => email.length === 0)
-            : false
+        state.mutableSubscriptionMetadata.subscriptions.some(
+            ({ email }) => email.length === 0
+        )
     );
 
     const disabled = useMemo(
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx
index 6a43032f28..847d8f7c5b 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx
@@ -11,16 +11,12 @@ import SubscriberInfo from 'src/components/admin/Settings/PrefixAlerts/Dialog/Su
 import SummaryEmpty from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/SummaryEmpty';
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
 import { useGetAlertTypes } from 'src/context/AlertType';
-import { hasOwnProperty } from 'src/utils/misc-utils';
 
 const SubscriberSection = () => {
     const intl = useIntl();
 
     const [{ fetching, data, error }] = useGetAlertTypes();
 
-    const catalogPrefix = useAlertSubscriptionsStore(
-        (state) => state.catalogPrefix
-    );
     const mutableSubscriptionMetadata = useAlertSubscriptionsStore(
         (state) => state.mutableSubscriptionMetadata
     );
@@ -32,17 +28,15 @@ const SubscriberSection = () => {
         (state) => state.initializeAlertTypeOptions
     );
 
-    const targetSubscriptionMetadata: SubscriptionMetadata = useMemo(() => {
-        if (hasOwnProperty(mutableSubscriptionMetadata, catalogPrefix)) {
-            return {
-                ...mutableSubscriptionMetadata[catalogPrefix],
-                subscriptions: mutableSubscriptionMetadata[
-                    catalogPrefix
-                ].subscriptions.filter(({ deleted }) => !deleted),
-            };
-        }
-        return { settings: {}, subscriptions: [] };
-    }, [catalogPrefix, mutableSubscriptionMetadata]);
+    const targetSubscriptionMetadata: SubscriptionMetadata = useMemo(
+        () => ({
+            ...mutableSubscriptionMetadata,
+            subscriptions: mutableSubscriptionMetadata.subscriptions.filter(
+                ({ deleted }) => !deleted
+            ),
+        }),
+        [mutableSubscriptionMetadata]
+    );
 
     useEffect(() => {
         if (error) {
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
index 391d51f501..be288d91b7 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
@@ -1,7 +1,5 @@
 import type { AlertSubscriptionDialogProps } from 'src/components/admin/Settings/PrefixAlerts/types';
 
-import { useEffect } from 'react';
-
 import {
     Box,
     Button,
@@ -29,7 +27,6 @@ const TITLE_ID = 'alert-subscription-dialog-title';
 
 const AlertSubscriptionDialog = ({
     descriptionId,
-    enableDeletion,
     headerId,
     open,
     setOpen,
@@ -39,9 +36,6 @@ const AlertSubscriptionDialog = ({
 
     useInitializeAlertConfigs();
 
-    const initializeMutableSubscriptionMetadata = useAlertSubscriptionsStore(
-        (state) => state.initializeMutableSubscriptionMetadata
-    );
     const resetSubscriptionState = useAlertSubscriptionsStore(
         (state) => state.resetState
     );
@@ -51,12 +45,6 @@ const AlertSubscriptionDialog = ({
         resetSubscriptionState();
     };
 
-    useEffect(() => {
-        if (open) {
-            initializeMutableSubscriptionMetadata();
-        }
-    }, [initializeMutableSubscriptionMetadata, open]);
-
     useUnmount(() => {
         resetSubscriptionState();
     });
diff --git a/src/components/admin/Settings/PrefixAlerts/types.ts b/src/components/admin/Settings/PrefixAlerts/types.ts
index 380b77f531..1115a146b4 100644
--- a/src/components/admin/Settings/PrefixAlerts/types.ts
+++ b/src/components/admin/Settings/PrefixAlerts/types.ts
@@ -20,7 +20,6 @@ export interface AlertSubscriptionDialogProps extends PrefixFieldProps {
     headerId: string;
     open: boolean;
     setOpen: Dispatch<SetStateAction<boolean>>;
-    enableDeletion?: boolean;
 }
 
 export interface AlertSubscriptionResponse
diff --git a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
index f18312385d..84a7ece692 100644
--- a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
@@ -1,15 +1,18 @@
 import type { PostgrestError } from '@supabase/postgrest-js';
 import type { ReducedAlertSubscription } from 'src/api/types';
-import type { SubscriptionMetadataDictionary } from 'src/components/admin/Settings/PrefixAlerts/types';
+import type {
+    SubscriptionMetadata,
+    SubscriptionMetadataDictionary,
+} from 'src/components/admin/Settings/PrefixAlerts/types';
 import type { AlertTypeInfo } from 'src/gql-types/graphql';
 import type { Schema } from 'src/types';
-import type { CombinedError } from 'urql';
 
 import { create } from 'zustand';
 import { devtools } from 'zustand/middleware';
 
 import produce from 'immer';
-import { cloneDeep, isEmpty, omit } from 'lodash';
+import { isEmpty, omit } from 'lodash';
+import { type CombinedError } from 'urql';
 
 import { hasOwnProperty } from 'src/utils/misc-utils';
 import { bundleSubscriptionsByPrefix } from 'src/utils/notification-utils';
@@ -26,12 +29,12 @@ interface AlertSubscriptionState {
         values: AlertTypeInfo[],
         fetching: boolean
     ) => void;
-    initializeMutableSubscriptionMetadata: () => void;
+    initializeMutableSubscriptionMetadata: (catalogPrefix: string) => void;
     markSubscriptionForDeletion: (
         catalogPrefix: string,
         subscriptionId: string
     ) => void;
-    mutableSubscriptionMetadata: SubscriptionMetadataDictionary;
+    mutableSubscriptionMetadata: SubscriptionMetadata;
     prefixErrorsExist: boolean;
     saveErrors: (CombinedError | PostgrestError | null | undefined)[];
     subscription: Pick<
@@ -59,26 +62,21 @@ interface AlertSubscriptionState {
     toggleSubscriptionViewingStatus: (subscriptionId: string) => void;
 }
 
-const getSubscriptionIndex = (
+const getImmutableSubscriptionIndex = (
     state: AlertSubscriptionState | Partial<AlertSubscriptionState>,
-    subscriptionId: string,
-    immutable?: boolean
+    subscriptionId: string
 ): number => {
-    const subscriptionMetadataTarget = immutable
-        ? 'subscriptionMetadata'
-        : 'mutableSubscriptionMetadata';
-
     if (
         !state.catalogPrefix ||
         !subscriptionId ||
-        !hasOwnProperty(state, subscriptionMetadataTarget) ||
-        isEmpty(state[subscriptionMetadataTarget]) ||
-        !hasOwnProperty(state[subscriptionMetadataTarget], state.catalogPrefix)
+        !hasOwnProperty(state, 'subscriptionMetadata') ||
+        isEmpty(state.subscriptionMetadata) ||
+        !hasOwnProperty(state.subscriptionMetadata, state.catalogPrefix)
     ) {
         return -1;
     }
 
-    return state[subscriptionMetadataTarget][
+    return state.subscriptionMetadata[
         state.catalogPrefix
     ].subscriptions.findIndex(
         (subscription) => subscription.id === subscriptionId
@@ -103,7 +101,7 @@ const getInitialState = (): Pick<
     catalogPrefix: '',
     emailErrorsExist: false,
     initializationError: null,
-    mutableSubscriptionMetadata: {},
+    mutableSubscriptionMetadata: { settings: {}, subscriptions: [] },
     prefixErrorsExist: false,
     saveErrors: [],
     subscription: { alertTypes: [], catalogPrefix: '', email: '' },
@@ -140,32 +138,9 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                             viewing: true,
                         };
 
-                        if (
-                            !hasOwnProperty(
-                                state.mutableSubscriptionMetadata,
-                                state.catalogPrefix
-                            )
-                        ) {
-                            state.mutableSubscriptionMetadata[
-                                state.catalogPrefix
-                            ] = {
-                                settings: {},
-                                subscriptions: [templatedSubscription],
-                            };
-
-                            return;
-                        }
-
-                        const targetSubscriptions =
-                            state.mutableSubscriptionMetadata[
-                                state.catalogPrefix
-                            ].subscriptions;
-
-                        state.mutableSubscriptionMetadata[
-                            state.catalogPrefix
-                        ].subscriptions = [
+                        state.mutableSubscriptionMetadata.subscriptions = [
                             templatedSubscription,
-                            ...targetSubscriptions,
+                            ...state.mutableSubscriptionMetadata.subscriptions,
                         ];
                     }),
                     false,
@@ -185,43 +160,16 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
             setGlobalPrefixSettings: (value, targetSetting) =>
                 set(
                     produce((state: AlertSubscriptionState) => {
-                        if (!state.catalogPrefix) {
-                            return;
-                        }
-
-                        const valueEmpty = isEmpty(value);
-
-                        if (
-                            !hasOwnProperty(
-                                state.mutableSubscriptionMetadata,
-                                state.catalogPrefix
-                            ) &&
-                            !valueEmpty
-                        ) {
-                            state.mutableSubscriptionMetadata[
-                                state.catalogPrefix
-                            ] = {
-                                settings: value,
-                                subscriptions: [],
-                            };
-
-                            return;
-                        }
-
-                        state.mutableSubscriptionMetadata[
-                            state.catalogPrefix
-                        ].settings =
-                            valueEmpty && targetSetting
+                        state.mutableSubscriptionMetadata.settings =
+                            isEmpty(value) && targetSetting
                                 ? omit(
-                                      state.mutableSubscriptionMetadata[
-                                          state.catalogPrefix
-                                      ].settings,
+                                      state.mutableSubscriptionMetadata
+                                          .settings,
                                       targetSetting
                                   )
                                 : {
-                                      ...state.mutableSubscriptionMetadata[
-                                          state.catalogPrefix
-                                      ].settings,
+                                      ...state.mutableSubscriptionMetadata
+                                          .settings,
                                       ...value,
                                   };
                     }),
@@ -232,9 +180,23 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
             initializeMutableSubscriptionMetadata: () =>
                 set(
                     produce((state: AlertSubscriptionState) => {
-                        state.mutableSubscriptionMetadata = cloneDeep(
-                            state.subscriptionMetadata
-                        );
+                        if (
+                            state.catalogPrefix.length === 0 ||
+                            !hasOwnProperty(
+                                state.subscriptionMetadata,
+                                state.catalogPrefix
+                            )
+                        ) {
+                            // state.mutableSubscriptionMetadata = {
+                            //     settings: {},
+                            //     subscriptions: [],
+                            // };
+
+                            return;
+                        }
+
+                        state.mutableSubscriptionMetadata =
+                            state.subscriptionMetadata[state.catalogPrefix];
                     }),
                     false,
                     'mutable subscription metadata initialized'
@@ -243,32 +205,20 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
             markSubscriptionForDeletion: (_catalogPrefix, subscriptionId) =>
                 set(
                     produce((state: AlertSubscriptionState) => {
-                        const mutableSubscriptionIndex = getSubscriptionIndex(
-                            state,
-                            subscriptionId
-                        );
-
-                        if (mutableSubscriptionIndex === -1) {
-                            return;
-                        }
-
-                        const immutableSubscriptionIndex = getSubscriptionIndex(
-                            state,
-                            subscriptionId,
-                            true
-                        );
+                        const immutableSubscriptionIndex =
+                            getImmutableSubscriptionIndex(
+                                state,
+                                subscriptionId
+                            );
 
                         // If the alert subscription does not exist in the database,
                         // it can be removed entirely from the array of mutable subscriptions.
                         if (immutableSubscriptionIndex === -1) {
-                            state.mutableSubscriptionMetadata[
-                                state.catalogPrefix
-                            ].subscriptions = state.mutableSubscriptionMetadata[
-                                state.catalogPrefix
-                            ].subscriptions.filter(
-                                (subscription) =>
-                                    subscription.id !== subscriptionId
-                            );
+                            state.mutableSubscriptionMetadata.subscriptions =
+                                state.mutableSubscriptionMetadata.subscriptions.filter(
+                                    (subscription) =>
+                                        subscription.id !== subscriptionId
+                                );
 
                             return;
                         }
@@ -277,10 +227,15 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                         // the subscription metadata should be preserved in the
                         // array of mutable subscriptions with it marked for deletion
                         // via the corresponding GraphQL endpoint.
-                        state.mutableSubscriptionMetadata[
-                            state.catalogPrefix
-                        ].subscriptions[mutableSubscriptionIndex].deleted =
-                            true;
+                        const mutableSubscriptionIndex =
+                            state.mutableSubscriptionMetadata.subscriptions.findIndex(
+                                (subscription) =>
+                                    subscription.id === subscriptionId
+                            );
+
+                        state.mutableSubscriptionMetadata.subscriptions[
+                            mutableSubscriptionIndex
+                        ].deleted = true;
                     }),
                     false,
                     'mark subscription for deletion'
@@ -309,58 +264,31 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                             ({ alertType: name }) => name
                         );
 
-                        if (
-                            catalogPrefix.length === 0 ||
-                            !hasOwnProperty(
-                                state.mutableSubscriptionMetadata,
-                                catalogPrefix
-                            )
-                        ) {
-                            state.mutableSubscriptionMetadata[catalogPrefix] = {
-                                settings: {},
-                                subscriptions: [
-                                    {
-                                        alertTypes,
-                                        catalogPrefix,
-                                        email,
-                                        id: crypto.randomUUID(),
-                                        viewing: true,
-                                    },
-                                ],
-                            };
-
-                            return;
-                        }
-
                         const targetSubscriptions =
-                            state.mutableSubscriptionMetadata[catalogPrefix]
-                                .subscriptions;
+                            state.mutableSubscriptionMetadata.subscriptions;
 
                         const targetIndex = targetSubscriptions.findIndex(
                             (subscription) => subscription.email === email
                         );
 
                         if (targetIndex === -1) {
-                            state.mutableSubscriptionMetadata[catalogPrefix] = {
-                                settings: {},
-                                subscriptions: [
-                                    ...targetSubscriptions,
-                                    {
-                                        alertTypes,
-                                        catalogPrefix,
-                                        email,
-                                        id: crypto.randomUUID(),
-                                        viewing: true,
-                                    },
-                                ],
-                            };
+                            state.mutableSubscriptionMetadata.subscriptions = [
+                                ...targetSubscriptions,
+                                {
+                                    alertTypes,
+                                    catalogPrefix,
+                                    email,
+                                    id: crypto.randomUUID(),
+                                    viewing: true,
+                                },
+                            ];
 
                             return;
                         }
 
-                        state.mutableSubscriptionMetadata[
-                            catalogPrefix
-                        ].subscriptions[targetIndex].alertTypes = alertTypes;
+                        state.mutableSubscriptionMetadata.subscriptions[
+                            targetIndex
+                        ].alertTypes = alertTypes;
                     }),
                     false,
                     'alert types set'
@@ -396,18 +324,19 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
             setSubscribedEmail: (value, subscriptionId) =>
                 set(
                     produce((state: AlertSubscriptionState) => {
-                        const subscriptionIndex = getSubscriptionIndex(
-                            state,
-                            subscriptionId
-                        );
+                        const subscriptionIndex =
+                            state.mutableSubscriptionMetadata.subscriptions.findIndex(
+                                (subscription) =>
+                                    subscription.id === subscriptionId
+                            );
 
                         if (subscriptionIndex === -1) {
                             return;
                         }
 
-                        state.mutableSubscriptionMetadata[
-                            state.catalogPrefix
-                        ].subscriptions[subscriptionIndex].email = value;
+                        state.mutableSubscriptionMetadata.subscriptions[
+                            subscriptionIndex
+                        ].email = value;
                     }),
                     false,
                     'subscribed email set'
@@ -421,6 +350,24 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                             ? value
                             : `${value}/`;
                         state.prefixErrorsExist = Boolean(errors);
+
+                        if (
+                            value.length > 0 &&
+                            hasOwnProperty(state.subscriptionMetadata, value)
+                        ) {
+                            state.mutableSubscriptionMetadata =
+                                state.subscriptionMetadata[value];
+
+                            return;
+                        }
+
+                        state.mutableSubscriptionMetadata.subscriptions =
+                            state.mutableSubscriptionMetadata.subscriptions.map(
+                                (subscription) => ({
+                                    ...subscription,
+                                    catalogPrefix: state.catalogPrefix,
+                                })
+                            );
                     }),
                     false,
                     'subscribed prefix set'
@@ -439,24 +386,24 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
             toggleSubscriptionViewingStatus: (subscriptionId) =>
                 set(
                     produce((state: AlertSubscriptionState) => {
-                        const subscriptionIndex = getSubscriptionIndex(
-                            state,
-                            subscriptionId
-                        );
+                        const subscriptionIndex =
+                            state.mutableSubscriptionMetadata.subscriptions.findIndex(
+                                (subscription) =>
+                                    subscription.id === subscriptionId
+                            );
 
                         if (subscriptionIndex === -1) {
                             return;
                         }
 
                         const previousValue =
-                            state.mutableSubscriptionMetadata[
-                                state.catalogPrefix
-                            ].subscriptions[subscriptionIndex].viewing;
+                            state.mutableSubscriptionMetadata.subscriptions[
+                                subscriptionIndex
+                            ].viewing;
 
-                        state.mutableSubscriptionMetadata[
-                            state.catalogPrefix
-                        ].subscriptions[subscriptionIndex].viewing =
-                            !previousValue;
+                        state.mutableSubscriptionMetadata.subscriptions[
+                            subscriptionIndex
+                        ].viewing = !previousValue;
                     }),
                     false,
                     'subscription viewing status toggled'
diff --git a/src/components/admin/Settings/PrefixAlerts/useEvaluateSubscriptionIneligibility.ts b/src/components/admin/Settings/PrefixAlerts/useEvaluateSubscriptionIneligibility.ts
index 584212ed02..0579bb6704 100644
--- a/src/components/admin/Settings/PrefixAlerts/useEvaluateSubscriptionIneligibility.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useEvaluateSubscriptionIneligibility.ts
@@ -1,25 +1,14 @@
 import { useMemo } from 'react';
 
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
-import { hasOwnProperty } from 'src/utils/misc-utils';
 
 export function useEvaluateSubscriptionIneligibility() {
-    const catalogPrefix = useAlertSubscriptionsStore(
-        (state) => state.catalogPrefix
-    );
     const mutableSubscriptionMetadata = useAlertSubscriptionsStore(
         (state) => state.mutableSubscriptionMetadata
     );
 
     return useMemo(() => {
-        if (!hasOwnProperty(mutableSubscriptionMetadata, catalogPrefix)) {
-            return {
-                duplicateSubscriptionEmails: [],
-                emptyEmailDetected: false,
-            };
-        }
-
-        const { subscriptions } = mutableSubscriptionMetadata[catalogPrefix];
+        const { subscriptions } = mutableSubscriptionMetadata;
 
         const emptyEmailDetected = subscriptions.some(
             (subscription) => subscription.email.length === 0
@@ -42,5 +31,5 @@ export function useEvaluateSubscriptionIneligibility() {
             duplicateSubscriptionEmails,
             emptyEmailDetected,
         };
-    }, [catalogPrefix, mutableSubscriptionMetadata]);
+    }, [mutableSubscriptionMetadata]);
 }
diff --git a/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts b/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts
index 13656013b9..7be7ac607d 100644
--- a/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts
@@ -5,7 +5,6 @@ import { useQuery } from 'urql';
 
 import { AlertConfigQuery } from 'src/api/alerts';
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
-import { hasOwnProperty } from 'src/utils/misc-utils';
 
 // TODO: Figure out the best way to display a loading state for each global
 //   setting component.
@@ -31,8 +30,7 @@ export function useInitializeAlertConfigs() {
     const settingsDefined = useMemo(
         () =>
             debouncedPrefix.length > 0 &&
-            hasOwnProperty(mutableSubscriptionMetadata, debouncedPrefix) &&
-            !isEmpty(mutableSubscriptionMetadata[debouncedPrefix].settings),
+            !isEmpty(mutableSubscriptionMetadata.settings),
         [debouncedPrefix, mutableSubscriptionMetadata]
     );
 
diff --git a/src/components/admin/Settings/PrefixAlerts/useModifyAlertMetadata.ts b/src/components/admin/Settings/PrefixAlerts/useModifyAlertMetadata.ts
index 20286bc51f..9cb9f95289 100644
--- a/src/components/admin/Settings/PrefixAlerts/useModifyAlertMetadata.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useModifyAlertMetadata.ts
@@ -11,7 +11,7 @@ import { useDeleteAlertSubscription } from 'src/components/admin/Settings/Prefix
 import { useUpsertAlertConfig } from 'src/components/admin/Settings/PrefixAlerts/useUpsertAlertConfig';
 import { useUpsertAlertSubscription } from 'src/components/admin/Settings/PrefixAlerts/useUpsertAlertSubscription';
 import { BASE_ERROR } from 'src/services/supabase';
-import { hasOwnProperty, isPromiseFulfilledResult } from 'src/utils/misc-utils';
+import { isPromiseFulfilledResult } from 'src/utils/misc-utils';
 
 export function useModifyAlertMetadata(
     closeDialog: () => void,
@@ -47,33 +47,23 @@ export function useModifyAlertMetadata(
             return Promise.reject('Catalog prefix undefined.');
         }
 
-        if (
-            !hasOwnProperty(mutableSubscriptionMetadata, catalogPrefix) ||
-            mutableSubscriptionMetadata[catalogPrefix].subscriptions.length ===
-                0
-        ) {
+        if (mutableSubscriptionMetadata.subscriptions.length === 0) {
             // TODO: Add LogRocket event for this success scenario.
             return Promise.resolve();
         }
 
         const subscriptionQueries: Promise<AlertSubscriptionResponse>[] =
-            mutableSubscriptionMetadata[catalogPrefix].subscriptions.map(
-                (subscription) => {
-                    const {
-                        alertTypes,
-                        catalogPrefix: prefix,
-                        email,
-                    } = subscription;
-
-                    return deletionTrigger || subscription.deleted
-                        ? deleteSubscription({ email, prefix })
-                        : upsertSubscription({
-                              alertTypes,
-                              email,
-                              prefix,
-                          });
-                }
-            );
+            mutableSubscriptionMetadata.subscriptions.map((subscription) => {
+                const { alertTypes, email } = subscription;
+
+                return deletionTrigger || subscription.deleted
+                    ? deleteSubscription({ email, prefix: catalogPrefix })
+                    : upsertSubscription({
+                          alertTypes,
+                          email,
+                          prefix: catalogPrefix,
+                      });
+            });
 
         const serverErrors: (PostgrestError | CombinedError)[] = [];
 
@@ -122,7 +112,7 @@ export function useModifyAlertMetadata(
 
         const configResponse = await upsertConfig({
             catalogPrefixOrName: catalogPrefix,
-            config: mutableSubscriptionMetadata[catalogPrefix].settings,
+            config: mutableSubscriptionMetadata.settings,
         });
 
         if (configResponse?.error || configResponse?.invalid) {
diff --git a/src/components/tables/cells/prefixAlerts/EditButton.tsx b/src/components/tables/cells/prefixAlerts/EditButton.tsx
index a040722cc4..2424008416 100644
--- a/src/components/tables/cells/prefixAlerts/EditButton.tsx
+++ b/src/components/tables/cells/prefixAlerts/EditButton.tsx
@@ -32,7 +32,6 @@ function AlertEditButton({
 
             <AlertSubscriptionDialog
                 descriptionId="alerts.config.dialog.update.description"
-                enableDeletion
                 headerId="alerts.config.dialog.update.header"
                 open={open}
                 setOpen={setOpen}

From f461ac938a12265c825f41f0ac25a861a12812fd Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Mon, 22 Jun 2026 11:49:55 -0400
Subject: [PATCH 52/70] Display a loading state for DataMovementSetting

---
 .../GlobalSettings/DataMovementSetting.tsx    | 102 ++++++++++--------
 .../Dialog/GlobalSettings/index.tsx           |   4 +
 .../Settings/PrefixAlerts/Dialog/index.tsx    |   3 -
 .../admin/Settings/PrefixAlerts/types.ts      |   1 +
 .../useAlertSubscriptionsStore.ts             |  26 -----
 .../PrefixAlerts/useInitializeAlertConfigs.ts |   4 +-
 6 files changed, 65 insertions(+), 75 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/DataMovementSetting.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/DataMovementSetting.tsx
index 970cce4631..5b10668c93 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/DataMovementSetting.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/DataMovementSetting.tsx
@@ -3,7 +3,13 @@ import type { GlobalSettingProps } from 'src/components/admin/Settings/PrefixAle
 
 import React from 'react';
 
-import { Autocomplete, Stack, TextField, Typography } from '@mui/material';
+import {
+    Autocomplete,
+    Skeleton,
+    Stack,
+    TextField,
+    Typography,
+} from '@mui/material';
 
 import { useIntl } from 'react-intl';
 
@@ -15,8 +21,9 @@ import {
 } from 'src/utils/notification-utils';
 
 const DataMovementSetting = ({
-    prefix,
     config,
+    loading,
+    prefix,
     targetSetting,
 }: GlobalSettingProps<{ stalledFor: string }>) => {
     const intl = useIntl();
@@ -43,49 +50,56 @@ const DataMovementSetting = ({
                 </Typography>
             </Stack>
 
-            <Autocomplete
-                disabled={!prefix}
-                disableClearable
-                fullWidth
-                getOptionLabel={(interval) => options[interval]}
-                onChange={(_event: React.SyntheticEvent, value: string) => {
-                    const formattedValue = toUnconventionalTimeFormat(value);
+            {loading ? (
+                <Skeleton height={38} />
+            ) : (
+                <Autocomplete
+                    disabled={!prefix}
+                    disableClearable
+                    fullWidth
+                    getOptionLabel={(interval) => options[interval]}
+                    onChange={(_event: React.SyntheticEvent, value: string) => {
+                        const formattedValue =
+                            toUnconventionalTimeFormat(value);
 
-                    setGlobalPrefixSettings(
-                        formattedValue !== 'none'
-                            ? {
-                                  [targetSetting]: {
-                                      condition: { stalledFor: formattedValue },
-                                  },
-                              }
-                            : {},
-                        targetSetting
-                    );
-                }}
-                options={Object.keys(options)}
-                renderInput={({
-                    InputProps,
-                    ...params
-                }: AutocompleteRenderInputParams) => (
-                    <TextField
-                        {...params}
-                        label={intl.formatMessage({
-                            id: 'details.settings.notifications.dataProcessing.noDataProcessedInInterval.label',
-                        })}
-                        size="small"
-                        variant="outlined"
-                        slotProps={{
-                            input: {
-                                ...InputProps,
-                                sx: { borderRadius: 3 },
-                            },
-                        }}
-                    />
-                )}
-                value={fromUnconventionalTimeFormat(
-                    config?.condition.stalledFor
-                )}
-            />
+                        setGlobalPrefixSettings(
+                            formattedValue !== 'none'
+                                ? {
+                                      [targetSetting]: {
+                                          condition: {
+                                              stalledFor: formattedValue,
+                                          },
+                                      },
+                                  }
+                                : {},
+                            targetSetting
+                        );
+                    }}
+                    options={Object.keys(options)}
+                    renderInput={({
+                        InputProps,
+                        ...params
+                    }: AutocompleteRenderInputParams) => (
+                        <TextField
+                            {...params}
+                            label={intl.formatMessage({
+                                id: 'details.settings.notifications.dataProcessing.noDataProcessedInInterval.label',
+                            })}
+                            size="small"
+                            variant="outlined"
+                            slotProps={{
+                                input: {
+                                    ...InputProps,
+                                    sx: { borderRadius: 3 },
+                                },
+                            }}
+                        />
+                    )}
+                    value={fromUnconventionalTimeFormat(
+                        config?.condition.stalledFor
+                    )}
+                />
+            )}
         </Stack>
     );
 };
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/index.tsx
index de93f40bbb..fe2845e2a6 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/index.tsx
@@ -4,12 +4,15 @@ import { useIntl } from 'react-intl';
 
 import DataMovementSetting from 'src/components/admin/Settings/PrefixAlerts/Dialog/GlobalSettings/DataMovementSetting';
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
+import { useInitializeAlertConfigs } from 'src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs';
 import { defaultOutline } from 'src/context/Theme';
 import { AlertConfigKeys } from 'src/utils/notification-utils';
 
 const GlobalSettings = () => {
     const intl = useIntl();
 
+    const { loading: loadingAlertConfigs } = useInitializeAlertConfigs();
+
     const catalogPrefix = useAlertSubscriptionsStore(
         (state) => state.catalogPrefix
     );
@@ -48,6 +51,7 @@ const GlobalSettings = () => {
                         AlertConfigKeys.DATA_MOVEMENT_STALLED
                     ]
                 }
+                loading={loadingAlertConfigs}
                 prefix={catalogPrefix}
                 targetSetting={AlertConfigKeys.DATA_MOVEMENT_STALLED}
             />
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
index be288d91b7..a1ab5bde77 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/index.tsx
@@ -19,7 +19,6 @@ import SaveButton from 'src/components/admin/Settings/PrefixAlerts/Dialog/SaveBu
 import ServerErrors from 'src/components/admin/Settings/PrefixAlerts/Dialog/ServerErrors';
 import SubscriberSection from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index';
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
-import { useInitializeAlertConfigs } from 'src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs';
 import MessageWithLink from 'src/components/content/MessageWithLink';
 import DialogTitleWithClose from 'src/components/shared/Dialog/TitleWithClose';
 
@@ -34,8 +33,6 @@ const AlertSubscriptionDialog = ({
 }: AlertSubscriptionDialogProps) => {
     const intl = useIntl();
 
-    useInitializeAlertConfigs();
-
     const resetSubscriptionState = useAlertSubscriptionsStore(
         (state) => state.resetState
     );
diff --git a/src/components/admin/Settings/PrefixAlerts/types.ts b/src/components/admin/Settings/PrefixAlerts/types.ts
index 1115a146b4..3f4730075e 100644
--- a/src/components/admin/Settings/PrefixAlerts/types.ts
+++ b/src/components/admin/Settings/PrefixAlerts/types.ts
@@ -62,6 +62,7 @@ interface GlobalSettingConfig<T> {
 
 export interface GlobalSettingProps<T> {
     config: GlobalSettingConfig<T> | undefined;
+    loading: boolean;
     prefix: string;
     targetSetting: AlertConfigKeys;
 }
diff --git a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
index 84a7ece692..3e6e511f37 100644
--- a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
@@ -29,7 +29,6 @@ interface AlertSubscriptionState {
         values: AlertTypeInfo[],
         fetching: boolean
     ) => void;
-    initializeMutableSubscriptionMetadata: (catalogPrefix: string) => void;
     markSubscriptionForDeletion: (
         catalogPrefix: string,
         subscriptionId: string
@@ -177,31 +176,6 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                     'global prefix settings set'
                 ),
 
-            initializeMutableSubscriptionMetadata: () =>
-                set(
-                    produce((state: AlertSubscriptionState) => {
-                        if (
-                            state.catalogPrefix.length === 0 ||
-                            !hasOwnProperty(
-                                state.subscriptionMetadata,
-                                state.catalogPrefix
-                            )
-                        ) {
-                            // state.mutableSubscriptionMetadata = {
-                            //     settings: {},
-                            //     subscriptions: [],
-                            // };
-
-                            return;
-                        }
-
-                        state.mutableSubscriptionMetadata =
-                            state.subscriptionMetadata[state.catalogPrefix];
-                    }),
-                    false,
-                    'mutable subscription metadata initialized'
-                ),
-
             markSubscriptionForDeletion: (_catalogPrefix, subscriptionId) =>
                 set(
                     produce((state: AlertSubscriptionState) => {
diff --git a/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts b/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts
index 7be7ac607d..c3a901e5fb 100644
--- a/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts
@@ -6,8 +6,6 @@ import { useQuery } from 'urql';
 import { AlertConfigQuery } from 'src/api/alerts';
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
 
-// TODO: Figure out the best way to display a loading state for each global
-//   setting component.
 export function useInitializeAlertConfigs() {
     const catalogPrefix = useAlertSubscriptionsStore(
         (state) => state.catalogPrefix
@@ -67,4 +65,6 @@ export function useInitializeAlertConfigs() {
         setGlobalPrefixSettings,
         settingsDefined,
     ]);
+
+    return { loading: fetching || !data };
 }

From c444835edeb7566cb1ec02c0b7b1b081abf1fafe Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Mon, 22 Jun 2026 11:55:26 -0400
Subject: [PATCH 53/70] Use formatted catalog prefix to index subscription
 metadata on prefix change

---
 .../Settings/PrefixAlerts/useAlertSubscriptionsStore.ts  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
index 3e6e511f37..da8c76e984 100644
--- a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
@@ -326,11 +326,14 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                         state.prefixErrorsExist = Boolean(errors);
 
                         if (
-                            value.length > 0 &&
-                            hasOwnProperty(state.subscriptionMetadata, value)
+                            state.catalogPrefix.length > 0 &&
+                            hasOwnProperty(
+                                state.subscriptionMetadata,
+                                state.catalogPrefix
+                            )
                         ) {
                             state.mutableSubscriptionMetadata =
-                                state.subscriptionMetadata[value];
+                                state.subscriptionMetadata[state.catalogPrefix];
 
                             return;
                         }

From 8c3c62134020b0a48c30b42045882900266022de Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Mon, 22 Jun 2026 12:50:26 -0400
Subject: [PATCH 54/70] Tightly couple global prefix setting state to prefix
 input

---
 .../useAlertSubscriptionsStore.ts             | 23 +++++++++++++------
 .../PrefixAlerts/useInitializeAlertConfigs.ts |  9 ++++----
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
index da8c76e984..a5e96b14e9 100644
--- a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
@@ -159,6 +159,12 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
             setGlobalPrefixSettings: (value, targetSetting) =>
                 set(
                     produce((state: AlertSubscriptionState) => {
+                        if (isEmpty(value) && !targetSetting) {
+                            state.mutableSubscriptionMetadata.settings = {};
+
+                            return;
+                        }
+
                         state.mutableSubscriptionMetadata.settings =
                             isEmpty(value) && targetSetting
                                 ? omit(
@@ -338,13 +344,16 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                             return;
                         }
 
-                        state.mutableSubscriptionMetadata.subscriptions =
-                            state.mutableSubscriptionMetadata.subscriptions.map(
-                                (subscription) => ({
-                                    ...subscription,
-                                    catalogPrefix: state.catalogPrefix,
-                                })
-                            );
+                        state.mutableSubscriptionMetadata = {
+                            settings: {},
+                            subscriptions:
+                                state.mutableSubscriptionMetadata.subscriptions.map(
+                                    (subscription) => ({
+                                        ...subscription,
+                                        catalogPrefix: state.catalogPrefix,
+                                    })
+                                ),
+                        };
                     }),
                     false,
                     'subscribed prefix set'
diff --git a/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts b/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts
index c3a901e5fb..83b4d6c8ba 100644
--- a/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts
@@ -50,11 +50,12 @@ export function useInitializeAlertConfigs() {
             debouncedPrefix === catalogPrefix &&
             !settingsDefined &&
             !fetching &&
-            data?.alertConfigs &&
-            data.alertConfigs.edges.length > 0
+            data?.alertConfigs
         ) {
             setGlobalPrefixSettings(
-                data.alertConfigs.edges[0].node.effective.config
+                data.alertConfigs.edges.length > 0
+                    ? data.alertConfigs.edges[0].node.effective.config
+                    : {}
             );
         }
     }, [
@@ -66,5 +67,5 @@ export function useInitializeAlertConfigs() {
         settingsDefined,
     ]);
 
-    return { loading: fetching || !data };
+    return { loading: fetching || !data || debouncedPrefix !== catalogPrefix };
 }

From 1675d7108875653734f89f6585cb534927ffbcb3 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Mon, 22 Jun 2026 13:04:42 -0400
Subject: [PATCH 55/70] Move email error state into MutableAlertSubscription

---
 .../PrefixAlerts/Dialog/DeleteButton.tsx      |  6 +++-
 .../PrefixAlerts/Dialog/SaveButton.tsx        |  6 +++-
 .../SubscriberInfo/EmailSelector.tsx          |  4 +--
 .../admin/Settings/PrefixAlerts/types.ts      |  1 +
 .../useAlertSubscriptionsStore.ts             | 31 ++++++++++---------
 5 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
index 9ff6621630..983fd6480b 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
@@ -14,7 +14,11 @@ const DeleteButton = ({ closeDialog }: DialogActionProps) => {
     const { loading, onClick } = useModifyAlertMetadata(closeDialog, true);
 
     const errorsExist = useAlertSubscriptionsStore(
-        (state) => state.emailErrorsExist || state.prefixErrorsExist
+        (state) =>
+            state.prefixErrorsExist ||
+            state.mutableSubscriptionMetadata.subscriptions.some(
+                ({ emailErrorsExist }) => emailErrorsExist
+            )
     );
 
     const catalogPrefix = useAlertSubscriptionsStore(
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SaveButton.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SaveButton.tsx
index d55056f826..95683b6a98 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SaveButton.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SaveButton.tsx
@@ -14,7 +14,11 @@ const SaveButton = ({ closeDialog }: DialogActionProps) => {
     const { loading, onClick } = useModifyAlertMetadata(closeDialog);
 
     const errorsExist = useAlertSubscriptionsStore(
-        (state) => state.emailErrorsExist || state.prefixErrorsExist
+        (state) =>
+            state.prefixErrorsExist ||
+            state.mutableSubscriptionMetadata.subscriptions.some(
+                ({ emailErrorsExist }) => emailErrorsExist
+            )
     );
 
     const catalogPrefix = useAlertSubscriptionsStore(
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/EmailSelector.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/EmailSelector.tsx
index 44bac1b1fe..ce22c6d60c 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/EmailSelector.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/EmailSelector.tsx
@@ -73,8 +73,8 @@ function EmailSelector({
     );
 
     useEffect(() => {
-        setEmailErrorsExist(inputErrorExists);
-    }, [inputErrorExists, setEmailErrorsExist]);
+        setEmailErrorsExist(inputErrorExists, subscriptionId);
+    }, [inputErrorExists, setEmailErrorsExist, subscriptionId]);
 
     return (
         <FormControl fullWidth>
diff --git a/src/components/admin/Settings/PrefixAlerts/types.ts b/src/components/admin/Settings/PrefixAlerts/types.ts
index 3f4730075e..2137492d92 100644
--- a/src/components/admin/Settings/PrefixAlerts/types.ts
+++ b/src/components/admin/Settings/PrefixAlerts/types.ts
@@ -71,6 +71,7 @@ export interface MutableAlertSubscription extends ReducedAlertSubscription {
     id: string;
     viewing: boolean;
     deleted?: boolean;
+    emailErrorsExist?: boolean;
 }
 
 export interface PrefixFieldProps {
diff --git a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
index a5e96b14e9..7f0bdfbbbf 100644
--- a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
@@ -23,7 +23,6 @@ interface AlertSubscriptionState {
     alertTypeOptions: AlertTypeInfo[];
     alertTypeOptionsFetching: boolean;
     catalogPrefix: string;
-    emailErrorsExist: boolean;
     initializationError: CombinedError | PostgrestError | null | undefined;
     initializeAlertTypeOptions: (
         values: AlertTypeInfo[],
@@ -36,10 +35,6 @@ interface AlertSubscriptionState {
     mutableSubscriptionMetadata: SubscriptionMetadata;
     prefixErrorsExist: boolean;
     saveErrors: (CombinedError | PostgrestError | null | undefined)[];
-    subscription: Pick<
-        ReducedAlertSubscription,
-        'alertTypes' | 'catalogPrefix' | 'email'
-    >;
     subscriptionMetadata: SubscriptionMetadataDictionary;
     resetState: () => void;
     setAlertTypes: (
@@ -47,9 +42,7 @@ interface AlertSubscriptionState {
         catalogPrefix?: string,
         email?: string
     ) => void;
-    setEmailErrorsExist: (
-        value: AlertSubscriptionState['emailErrorsExist']
-    ) => void;
+    setEmailErrorsExist: (value: boolean, subscriptionId: string) => void;
     setGlobalPrefixSettings: (value: Schema, targetSetting?: string) => void;
     setInitializationError: (
         value: AlertSubscriptionState['initializationError']
@@ -87,23 +80,19 @@ const getInitialState = (): Pick<
     | 'alertTypeOptions'
     | 'alertTypeOptionsFetching'
     | 'catalogPrefix'
-    | 'emailErrorsExist'
     | 'initializationError'
     | 'mutableSubscriptionMetadata'
     | 'prefixErrorsExist'
     | 'saveErrors'
-    | 'subscription'
     | 'subscriptionMetadata'
 > => ({
     alertTypeOptions: [],
     alertTypeOptionsFetching: false,
     catalogPrefix: '',
-    emailErrorsExist: false,
     initializationError: null,
     mutableSubscriptionMetadata: { settings: {}, subscriptions: [] },
     prefixErrorsExist: false,
     saveErrors: [],
-    subscription: { alertTypes: [], catalogPrefix: '', email: '' },
     subscriptionMetadata: {},
 });
 
@@ -274,10 +263,22 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                     'alert types set'
                 ),
 
-            setEmailErrorsExist: (value) =>
+            setEmailErrorsExist: (value, subscriptionId) =>
                 set(
                     produce((state: AlertSubscriptionState) => {
-                        state.emailErrorsExist = value;
+                        const subscriptionIndex =
+                            state.mutableSubscriptionMetadata.subscriptions.findIndex(
+                                (subscription) =>
+                                    subscription.id === subscriptionId
+                            );
+
+                        if (subscriptionIndex === -1) {
+                            return;
+                        }
+
+                        state.mutableSubscriptionMetadata.subscriptions[
+                            subscriptionIndex
+                        ].emailErrorsExist = value;
                     }),
                     false,
                     'email errors exist set'
@@ -325,10 +326,10 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
             setSubscribedPrefix: (value, errors) =>
                 set(
                     produce((state: AlertSubscriptionState) => {
-                        state.subscription.catalogPrefix = value;
                         state.catalogPrefix = value.endsWith('/')
                             ? value
                             : `${value}/`;
+
                         state.prefixErrorsExist = Boolean(errors);
 
                         if (

From 06dea8f0df846348f2baceac088b3e1b662b194b Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Mon, 22 Jun 2026 14:20:20 -0400
Subject: [PATCH 56/70] Remove and replace AlertTypeFieldProps with instance of
 SubscriptionDependentProps

---
 .../SubscriberSection/SubscriberInfo/AlertTypeField.tsx    | 4 ++--
 src/components/admin/Settings/PrefixAlerts/types.ts        | 7 +------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeField.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeField.tsx
index 8d2afe88d5..857b3ccf8e 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeField.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeField.tsx
@@ -1,11 +1,11 @@
-import type { AlertTypeFieldProps } from 'src/components/admin/Settings/PrefixAlerts/types';
+import type { SubscriptionDependentProps } from 'src/components/admin/Settings/PrefixAlerts/types';
 
 import { Skeleton } from '@mui/material';
 
 import AlertTypeSelector from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector';
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
 
-const AlertTypeField = ({ subscription }: AlertTypeFieldProps) => {
+const AlertTypeField = ({ subscription }: SubscriptionDependentProps) => {
     const alertTypeOptions = useAlertSubscriptionsStore(
         (state) => state.alertTypeOptions
     );
diff --git a/src/components/admin/Settings/PrefixAlerts/types.ts b/src/components/admin/Settings/PrefixAlerts/types.ts
index 2137492d92..7e65d7f490 100644
--- a/src/components/admin/Settings/PrefixAlerts/types.ts
+++ b/src/components/admin/Settings/PrefixAlerts/types.ts
@@ -28,12 +28,7 @@ export interface AlertSubscriptionResponse
     id: string;
 }
 
-// TODO: Remove and replace type with instance of SubscriptionDependentProps.
-export interface AlertTypeFieldProps {
-    subscription: MutableAlertSubscription;
-}
-
-export interface AlertTypeSelectorProps extends AlertTypeFieldProps {
+export interface AlertTypeSelectorProps extends SubscriptionDependentProps {
     options: AlertTypeInfo[];
 }
 

From 46d1f8a779b1f65490859839e8d3dfd23725c365 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Mon, 22 Jun 2026 14:30:56 -0400
Subject: [PATCH 57/70] Place email field in error state when duplicate email
 detected

---
 .../SubscriberSection/SubscriberInfo/EmailSelector.tsx       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/EmailSelector.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/EmailSelector.tsx
index ce22c6d60c..5c7dc86dc0 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/EmailSelector.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/EmailSelector.tsx
@@ -160,7 +160,10 @@ function EmailSelector({
                 }: AutocompleteRenderInputParams) => (
                     <TextField
                         {...params}
-                        error={inputErrorExists}
+                        error={
+                            inputErrorExists ||
+                            duplicateSubscriptionEmails.includes(inputValue)
+                        }
                         label={intl.formatMessage({
                             id: 'data.email',
                         })}

From 8033553a9c798c45324a764f87cf6ac95d40a4be Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Mon, 22 Jun 2026 15:07:38 -0400
Subject: [PATCH 58/70] Display error text when duplicate email detected

---
 .../SubscriberInfo/EmailSelector.tsx          | 20 +++++++++++++------
 src/lang/en-US/Alerts.ts                      |  1 +
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/EmailSelector.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/EmailSelector.tsx
index 5c7dc86dc0..f7079d020b 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/EmailSelector.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/EmailSelector.tsx
@@ -76,6 +76,9 @@ function EmailSelector({
         setEmailErrorsExist(inputErrorExists, subscriptionId);
     }, [inputErrorExists, setEmailErrorsExist, subscriptionId]);
 
+    const duplicateEmailDetected =
+        duplicateSubscriptionEmails.includes(subscribedEmail);
+
     return (
         <FormControl fullWidth>
             <Autocomplete
@@ -83,7 +86,7 @@ function EmailSelector({
                     Boolean(serverError) ||
                     (emptyEmailDetected && subscribedEmail.length > 0) ||
                     (duplicateSubscriptionEmails.length > 0 &&
-                        !duplicateSubscriptionEmails.includes(subscribedEmail))
+                        !duplicateEmailDetected)
                 }
                 filterOptions={(options) =>
                     options.filter((option) => {
@@ -160,10 +163,7 @@ function EmailSelector({
                 }: AutocompleteRenderInputParams) => (
                     <TextField
                         {...params}
-                        error={
-                            inputErrorExists ||
-                            duplicateSubscriptionEmails.includes(inputValue)
-                        }
+                        error={inputErrorExists || duplicateEmailDetected}
                         label={intl.formatMessage({
                             id: 'data.email',
                         })}
@@ -233,12 +233,20 @@ function EmailSelector({
             />
 
             {inputErrorExists ? (
-                <FormHelperText error={inputErrorExists}>
+                <FormHelperText error>
                     {intl.formatMessage({
                         id: 'alerts.config.dialog.emailSelector.inputError',
                     })}
                 </FormHelperText>
             ) : null}
+
+            {duplicateEmailDetected ? (
+                <FormHelperText error>
+                    {intl.formatMessage({
+                        id: 'alerts.config.dialog.emailSelector.duplicationError',
+                    })}
+                </FormHelperText>
+            ) : null}
         </FormControl>
     );
 }
diff --git a/src/lang/en-US/Alerts.ts b/src/lang/en-US/Alerts.ts
index 66d229e2d3..6b6a6748dd 100644
--- a/src/lang/en-US/Alerts.ts
+++ b/src/lang/en-US/Alerts.ts
@@ -7,6 +7,7 @@ export const Alerts: Record<string, string> = {
     'alerts.config.dialog.cta.addSubscriber': `Add Recipient`,
     'alerts.config.dialog.cta.deleteAll': `Delete Prefix Alerts`,
     'alerts.config.dialog.emailSelector.inputError': `Email is incorrectly formatted.`,
+    'alerts.config.dialog.emailSelector.duplicationError': `Email is used by another subscription to this prefix.`,
     'alerts.config.dialog.error.generic': `An issue was encountered {operation} an alert subscription.`,
     'alerts.config.dialog.error.term.delete': `deleting`,
     'alerts.config.dialog.error.term.modify': `creating or updating`,

From 7a5adeb84b60847dd7f3f795124df7ed15069c75 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 23 Jun 2026 09:56:38 -0400
Subject: [PATCH 59/70] Replace alert type selector with checklist

---
 .../SubscriberInfo/AlertTypeSelector.tsx      | 257 +++++++-----------
 .../useAlertSubscriptionsStore.ts             | 106 ++++----
 .../useUpsertAlertSubscription.ts             |   1 +
 3 files changed, 164 insertions(+), 200 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx
index 5741801c77..98b63e0612 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx
@@ -1,27 +1,21 @@
-import type { AutocompleteRenderInputParams } from '@mui/material';
 import type { AlertTypeSelectorProps } from 'src/components/admin/Settings/PrefixAlerts/types';
-import type { AlertTypeInfo } from 'src/gql-types/graphql';
-
-import { useMemo } from 'react';
 
 import {
-    Autocomplete,
+    Checkbox,
     FormControl,
+    FormControlLabel,
+    List,
+    ListItem,
     Stack,
-    TextField,
     Typography,
     useTheme,
 } from '@mui/material';
 
 import { Lock } from 'iconoir-react';
-import { union } from 'lodash';
 import { useIntl } from 'react-intl';
 
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
-import SelectableAutocompleteOption from 'src/components/shared/Dialog/SelectableAutocompleteOption';
-import { diminishedTextColor } from 'src/context/Theme';
-import { OutlinedChip } from 'src/styledComponents/chips/OutlinedChip';
-import { basicSort_string, sortByAlertType } from 'src/utils/misc-utils';
+import { defaultOutline, diminishedTextColor } from 'src/context/Theme';
 
 const AlertTypeSelector = ({
     options,
@@ -33,158 +27,113 @@ const AlertTypeSelector = ({
     const serverError = useAlertSubscriptionsStore(
         (state) => state.initializationError
     );
-    const setAlertTypes = useAlertSubscriptionsStore(
-        (state) => state.setAlertTypes
-    );
-
-    const systemAlerts: AlertTypeInfo[] = useMemo(
-        () => options.filter(({ isSystem }) => isSystem),
-        [options]
+    const setSingleAlertType = useAlertSubscriptionsStore(
+        (state) => state.setSingleAlertType
     );
 
-    const selectedAlertTypes: AlertTypeInfo[] = useMemo(() => {
-        const alertTypes = subscription?.alertTypes ?? [];
-
-        return options.filter(({ alertType }) =>
-            alertTypes.includes(alertType)
-        );
-    }, [options, subscription?.alertTypes]);
-
     return (
-        <FormControl fullWidth>
-            <Autocomplete
-                disableCloseOnSelect
-                disabled={Boolean(serverError)}
-                getOptionLabel={({ alertType }) => alertType}
-                isOptionEqualToValue={(option, value) =>
-                    option.alertType === value.alertType
-                }
-                multiple
-                onChange={(_event, values) => {
-                    const evaluatedValues = union(values, systemAlerts);
-
-                    setAlertTypes(
-                        evaluatedValues,
-                        subscription?.catalogPrefix,
-                        subscription?.email
-                    );
-                }}
-                options={options.sort((first, second) =>
-                    basicSort_string(
-                        first.displayName,
-                        second.displayName,
-                        'asc'
-                    )
-                )}
-                renderInput={({
-                    InputProps,
-                    ...params
-                }: AutocompleteRenderInputParams) => (
-                    <TextField
-                        {...params}
-                        slotProps={{
-                            input: {
-                                ...InputProps,
-                                sx: { borderRadius: 3 },
-                            },
-                        }}
-                        label={intl.formatMessage({
-                            id: 'entityTable.data.alertTypes',
-                        })}
-                        size="small"
-                        variant="outlined"
-                    />
-                )}
-                renderOption={(renderOptionProps, option, state) => {
-                    const { key, ...restRenderOptionProps } = renderOptionProps;
-                    const { description, displayName, isSystem } = option;
+        <Stack spacing={1}>
+            <Typography style={{ fontWeight: 500 }}>
+                {intl.formatMessage({
+                    id: 'entityTable.data.alertTypes',
+                })}
+            </Typography>
+
+            <List component="div" disablePadding>
+                {options.map((option, index) => {
+                    const { alertType, description, displayName, isSystem } =
+                        option;
+                    const alertTypes = subscription?.alertTypes ?? [];
 
                     return (
-                        <SelectableAutocompleteOption
-                            key={key}
-                            Content={
-                                <Stack>
-                                    <Stack
-                                        direction="row"
-                                        style={{
-                                            justifyContent: 'space-between',
-                                        }}
-                                    >
-                                        <Typography
-                                            style={{
-                                                fontWeight: 500,
-                                                marginBottom: 4,
-                                                textTransform: 'capitalize',
+                        <ListItem
+                            key={`${alertType}-${index}`}
+                            dense
+                            style={{
+                                border: defaultOutline[theme.palette.mode],
+                                borderRadius: '6px',
+                                marginBottom: 6,
+                            }}
+                        >
+                            <FormControl fullWidth>
+                                <FormControlLabel
+                                    control={
+                                        <Checkbox
+                                            checked={alertTypes.includes(
+                                                alertType
+                                            )}
+                                            onChange={(event) => {
+                                                setSingleAlertType(
+                                                    option.alertType,
+                                                    event.target.checked,
+                                                    subscription?.catalogPrefix,
+                                                    subscription?.email
+                                                );
                                             }}
-                                        >
-                                            {displayName}
-                                        </Typography>
-
-                                        {isSystem ? (
-                                            <Lock
+                                        />
+                                    }
+                                    disabled={Boolean(serverError)}
+                                    label={
+                                        <Stack>
+                                            <Stack
+                                                direction="row"
                                                 style={{
-                                                    color: diminishedTextColor[
-                                                        theme.palette.mode
-                                                    ],
+                                                    justifyContent:
+                                                        'space-between',
+                                                    marginTop: 8,
                                                 }}
-                                            />
-                                        ) : null}
-                                    </Stack>
-
-                                    {description ? (
-                                        <Typography
-                                            sx={{
-                                                color: diminishedTextColor[
-                                                    theme.palette.mode
-                                                ],
-                                            }}
-                                        >
-                                            {description}
-                                        </Typography>
-                                    ) : null}
-                                </Stack>
-                            }
-                            renderOptionProps={restRenderOptionProps}
-                            state={state}
-                        />
-                    );
-                }}
-                renderValue={(values, getTagProps) => {
-                    return values
-                        .sort((first, second) =>
-                            sortByAlertType(
-                                {
-                                    isSystemAlert: first.isSystem,
-                                    value: first.displayName,
-                                },
-                                {
-                                    isSystemAlert: second.isSystem,
-                                    value: second.displayName,
-                                },
-                                'asc'
-                            )
-                        )
-                        .map(({ alertType, displayName, isSystem }, index) => {
-                            const { onDelete, key, ...restOfTagProps } =
-                                getTagProps({
-                                    index,
-                                });
-
-                            return (
-                                <OutlinedChip
-                                    {...restOfTagProps}
-                                    key={`alert_type-tag-${alertType}-${index}`}
-                                    label={displayName}
-                                    onDelete={isSystem ? undefined : onDelete}
-                                    size="small"
-                                    variant="outlined"
+                                            >
+                                                <Typography
+                                                    style={{
+                                                        fontWeight: 500,
+                                                        marginBottom: 4,
+                                                        textTransform:
+                                                            'capitalize',
+                                                    }}
+                                                >
+                                                    {displayName}
+                                                </Typography>
+
+                                                {isSystem ? (
+                                                    <Lock
+                                                        style={{
+                                                            color: diminishedTextColor[
+                                                                theme.palette
+                                                                    .mode
+                                                            ],
+                                                        }}
+                                                    />
+                                                ) : null}
+                                            </Stack>
+
+                                            {description ? (
+                                                <Typography
+                                                    sx={{
+                                                        color: diminishedTextColor[
+                                                            theme.palette.mode
+                                                        ],
+                                                        marginBottom: 1,
+                                                    }}
+                                                >
+                                                    {description}
+                                                </Typography>
+                                            ) : null}
+                                        </Stack>
+                                    }
+                                    slotProps={{
+                                        typography: {
+                                            component: 'div',
+                                            width: '100%',
+                                        },
+                                    }}
+                                    style={{ alignItems: 'flex-start' }}
                                 />
-                            );
-                        });
-                }}
-                value={selectedAlertTypes}
-            />
-        </FormControl>
+                            </FormControl>
+                        </ListItem>
+                    );
+                })}
+            </List>
+        </Stack>
     );
 };
 
diff --git a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
index 7f0bdfbbbf..23254623b0 100644
--- a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
@@ -37,17 +37,18 @@ interface AlertSubscriptionState {
     saveErrors: (CombinedError | PostgrestError | null | undefined)[];
     subscriptionMetadata: SubscriptionMetadataDictionary;
     resetState: () => void;
-    setAlertTypes: (
-        values: AlertTypeInfo[],
-        catalogPrefix?: string,
-        email?: string
-    ) => void;
     setEmailErrorsExist: (value: boolean, subscriptionId: string) => void;
     setGlobalPrefixSettings: (value: Schema, targetSetting?: string) => void;
     setInitializationError: (
         value: AlertSubscriptionState['initializationError']
     ) => void;
     setSaveErrors: (value: AlertSubscriptionState['saveErrors']) => void;
+    setSingleAlertType: (
+        value: string,
+        selected: boolean,
+        catalogPrefix?: string,
+        email?: string
+    ) => void;
     setSubscribedEmail: (value: string, subscriptionId: string) => void;
     setSubscribedPrefix: (value: string, errors: string | null) => void;
     setSubscriptionMetadata: (value: ReducedAlertSubscription[]) => void;
@@ -222,47 +223,6 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                     'state reset'
                 ),
 
-            setAlertTypes: (values, catalogPrefix, email) =>
-                set(
-                    produce((state: AlertSubscriptionState) => {
-                        if (!catalogPrefix || !email) {
-                            return;
-                        }
-
-                        const alertTypes = values.map(
-                            ({ alertType: name }) => name
-                        );
-
-                        const targetSubscriptions =
-                            state.mutableSubscriptionMetadata.subscriptions;
-
-                        const targetIndex = targetSubscriptions.findIndex(
-                            (subscription) => subscription.email === email
-                        );
-
-                        if (targetIndex === -1) {
-                            state.mutableSubscriptionMetadata.subscriptions = [
-                                ...targetSubscriptions,
-                                {
-                                    alertTypes,
-                                    catalogPrefix,
-                                    email,
-                                    id: crypto.randomUUID(),
-                                    viewing: true,
-                                },
-                            ];
-
-                            return;
-                        }
-
-                        state.mutableSubscriptionMetadata.subscriptions[
-                            targetIndex
-                        ].alertTypes = alertTypes;
-                    }),
-                    false,
-                    'alert types set'
-                ),
-
             setEmailErrorsExist: (value, subscriptionId) =>
                 set(
                     produce((state: AlertSubscriptionState) => {
@@ -302,6 +262,60 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                     'save errors set'
                 ),
 
+            setSingleAlertType: (value, selected, catalogPrefix, email) =>
+                set(
+                    produce((state: AlertSubscriptionState) => {
+                        if (!catalogPrefix || !email) {
+                            return;
+                        }
+
+                        const targetSubscriptions =
+                            state.mutableSubscriptionMetadata.subscriptions;
+
+                        const targetIndex = targetSubscriptions.findIndex(
+                            (subscription) => subscription.email === email
+                        );
+
+                        if (targetIndex === -1) {
+                            const baseAlertTypes = state.alertTypeOptions
+                                .filter(
+                                    ({ alertType, isDefault, isSystem }) =>
+                                        isSystem ||
+                                        (isDefault && alertType !== value)
+                                )
+                                .map(({ alertType }) => alertType);
+
+                            state.mutableSubscriptionMetadata.subscriptions = [
+                                ...targetSubscriptions,
+                                {
+                                    alertTypes: [...baseAlertTypes, value],
+                                    catalogPrefix,
+                                    email,
+                                    id: crypto.randomUUID(),
+                                    viewing: true,
+                                },
+                            ];
+
+                            return;
+                        }
+
+                        const { alertTypes: previousAlertTypes } =
+                            state.mutableSubscriptionMetadata.subscriptions[
+                                targetIndex
+                            ];
+
+                        state.mutableSubscriptionMetadata.subscriptions[
+                            targetIndex
+                        ].alertTypes = selected
+                            ? [...previousAlertTypes, value]
+                            : previousAlertTypes.filter(
+                                  (alertType) => alertType !== value
+                              );
+                    }),
+                    false,
+                    'single alert type set'
+                ),
+
             setSubscribedEmail: (value, subscriptionId) =>
                 set(
                     produce((state: AlertSubscriptionState) => {
diff --git a/src/components/admin/Settings/PrefixAlerts/useUpsertAlertSubscription.ts b/src/components/admin/Settings/PrefixAlerts/useUpsertAlertSubscription.ts
index 9eddf9a4ca..1fba137f7b 100644
--- a/src/components/admin/Settings/PrefixAlerts/useUpsertAlertSubscription.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useUpsertAlertSubscription.ts
@@ -40,6 +40,7 @@ export function useUpsertAlertSubscription() {
             // no operation should be performed.
             if (
                 existingSubscription &&
+                alertTypes?.length === existingSubscription.alertTypes.length &&
                 difference(alertTypes, existingSubscription.alertTypes)
                     .length === 0
             ) {

From e382266d35b87171b4b42caf4c256fe4bd58872f Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 23 Jun 2026 09:58:36 -0400
Subject: [PATCH 60/70] Rename AlertTypeSelector to AlertTypeList

---
 .../SubscriberSection/SubscriberInfo/AlertTypeField.tsx  | 7 ++-----
 .../{AlertTypeSelector.tsx => AlertTypeList.tsx}         | 9 +++------
 src/components/admin/Settings/PrefixAlerts/types.ts      | 2 +-
 3 files changed, 6 insertions(+), 12 deletions(-)
 rename src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/{AlertTypeSelector.tsx => AlertTypeList.tsx} (96%)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeField.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeField.tsx
index 857b3ccf8e..d9684a645a 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeField.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeField.tsx
@@ -2,7 +2,7 @@ import type { SubscriptionDependentProps } from 'src/components/admin/Settings/P
 
 import { Skeleton } from '@mui/material';
 
-import AlertTypeSelector from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector';
+import AlertTypeList from 'src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeList';
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
 
 const AlertTypeField = ({ subscription }: SubscriptionDependentProps) => {
@@ -16,10 +16,7 @@ const AlertTypeField = ({ subscription }: SubscriptionDependentProps) => {
     return alertTypeOptionsFetching ? (
         <Skeleton height={38} width={490} />
     ) : (
-        <AlertTypeSelector
-            subscription={subscription}
-            options={alertTypeOptions}
-        />
+        <AlertTypeList subscription={subscription} options={alertTypeOptions} />
     );
 };
 
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeList.tsx
similarity index 96%
rename from src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx
rename to src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeList.tsx
index 98b63e0612..8f90ec5e8d 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeSelector.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeList.tsx
@@ -1,4 +1,4 @@
-import type { AlertTypeSelectorProps } from 'src/components/admin/Settings/PrefixAlerts/types';
+import type { AlertTypeListProps } from 'src/components/admin/Settings/PrefixAlerts/types';
 
 import {
     Checkbox,
@@ -17,10 +17,7 @@ import { useIntl } from 'react-intl';
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
 import { defaultOutline, diminishedTextColor } from 'src/context/Theme';
 
-const AlertTypeSelector = ({
-    options,
-    subscription,
-}: AlertTypeSelectorProps) => {
+const AlertTypeList = ({ options, subscription }: AlertTypeListProps) => {
     const intl = useIntl();
     const theme = useTheme();
 
@@ -137,4 +134,4 @@ const AlertTypeSelector = ({
     );
 };
 
-export default AlertTypeSelector;
+export default AlertTypeList;
diff --git a/src/components/admin/Settings/PrefixAlerts/types.ts b/src/components/admin/Settings/PrefixAlerts/types.ts
index 7e65d7f490..97548e67db 100644
--- a/src/components/admin/Settings/PrefixAlerts/types.ts
+++ b/src/components/admin/Settings/PrefixAlerts/types.ts
@@ -28,7 +28,7 @@ export interface AlertSubscriptionResponse
     id: string;
 }
 
-export interface AlertTypeSelectorProps extends SubscriptionDependentProps {
+export interface AlertTypeListProps extends SubscriptionDependentProps {
     options: AlertTypeInfo[];
 }
 

From c0d6fa1b260bd586eb47b8d030b63c7f3e7283a9 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 23 Jun 2026 10:03:26 -0400
Subject: [PATCH 61/70] Sort alert type options in state

---
 .../PrefixAlerts/useAlertSubscriptionsStore.ts   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
index 23254623b0..4f423325a2 100644
--- a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
@@ -14,7 +14,7 @@ import produce from 'immer';
 import { isEmpty, omit } from 'lodash';
 import { type CombinedError } from 'urql';
 
-import { hasOwnProperty } from 'src/utils/misc-utils';
+import { hasOwnProperty, sortByAlertType } from 'src/utils/misc-utils';
 import { bundleSubscriptionsByPrefix } from 'src/utils/notification-utils';
 import { devtoolsOptions } from 'src/utils/store-utils';
 
@@ -139,7 +139,19 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
             initializeAlertTypeOptions: (values, fetching) =>
                 set(
                     produce((state: AlertSubscriptionState) => {
-                        state.alertTypeOptions = values;
+                        state.alertTypeOptions = values.sort((first, second) =>
+                            sortByAlertType(
+                                {
+                                    isSystemAlert: first.isSystem,
+                                    value: first.displayName,
+                                },
+                                {
+                                    isSystemAlert: second.isSystem,
+                                    value: second.displayName,
+                                },
+                                'asc'
+                            )
+                        );
                         state.alertTypeOptionsFetching = fetching;
                     }),
                     false,

From 4ab27c2dc92cf8a1af5f4fd82a55bddd53e55b96 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 23 Jun 2026 10:11:33 -0400
Subject: [PATCH 62/70] Update selected state of alert type list items

---
 .../SubscriberInfo/AlertTypeList.tsx                 | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeList.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeList.tsx
index 8f90ec5e8d..950231ee39 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeList.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeList.tsx
@@ -41,13 +41,19 @@ const AlertTypeList = ({ options, subscription }: AlertTypeListProps) => {
                     const { alertType, description, displayName, isSystem } =
                         option;
                     const alertTypes = subscription?.alertTypes ?? [];
+                    const selected = alertTypes.includes(alertType);
 
                     return (
                         <ListItem
                             key={`${alertType}-${index}`}
                             dense
                             style={{
-                                border: defaultOutline[theme.palette.mode],
+                                backgroundColor: selected
+                                    ? theme.palette.primary.alpha_05
+                                    : undefined,
+                                border: selected
+                                    ? `1px solid ${theme.palette.primary.alpha_50}`
+                                    : defaultOutline[theme.palette.mode],
                                 borderRadius: '6px',
                                 marginBottom: 6,
                             }}
@@ -56,9 +62,7 @@ const AlertTypeList = ({ options, subscription }: AlertTypeListProps) => {
                                 <FormControlLabel
                                     control={
                                         <Checkbox
-                                            checked={alertTypes.includes(
-                                                alertType
-                                            )}
+                                            checked={selected}
                                             onChange={(event) => {
                                                 setSingleAlertType(
                                                     option.alertType,

From 4ae5b3e55538b698ea6eebeff5348d3aab00bcd6 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 23 Jun 2026 10:20:18 -0400
Subject: [PATCH 63/70] Disable multi-subscription delete button for new
 prefixes

---
 .../Settings/PrefixAlerts/Dialog/DeleteButton.tsx  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
index 983fd6480b..1342ddd9c2 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/DeleteButton.tsx
@@ -27,6 +27,9 @@ const DeleteButton = ({ closeDialog }: DialogActionProps) => {
     const mutableSubscriptionMetadata = useAlertSubscriptionsStore(
         (state) => state.mutableSubscriptionMetadata
     );
+    const subscriptionMetadata = useAlertSubscriptionsStore(
+        (state) => state.subscriptionMetadata
+    );
 
     const disabled = useMemo(() => {
         const { subscriptions } = mutableSubscriptionMetadata;
@@ -40,9 +43,16 @@ const DeleteButton = ({ closeDialog }: DialogActionProps) => {
                 loading ||
                 catalogPrefix.length === 0 ||
                 subscriptions.length === 0 ||
-                emptyEmailExists
+                emptyEmailExists ||
+                !Object.keys(subscriptionMetadata).includes(catalogPrefix)
         );
-    }, [catalogPrefix, errorsExist, loading, mutableSubscriptionMetadata]);
+    }, [
+        catalogPrefix,
+        errorsExist,
+        loading,
+        mutableSubscriptionMetadata,
+        subscriptionMetadata,
+    ]);
 
     return (
         <Button

From 5ce0b98bee6f98ef9004d80f7dd32921c2c0482a Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 23 Jun 2026 10:26:37 -0400
Subject: [PATCH 64/70] Remove the default right margin from FormControlLabel
 in AlertTypeList

---
 .../SubscriberSection/SubscriberInfo/AlertTypeList.tsx       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeList.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeList.tsx
index 950231ee39..4abf52c88c 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeList.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeList.tsx
@@ -127,7 +127,10 @@ const AlertTypeList = ({ options, subscription }: AlertTypeListProps) => {
                                             width: '100%',
                                         },
                                     }}
-                                    style={{ alignItems: 'flex-start' }}
+                                    style={{
+                                        alignItems: 'flex-start',
+                                        marginRight: 'unset',
+                                    }}
                                 />
                             </FormControl>
                         </ListItem>

From f852035a07326be6dd1f96653cca27c0065f3e16 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 23 Jun 2026 10:41:53 -0400
Subject: [PATCH 65/70] Prevent system alert types from being unchecked in list

---
 .../PrefixAlerts/useAlertSubscriptionsStore.ts       | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
index 4f423325a2..da3de492e0 100644
--- a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
@@ -281,6 +281,18 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                             return;
                         }
 
+                        const systemAlertTypes = state.alertTypeOptions
+                            .filter(({ isSystem }) => isSystem)
+                            .map(({ alertType }) => alertType);
+
+                        if (
+                            systemAlertTypes.some(
+                                (alertType) => alertType === value
+                            )
+                        ) {
+                            return;
+                        }
+
                         const targetSubscriptions =
                             state.mutableSubscriptionMetadata.subscriptions;
 

From ebc41e477266cf6d6fb0c9d2bcc84a45b7f7e7d2 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 23 Jun 2026 10:42:29 -0400
Subject: [PATCH 66/70] Change alert type list item styling on hover

---
 .../SubscriberInfo/AlertTypeList.tsx          | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeList.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeList.tsx
index 4abf52c88c..9991b2a7a0 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeList.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/AlertTypeList.tsx
@@ -15,7 +15,11 @@ import { Lock } from 'iconoir-react';
 import { useIntl } from 'react-intl';
 
 import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore';
-import { defaultOutline, diminishedTextColor } from 'src/context/Theme';
+import {
+    defaultOutline,
+    defaultOutlineColor_hovered,
+    diminishedTextColor,
+} from 'src/context/Theme';
 
 const AlertTypeList = ({ options, subscription }: AlertTypeListProps) => {
     const intl = useIntl();
@@ -47,15 +51,24 @@ const AlertTypeList = ({ options, subscription }: AlertTypeListProps) => {
                         <ListItem
                             key={`${alertType}-${index}`}
                             dense
-                            style={{
-                                backgroundColor: selected
+                            sx={{
+                                'backgroundColor': selected
                                     ? theme.palette.primary.alpha_05
                                     : undefined,
-                                border: selected
+                                'border': selected
                                     ? `1px solid ${theme.palette.primary.alpha_50}`
                                     : defaultOutline[theme.palette.mode],
-                                borderRadius: '6px',
-                                marginBottom: 6,
+                                'borderRadius': '6px',
+                                'marginBottom': '6px',
+                                '&:hover': {
+                                    borderColor: isSystem
+                                        ? undefined
+                                        : selected
+                                          ? theme.palette.primary.main
+                                          : defaultOutlineColor_hovered[
+                                                theme.palette.mode
+                                            ],
+                                },
                             }}
                         >
                             <FormControl fullWidth>

From 644f7162dcbface54a41722d555d6112e47c2f80 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Tue, 23 Jun 2026 15:43:35 -0400
Subject: [PATCH 67/70] Expand LogRocket coverage in useModifyAlertMetadata

---
 .../PrefixAlerts/useModifyAlertMetadata.ts    | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/useModifyAlertMetadata.ts b/src/components/admin/Settings/PrefixAlerts/useModifyAlertMetadata.ts
index 9cb9f95289..d2055be6eb 100644
--- a/src/components/admin/Settings/PrefixAlerts/useModifyAlertMetadata.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useModifyAlertMetadata.ts
@@ -10,6 +10,7 @@ import useAlertSubscriptionsStore from 'src/components/admin/Settings/PrefixAler
 import { useDeleteAlertSubscription } from 'src/components/admin/Settings/PrefixAlerts/useDeleteAlertSubscription';
 import { useUpsertAlertConfig } from 'src/components/admin/Settings/PrefixAlerts/useUpsertAlertConfig';
 import { useUpsertAlertSubscription } from 'src/components/admin/Settings/PrefixAlerts/useUpsertAlertSubscription';
+import { logRocketEvent } from 'src/services/shared';
 import { BASE_ERROR } from 'src/services/supabase';
 import { isPromiseFulfilledResult } from 'src/utils/misc-utils';
 
@@ -43,12 +44,20 @@ export function useModifyAlertMetadata(
         setServerError([]);
 
         if (catalogPrefix.length === 0) {
-            // TODO: Add LogRocket event for this error scenario.
+            logRocketEvent('AlertSubscription', {
+                error: 'catalog prefix undefined',
+                operation: 'save',
+            });
+
             return Promise.reject('Catalog prefix undefined.');
         }
 
         if (mutableSubscriptionMetadata.subscriptions.length === 0) {
-            // TODO: Add LogRocket event for this success scenario.
+            logRocketEvent('AlertSubscription', {
+                skipped: true,
+                operation: 'save',
+            });
+
             return Promise.resolve();
         }
 
@@ -72,7 +81,11 @@ export function useModifyAlertMetadata(
                 responses.forEach((response) => {
                     if (isPromiseFulfilledResult(response)) {
                         if (!response.value) {
-                            // TODO: Add LogRocket event for this error scenario.
+                            logRocketEvent('AlertSubscription', {
+                                error: true,
+                                missingResponseValue: !response.value,
+                            });
+
                             return;
                         }
 
@@ -101,12 +114,17 @@ export function useModifyAlertMetadata(
                             serverErrors.push(serverError);
                         }
                     } else {
-                        // TODO: Add LogRocket event for this error scenario.
+                        logRocketEvent('AlertSubscription', {
+                            error: String(response),
+                            response: String(response),
+                        });
                     }
                 });
             },
-            () => {
-                // TODO: Add LogRocket event for this error scenario.
+            (error) => {
+                logRocketEvent('AlertSubscription', {
+                    error: String(error),
+                });
             }
         );
 

From 9ceb8ebde8abf0121685aa6e3885ef172383b255 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Wed, 24 Jun 2026 08:26:37 -0400
Subject: [PATCH 68/70] Expand server error coverage

---
 .../PrefixAlerts/Dialog/ServerErrors.tsx      |  2 +-
 .../Dialog/SubscriberSection/index.tsx        |  2 +-
 .../useAlertSubscriptionsStore.ts             | 23 +++++++++++++------
 .../PrefixAlerts/useInitializeAlertConfigs.ts | 12 ++++++++--
 .../PrefixAlerts/useModifyAlertMetadata.ts    |  9 +++++---
 5 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/ServerErrors.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/ServerErrors.tsx
index 9b13301e7f..0f96ee5dfb 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/ServerErrors.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/ServerErrors.tsx
@@ -9,7 +9,7 @@ import { hasLength } from 'src/utils/misc-utils';
 export default function ServerErrors() {
     const serverErrors = useAlertSubscriptionsStore(
         useShallow((state) =>
-            [state.initializationError].concat(state.saveErrors)
+            [state.initializationError].concat(state.serverErrors)
         )
     );
 
diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx
index 847d8f7c5b..77fe11ef58 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/index.tsx
@@ -21,7 +21,7 @@ const SubscriberSection = () => {
         (state) => state.mutableSubscriptionMetadata
     );
     const setServerError = useAlertSubscriptionsStore(
-        (state) => state.setSaveErrors
+        (state) => state.setServerErrors
     );
 
     const initializeAlertTypeOptions = useAlertSubscriptionsStore(
diff --git a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
index da3de492e0..db60e3aaec 100644
--- a/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useAlertSubscriptionsStore.ts
@@ -34,7 +34,7 @@ interface AlertSubscriptionState {
     ) => void;
     mutableSubscriptionMetadata: SubscriptionMetadata;
     prefixErrorsExist: boolean;
-    saveErrors: (CombinedError | PostgrestError | null | undefined)[];
+    serverErrors: (CombinedError | PostgrestError | null | undefined)[];
     subscriptionMetadata: SubscriptionMetadataDictionary;
     resetState: () => void;
     setEmailErrorsExist: (value: boolean, subscriptionId: string) => void;
@@ -42,7 +42,10 @@ interface AlertSubscriptionState {
     setInitializationError: (
         value: AlertSubscriptionState['initializationError']
     ) => void;
-    setSaveErrors: (value: AlertSubscriptionState['saveErrors']) => void;
+    setServerErrors: (
+        values: AlertSubscriptionState['serverErrors'],
+        override?: boolean
+    ) => void;
     setSingleAlertType: (
         value: string,
         selected: boolean,
@@ -84,7 +87,7 @@ const getInitialState = (): Pick<
     | 'initializationError'
     | 'mutableSubscriptionMetadata'
     | 'prefixErrorsExist'
-    | 'saveErrors'
+    | 'serverErrors'
     | 'subscriptionMetadata'
 > => ({
     alertTypeOptions: [],
@@ -93,7 +96,7 @@ const getInitialState = (): Pick<
     initializationError: null,
     mutableSubscriptionMetadata: { settings: {}, subscriptions: [] },
     prefixErrorsExist: false,
-    saveErrors: [],
+    serverErrors: [],
     subscriptionMetadata: {},
 });
 
@@ -265,13 +268,19 @@ const useAlertSubscriptionsStore = create<AlertSubscriptionState>()(
                     'initialization error set'
                 ),
 
-            setSaveErrors: (value) =>
+            setServerErrors: (values, override) =>
                 set(
                     produce((state: AlertSubscriptionState) => {
-                        state.saveErrors = value;
+                        const filteredErrors = values.filter(
+                            (value) => typeof value !== 'undefined'
+                        );
+
+                        state.serverErrors = override
+                            ? filteredErrors
+                            : state.serverErrors.concat(filteredErrors);
                     }),
                     false,
-                    'save errors set'
+                    'server errors set'
                 ),
 
             setSingleAlertType: (value, selected, catalogPrefix, email) =>
diff --git a/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts b/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts
index 83b4d6c8ba..fc17e6fc2a 100644
--- a/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useInitializeAlertConfigs.ts
@@ -16,6 +16,9 @@ export function useInitializeAlertConfigs() {
     const mutableSubscriptionMetadata = useAlertSubscriptionsStore(
         (state) => state.mutableSubscriptionMetadata
     );
+    const setServerError = useAlertSubscriptionsStore(
+        (state) => state.setServerErrors
+    );
 
     const [debouncedPrefix, setDebouncedPrefix] = useState(catalogPrefix);
 
@@ -32,8 +35,7 @@ export function useInitializeAlertConfigs() {
         [debouncedPrefix, mutableSubscriptionMetadata]
     );
 
-    // TODO: Add error handling.
-    const [{ data, fetching }] = useQuery({
+    const [{ data, error, fetching }] = useQuery({
         pause: !debouncedPrefix || settingsDefined,
         query: AlertConfigQuery,
         variables: {
@@ -45,6 +47,12 @@ export function useInitializeAlertConfigs() {
         updateDebouncedPrefix.current(catalogPrefix);
     }, [catalogPrefix, updateDebouncedPrefix]);
 
+    useEffect(() => {
+        if (!fetching && error) {
+            setServerError([error]);
+        }
+    }, [error, fetching, setServerError]);
+
     useEffect(() => {
         if (
             debouncedPrefix === catalogPrefix &&
diff --git a/src/components/admin/Settings/PrefixAlerts/useModifyAlertMetadata.ts b/src/components/admin/Settings/PrefixAlerts/useModifyAlertMetadata.ts
index d2055be6eb..34b4fa319a 100644
--- a/src/components/admin/Settings/PrefixAlerts/useModifyAlertMetadata.ts
+++ b/src/components/admin/Settings/PrefixAlerts/useModifyAlertMetadata.ts
@@ -26,7 +26,7 @@ export function useModifyAlertMetadata(
     const { upsertConfig } = useUpsertAlertConfig();
 
     const setServerError = useAlertSubscriptionsStore(
-        (state) => state.setSaveErrors
+        (state) => state.setServerErrors
     );
 
     const catalogPrefix = useAlertSubscriptionsStore(
@@ -41,15 +41,16 @@ export function useModifyAlertMetadata(
 
     const onClick = async () => {
         setLoading(true);
-        setServerError([]);
+        setServerError([], true);
 
         if (catalogPrefix.length === 0) {
             logRocketEvent('AlertSubscription', {
                 error: 'catalog prefix undefined',
                 operation: 'save',
+                promiseRejected: 'explicit',
             });
 
-            return Promise.reject('Catalog prefix undefined.');
+            return Promise.reject();
         }
 
         if (mutableSubscriptionMetadata.subscriptions.length === 0) {
@@ -117,6 +118,7 @@ export function useModifyAlertMetadata(
                         logRocketEvent('AlertSubscription', {
                             error: String(response),
                             response: String(response),
+                            promiseRejected: 'implicit',
                         });
                     }
                 });
@@ -124,6 +126,7 @@ export function useModifyAlertMetadata(
             (error) => {
                 logRocketEvent('AlertSubscription', {
                     error: String(error),
+                    promiseRejected: 'explicit',
                 });
             }
         );

From 5d0ec4359e86a0dd66d040afc8515cd2e6521ea8 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Wed, 24 Jun 2026 09:44:48 -0400
Subject: [PATCH 69/70] Set emailErrorsExist when duplicate email detected

---
 .../SubscriberInfo/EmailSelector.tsx             | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/EmailSelector.tsx b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/EmailSelector.tsx
index f7079d020b..186827d0d6 100644
--- a/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/EmailSelector.tsx
+++ b/src/components/admin/Settings/PrefixAlerts/Dialog/SubscriberSection/SubscriberInfo/EmailSelector.tsx
@@ -72,13 +72,21 @@ function EmailSelector({
         [inputValue]
     );
 
-    useEffect(() => {
-        setEmailErrorsExist(inputErrorExists, subscriptionId);
-    }, [inputErrorExists, setEmailErrorsExist, subscriptionId]);
-
     const duplicateEmailDetected =
         duplicateSubscriptionEmails.includes(subscribedEmail);
 
+    useEffect(() => {
+        setEmailErrorsExist(
+            inputErrorExists || duplicateEmailDetected,
+            subscriptionId
+        );
+    }, [
+        duplicateEmailDetected,
+        inputErrorExists,
+        setEmailErrorsExist,
+        subscriptionId,
+    ]);
+
     return (
         <FormControl fullWidth>
             <Autocomplete

From b35f209946d735d95aedcc74ce4ca8cf6e3a3c53 Mon Sep 17 00:00:00 2001
From: Kiahna Tucker <tucker.kiahna@gmail.com>
Date: Wed, 24 Jun 2026 10:38:40 -0400
Subject: [PATCH 70/70] Update input type annotation for
 UpdateAlertConfigMutation

---
 src/api/alerts.ts        |  2 +-
 src/gql-types/gql.ts     | 18 +++++++++++++++---
 src/gql-types/graphql.ts | 24 ++++++++++++++++++++++--
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/api/alerts.ts b/src/api/alerts.ts
index a12a1cb6d4..e9043ff303 100644
--- a/src/api/alerts.ts
+++ b/src/api/alerts.ts
@@ -64,7 +64,7 @@ const AlertConfigUpdateMutation = gql<
     AlertConfigMutationInput
 >`
     mutation UpdateAlertConfigMutation(
-        $catalogPrefixOrName: Prefix!
+        $catalogPrefixOrName: String!
         $config: JSON!
         $detail: String
     ) {
diff --git a/src/gql-types/gql.ts b/src/gql-types/gql.ts
index f3bf218a46..4ab712625a 100644
--- a/src/gql-types/gql.ts
+++ b/src/gql-types/gql.ts
@@ -14,9 +14,11 @@ import { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/
  * Learn more about it here: https://the-guild.dev/graphql/codegen/plugins/presets/preset-client#reducing-bundle-size
  */
 type Documents = {
+    "\n    query AlertConfigs(\n        $filter: AlertConfigsFilter\n        $after: String\n        $first: Int\n    ) {\n        alertConfigs(filter: $filter, after: $after, first: $first) {\n            edges {\n                node {\n                    catalogPrefixOrName\n                    config\n                    createdAt\n                    detail\n                    effective {\n                        config\n                        provenance {\n                            source\n                        }\n                    }\n                    id\n                    lastModifiedBy\n                    updatedAt\n                }\n            }\n            pageInfo {\n                endCursor\n                hasNextPage\n            }\n        }\n    }\n": typeof types.AlertConfigsDocument,
+    "\n    mutation UpdateAlertConfigMutation(\n        $catalogPrefixOrName: String!\n        $config: JSON!\n        $detail: String\n    ) {\n        updateAlertConfig(\n            catalogPrefixOrName: $catalogPrefixOrName\n            config: $config\n            detail: $detail\n        ) {\n            catalogPrefixOrName\n        }\n    }\n": typeof types.UpdateAlertConfigMutationDocument,
     "\n    mutation CreateAlertSubscriptionMutation(\n        $prefix: Prefix!\n        $email: String!\n        $alertTypes: [AlertType!]\n        $detail: String\n    ) {\n        createAlertSubscription(\n            prefix: $prefix\n            email: $email\n            alertTypes: $alertTypes\n            detail: $detail\n        ) {\n            catalogPrefix\n            email\n        }\n    }\n": typeof types.CreateAlertSubscriptionMutationDocument,
     "\n    mutation DeleteAlertSubscriptionMutation(\n        $prefix: Prefix!\n        $email: String!\n    ) {\n        deleteAlertSubscription(prefix: $prefix, email: $email) {\n            catalogPrefix\n            email\n        }\n    }\n": typeof types.DeleteAlertSubscriptionMutationDocument,
-    "\n    query AlertSubscriptions($prefix: Prefix!) {\n        alertSubscriptions(by: { prefix: $prefix }) {\n            alertTypes\n            catalogPrefix\n            email\n            updatedAt\n        }\n    }\n": typeof types.AlertSubscriptionsDocument,
+    "\n    query AlertSubscriptions($prefix: Prefix!) {\n        alertSubscriptions(by: { prefix: $prefix }) {\n            alertTypes\n            catalogPrefix\n            email\n        }\n    }\n": typeof types.AlertSubscriptionsDocument,
     "\n    mutation UpdateAlertSubscriptionMutation(\n        $prefix: Prefix!\n        $email: String!\n        $alertTypes: [AlertType!]\n        $detail: String\n    ) {\n        updateAlertSubscription(\n            prefix: $prefix\n            email: $email\n            alertTypes: $alertTypes\n            detail: $detail\n        ) {\n            catalogPrefix\n            email\n        }\n    }\n": typeof types.UpdateAlertSubscriptionMutationDocument,
     "\n    query AlertType {\n        alertTypes {\n            alertType\n            description\n            displayName\n            isDefault\n            isSystem\n        }\n    }\n": typeof types.AlertTypeDocument,
     "\n    query ConnectorsGrid($filter: ConnectorsFilter, $after: String) {\n        connectors(first: 500, after: $after, filter: $filter) {\n            edges {\n                cursor\n                node {\n                    id\n                    imageName\n                    logoUrl\n                    title\n                    recommended\n                    detail\n                    defaultSpec {\n                        id\n                        imageTag\n                        documentationUrl\n                        protocol\n                    }\n                }\n            }\n            pageInfo {\n                hasNextPage\n                endCursor\n            }\n        }\n    }\n": typeof types.ConnectorsGridDocument,
@@ -42,9 +44,11 @@ type Documents = {
     "\n    query AuthRolesQuery($after: String) {\n        prefixes(by: { minCapability: read }, first: 7500, after: $after) {\n            edges {\n                node {\n                    prefix\n                    userCapability\n                }\n            }\n            pageInfo {\n                hasNextPage\n                endCursor\n            }\n        }\n    }\n": typeof types.AuthRolesQueryDocument,
 };
 const documents: Documents = {
+    "\n    query AlertConfigs(\n        $filter: AlertConfigsFilter\n        $after: String\n        $first: Int\n    ) {\n        alertConfigs(filter: $filter, after: $after, first: $first) {\n            edges {\n                node {\n                    catalogPrefixOrName\n                    config\n                    createdAt\n                    detail\n                    effective {\n                        config\n                        provenance {\n                            source\n                        }\n                    }\n                    id\n                    lastModifiedBy\n                    updatedAt\n                }\n            }\n            pageInfo {\n                endCursor\n                hasNextPage\n            }\n        }\n    }\n": types.AlertConfigsDocument,
+    "\n    mutation UpdateAlertConfigMutation(\n        $catalogPrefixOrName: String!\n        $config: JSON!\n        $detail: String\n    ) {\n        updateAlertConfig(\n            catalogPrefixOrName: $catalogPrefixOrName\n            config: $config\n            detail: $detail\n        ) {\n            catalogPrefixOrName\n        }\n    }\n": types.UpdateAlertConfigMutationDocument,
     "\n    mutation CreateAlertSubscriptionMutation(\n        $prefix: Prefix!\n        $email: String!\n        $alertTypes: [AlertType!]\n        $detail: String\n    ) {\n        createAlertSubscription(\n            prefix: $prefix\n            email: $email\n            alertTypes: $alertTypes\n            detail: $detail\n        ) {\n            catalogPrefix\n            email\n        }\n    }\n": types.CreateAlertSubscriptionMutationDocument,
     "\n    mutation DeleteAlertSubscriptionMutation(\n        $prefix: Prefix!\n        $email: String!\n    ) {\n        deleteAlertSubscription(prefix: $prefix, email: $email) {\n            catalogPrefix\n            email\n        }\n    }\n": types.DeleteAlertSubscriptionMutationDocument,
-    "\n    query AlertSubscriptions($prefix: Prefix!) {\n        alertSubscriptions(by: { prefix: $prefix }) {\n            alertTypes\n            catalogPrefix\n            email\n            updatedAt\n        }\n    }\n": types.AlertSubscriptionsDocument,
+    "\n    query AlertSubscriptions($prefix: Prefix!) {\n        alertSubscriptions(by: { prefix: $prefix }) {\n            alertTypes\n            catalogPrefix\n            email\n        }\n    }\n": types.AlertSubscriptionsDocument,
     "\n    mutation UpdateAlertSubscriptionMutation(\n        $prefix: Prefix!\n        $email: String!\n        $alertTypes: [AlertType!]\n        $detail: String\n    ) {\n        updateAlertSubscription(\n            prefix: $prefix\n            email: $email\n            alertTypes: $alertTypes\n            detail: $detail\n        ) {\n            catalogPrefix\n            email\n        }\n    }\n": types.UpdateAlertSubscriptionMutationDocument,
     "\n    query AlertType {\n        alertTypes {\n            alertType\n            description\n            displayName\n            isDefault\n            isSystem\n        }\n    }\n": types.AlertTypeDocument,
     "\n    query ConnectorsGrid($filter: ConnectorsFilter, $after: String) {\n        connectors(first: 500, after: $after, filter: $filter) {\n            edges {\n                cursor\n                node {\n                    id\n                    imageName\n                    logoUrl\n                    title\n                    recommended\n                    detail\n                    defaultSpec {\n                        id\n                        imageTag\n                        documentationUrl\n                        protocol\n                    }\n                }\n            }\n            pageInfo {\n                hasNextPage\n                endCursor\n            }\n        }\n    }\n": types.ConnectorsGridDocument,
@@ -84,6 +88,14 @@ const documents: Documents = {
  */
 export function graphql(source: string): unknown;
 
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "\n    query AlertConfigs(\n        $filter: AlertConfigsFilter\n        $after: String\n        $first: Int\n    ) {\n        alertConfigs(filter: $filter, after: $after, first: $first) {\n            edges {\n                node {\n                    catalogPrefixOrName\n                    config\n                    createdAt\n                    detail\n                    effective {\n                        config\n                        provenance {\n                            source\n                        }\n                    }\n                    id\n                    lastModifiedBy\n                    updatedAt\n                }\n            }\n            pageInfo {\n                endCursor\n                hasNextPage\n            }\n        }\n    }\n"): (typeof documents)["\n    query AlertConfigs(\n        $filter: AlertConfigsFilter\n        $after: String\n        $first: Int\n    ) {\n        alertConfigs(filter: $filter, after: $after, first: $first) {\n            edges {\n                node {\n                    catalogPrefixOrName\n                    config\n                    createdAt\n                    detail\n                    effective {\n                        config\n                        provenance {\n                            source\n                        }\n                    }\n                    id\n                    lastModifiedBy\n                    updatedAt\n                }\n            }\n            pageInfo {\n                endCursor\n                hasNextPage\n            }\n        }\n    }\n"];
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "\n    mutation UpdateAlertConfigMutation(\n        $catalogPrefixOrName: String!\n        $config: JSON!\n        $detail: String\n    ) {\n        updateAlertConfig(\n            catalogPrefixOrName: $catalogPrefixOrName\n            config: $config\n            detail: $detail\n        ) {\n            catalogPrefixOrName\n        }\n    }\n"): (typeof documents)["\n    mutation UpdateAlertConfigMutation(\n        $catalogPrefixOrName: String!\n        $config: JSON!\n        $detail: String\n    ) {\n        updateAlertConfig(\n            catalogPrefixOrName: $catalogPrefixOrName\n            config: $config\n            detail: $detail\n        ) {\n            catalogPrefixOrName\n        }\n    }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
@@ -95,7 +107,7 @@ export function graphql(source: "\n    mutation DeleteAlertSubscriptionMutation(
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n    query AlertSubscriptions($prefix: Prefix!) {\n        alertSubscriptions(by: { prefix: $prefix }) {\n            alertTypes\n            catalogPrefix\n            email\n            updatedAt\n        }\n    }\n"): (typeof documents)["\n    query AlertSubscriptions($prefix: Prefix!) {\n        alertSubscriptions(by: { prefix: $prefix }) {\n            alertTypes\n            catalogPrefix\n            email\n            updatedAt\n        }\n    }\n"];
+export function graphql(source: "\n    query AlertSubscriptions($prefix: Prefix!) {\n        alertSubscriptions(by: { prefix: $prefix }) {\n            alertTypes\n            catalogPrefix\n            email\n        }\n    }\n"): (typeof documents)["\n    query AlertSubscriptions($prefix: Prefix!) {\n        alertSubscriptions(by: { prefix: $prefix }) {\n            alertTypes\n            catalogPrefix\n            email\n        }\n    }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/src/gql-types/graphql.ts b/src/gql-types/graphql.ts
index 231e807659..12396f1ba1 100644
--- a/src/gql-types/graphql.ts
+++ b/src/gql-types/graphql.ts
@@ -1922,6 +1922,24 @@ export type UsBankAccountPaymentMethodDetails = {
   last4?: Maybe<Scalars['String']['output']>;
 };
 
+export type AlertConfigsQueryVariables = Exact<{
+  filter?: InputMaybe<AlertConfigsFilter>;
+  after?: InputMaybe<Scalars['String']['input']>;
+  first?: InputMaybe<Scalars['Int']['input']>;
+}>;
+
+
+export type AlertConfigsQuery = { __typename?: 'QueryRoot', alertConfigs: { __typename?: 'AlertConfigEntryConnection', edges: Array<{ __typename?: 'AlertConfigEntryEdge', node: { __typename?: 'AlertConfigEntry', catalogPrefixOrName: string, config: any, createdAt: any, detail?: string | null, id: any, lastModifiedBy?: any | null, updatedAt: any, effective: { __typename?: 'EffectiveAlertConfig', config: any, provenance: Array<{ __typename?: 'FieldProvenance', source?: string | null }> } } }>, pageInfo: { __typename?: 'PageInfo', endCursor?: string | null, hasNextPage: boolean } } };
+
+export type UpdateAlertConfigMutationMutationVariables = Exact<{
+  catalogPrefixOrName: Scalars['String']['input'];
+  config: Scalars['JSON']['input'];
+  detail?: InputMaybe<Scalars['String']['input']>;
+}>;
+
+
+export type UpdateAlertConfigMutationMutation = { __typename?: 'MutationRoot', updateAlertConfig: { __typename?: 'UpdateAlertConfigResult', catalogPrefixOrName: string } };
+
 export type CreateAlertSubscriptionMutationMutationVariables = Exact<{
   prefix: Scalars['Prefix']['input'];
   email: Scalars['String']['input'];
@@ -1945,7 +1963,7 @@ export type AlertSubscriptionsQueryVariables = Exact<{
 }>;
 
 
-export type AlertSubscriptionsQuery = { __typename?: 'QueryRoot', alertSubscriptions: Array<{ __typename?: 'AlertSubscription', alertTypes: Array<AlertType>, catalogPrefix: any, email?: string | null, updatedAt: any }> };
+export type AlertSubscriptionsQuery = { __typename?: 'QueryRoot', alertSubscriptions: Array<{ __typename?: 'AlertSubscription', alertTypes: Array<AlertType>, catalogPrefix: any, email?: string | null }> };
 
 export type UpdateAlertSubscriptionMutationMutationVariables = Exact<{
   prefix: Scalars['Prefix']['input'];
@@ -2123,9 +2141,11 @@ export type AuthRolesQueryQueryVariables = Exact<{
 export type AuthRolesQueryQuery = { __typename?: 'QueryRoot', prefixes: { __typename?: 'PrefixRefConnection', edges: Array<{ __typename?: 'PrefixRefEdge', node: { __typename?: 'PrefixRef', prefix: any, userCapability: Capability } }>, pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean, endCursor?: string | null } } };
 
 export const PageInfoFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"PageInfoFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PageInfo"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"hasNextPage"}},{"kind":"Field","name":{"kind":"Name","value":"hasPreviousPage"}},{"kind":"Field","name":{"kind":"Name","value":"startCursor"}},{"kind":"Field","name":{"kind":"Name","value":"endCursor"}}]}}]} as unknown as DocumentNode<PageInfoFieldsFragment, unknown>;
+export const AlertConfigsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"AlertConfigs"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"filter"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"AlertConfigsFilter"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"after"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"first"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"alertConfigs"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"filter"},"value":{"kind":"Variable","name":{"kind":"Name","value":"filter"}}},{"kind":"Argument","name":{"kind":"Name","value":"after"},"value":{"kind":"Variable","name":{"kind":"Name","value":"after"}}},{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"Variable","name":{"kind":"Name","value":"first"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"edges"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"catalogPrefixOrName"}},{"kind":"Field","name":{"kind":"Name","value":"config"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"detail"}},{"kind":"Field","name":{"kind":"Name","value":"effective"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"config"}},{"kind":"Field","name":{"kind":"Name","value":"provenance"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"source"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"lastModifiedBy"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"pageInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"endCursor"}},{"kind":"Field","name":{"kind":"Name","value":"hasNextPage"}}]}}]}}]}}]} as unknown as DocumentNode<AlertConfigsQuery, AlertConfigsQueryVariables>;
+export const UpdateAlertConfigMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateAlertConfigMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"catalogPrefixOrName"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"config"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"JSON"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"detail"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateAlertConfig"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"catalogPrefixOrName"},"value":{"kind":"Variable","name":{"kind":"Name","value":"catalogPrefixOrName"}}},{"kind":"Argument","name":{"kind":"Name","value":"config"},"value":{"kind":"Variable","name":{"kind":"Name","value":"config"}}},{"kind":"Argument","name":{"kind":"Name","value":"detail"},"value":{"kind":"Variable","name":{"kind":"Name","value":"detail"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"catalogPrefixOrName"}}]}}]}}]} as unknown as DocumentNode<UpdateAlertConfigMutationMutation, UpdateAlertConfigMutationMutationVariables>;
 export const CreateAlertSubscriptionMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateAlertSubscriptionMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"prefix"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Prefix"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"email"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"alertTypes"}},"type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"AlertType"}}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"detail"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createAlertSubscription"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"prefix"},"value":{"kind":"Variable","name":{"kind":"Name","value":"prefix"}}},{"kind":"Argument","name":{"kind":"Name","value":"email"},"value":{"kind":"Variable","name":{"kind":"Name","value":"email"}}},{"kind":"Argument","name":{"kind":"Name","value":"alertTypes"},"value":{"kind":"Variable","name":{"kind":"Name","value":"alertTypes"}}},{"kind":"Argument","name":{"kind":"Name","value":"detail"},"value":{"kind":"Variable","name":{"kind":"Name","value":"detail"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"catalogPrefix"}},{"kind":"Field","name":{"kind":"Name","value":"email"}}]}}]}}]} as unknown as DocumentNode<CreateAlertSubscriptionMutationMutation, CreateAlertSubscriptionMutationMutationVariables>;
 export const DeleteAlertSubscriptionMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteAlertSubscriptionMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"prefix"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Prefix"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"email"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteAlertSubscription"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"prefix"},"value":{"kind":"Variable","name":{"kind":"Name","value":"prefix"}}},{"kind":"Argument","name":{"kind":"Name","value":"email"},"value":{"kind":"Variable","name":{"kind":"Name","value":"email"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"catalogPrefix"}},{"kind":"Field","name":{"kind":"Name","value":"email"}}]}}]}}]} as unknown as DocumentNode<DeleteAlertSubscriptionMutationMutation, DeleteAlertSubscriptionMutationMutationVariables>;
-export const AlertSubscriptionsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"AlertSubscriptions"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"prefix"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Prefix"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"alertSubscriptions"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"by"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"prefix"},"value":{"kind":"Variable","name":{"kind":"Name","value":"prefix"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"alertTypes"}},{"kind":"Field","name":{"kind":"Name","value":"catalogPrefix"}},{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<AlertSubscriptionsQuery, AlertSubscriptionsQueryVariables>;
+export const AlertSubscriptionsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"AlertSubscriptions"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"prefix"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Prefix"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"alertSubscriptions"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"by"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"prefix"},"value":{"kind":"Variable","name":{"kind":"Name","value":"prefix"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"alertTypes"}},{"kind":"Field","name":{"kind":"Name","value":"catalogPrefix"}},{"kind":"Field","name":{"kind":"Name","value":"email"}}]}}]}}]} as unknown as DocumentNode<AlertSubscriptionsQuery, AlertSubscriptionsQueryVariables>;
 export const UpdateAlertSubscriptionMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateAlertSubscriptionMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"prefix"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Prefix"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"email"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"alertTypes"}},"type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"AlertType"}}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"detail"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateAlertSubscription"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"prefix"},"value":{"kind":"Variable","name":{"kind":"Name","value":"prefix"}}},{"kind":"Argument","name":{"kind":"Name","value":"email"},"value":{"kind":"Variable","name":{"kind":"Name","value":"email"}}},{"kind":"Argument","name":{"kind":"Name","value":"alertTypes"},"value":{"kind":"Variable","name":{"kind":"Name","value":"alertTypes"}}},{"kind":"Argument","name":{"kind":"Name","value":"detail"},"value":{"kind":"Variable","name":{"kind":"Name","value":"detail"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"catalogPrefix"}},{"kind":"Field","name":{"kind":"Name","value":"email"}}]}}]}}]} as unknown as DocumentNode<UpdateAlertSubscriptionMutationMutation, UpdateAlertSubscriptionMutationMutationVariables>;
 export const AlertTypeDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"AlertType"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"alertTypes"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"alertType"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"displayName"}},{"kind":"Field","name":{"kind":"Name","value":"isDefault"}},{"kind":"Field","name":{"kind":"Name","value":"isSystem"}}]}}]}}]} as unknown as DocumentNode<AlertTypeQuery, AlertTypeQueryVariables>;
 export const ConnectorsGridDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ConnectorsGrid"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"filter"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"ConnectorsFilter"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"after"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"connectors"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"500"}},{"kind":"Argument","name":{"kind":"Name","value":"after"},"value":{"kind":"Variable","name":{"kind":"Name","value":"after"}}},{"kind":"Argument","name":{"kind":"Name","value":"filter"},"value":{"kind":"Variable","name":{"kind":"Name","value":"filter"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"edges"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"cursor"}},{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"imageName"}},{"kind":"Field","name":{"kind":"Name","value":"logoUrl"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"recommended"}},{"kind":"Field","name":{"kind":"Name","value":"detail"}},{"kind":"Field","name":{"kind":"Name","value":"defaultSpec"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"imageTag"}},{"kind":"Field","name":{"kind":"Name","value":"documentationUrl"}},{"kind":"Field","name":{"kind":"Name","value":"protocol"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"pageInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"hasNextPage"}},{"kind":"Field","name":{"kind":"Name","value":"endCursor"}}]}}]}}]}}]} as unknown as DocumentNode<ConnectorsGridQuery, ConnectorsGridQueryVariables>;